diff options
| author | thiagoftsm <49162938+thiagoftsm@users.noreply.github.com> | 2019-06-06 18:25:36 +0000 |
|---|---|---|
| committer | Chris Akritidis <43294513+cakrit@users.noreply.github.com> | 2019-06-06 20:25:36 +0200 |
| commit | 1c60c6eb8749c80acf5262253963d9d08f0d468e (patch) | |
| tree | 3e40e3766809bdd0293d682a6364440e2a4e3cb1 /web/api | |
| parent | 58b7d95a7ec9c576f8a06bbab07f755846b5349a (diff) | |
URL_parser fixing allmetrics! (#6231)
* URL_parser fixing allmetrics!
* URL_parser fixing allmetrics 2!
Diffstat (limited to 'web/api')
| -rw-r--r-- | web/api/exporters/allmetrics.c | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/web/api/exporters/allmetrics.c b/web/api/exporters/allmetrics.c index 17e5e077eb..fe71340bf3 100644 --- a/web/api/exporters/allmetrics.c +++ b/web/api/exporters/allmetrics.c @@ -26,13 +26,21 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client const char *prometheus_prefix = global_backend_prefix; uint32_t end = w->total_params; + uint32_t i; + char sname[WEB_FIELDS_MAX]; + char svalue[WEB_FIELDS_MAX]; if (end) { - uint32_t i = 0; + i = 0; do { char *name = w->param_name[i].body; size_t lname = w->param_name[i].length; + sname[i] = name[lname]; + name[lname] = 0x00; + char *value = w->param_values[i].body; size_t lvalue = w->param_values[i].length; + svalue[i] = value[lvalue]; + value[lvalue] = 0x00; if(!strncmp(name, "format",lname)) { if(!strncmp(value, ALLMETRICS_FORMAT_SHELL,lvalue)) @@ -74,6 +82,7 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client buffer_flush(w->response.data); buffer_no_cacheable(w->response.data); + int ret; switch(format) { case ALLMETRICS_JSON: w->response.data->contenttype = CT_APPLICATION_JSON; @@ -95,7 +104,8 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client , prometheus_backend_options , prometheus_output_options ); - return 200; + ret = 200; + break; case ALLMETRICS_PROMETHEUS_ALL_HOSTS: w->response.data->contenttype = CT_PROMETHEUS; @@ -107,11 +117,25 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client , prometheus_backend_options , prometheus_output_options ); - return 200; + ret = 200; + break; default: w->response.data->contenttype = CT_TEXT_PLAIN; buffer_strcat(w->response.data, "Which format? '" ALLMETRICS_FORMAT_SHELL "', '" ALLMETRICS_FORMAT_PROMETHEUS "', '" ALLMETRICS_FORMAT_PROMETHEUS_ALL_HOSTS "' and '" ALLMETRICS_FORMAT_JSON "' are currently supported."); return 400; } + + i = 0; + do { + char *name = w->param_name[i].body; + size_t lname = w->param_name[i].length; + name[lname] = sname[i]; + + char *value = w->param_values[i].body; + size_t lvalue = w->param_values[i].length; + value[lvalue] = svalue[i]; + } while( ++i < end); + + return ret; } |