diff options
| author | Vladimir Kobal <vlad@prokk.net> | 2020-11-05 19:08:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 19:08:17 +0200 |
| commit | 943ee2482b16a81afd54b426f4fb0952f99c48e7 (patch) | |
| tree | 5603b2bbd3cba974f665699a2b132256b2dfe912 /web | |
| parent | edd6d02dec1c65593acb9d7b98dbb3f594d58c3a (diff) | |
Add HTTP and HTTPS support to the simple exporting connector (#9911)
Diffstat (limited to 'web')
| -rw-r--r-- | web/api/exporters/allmetrics.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/web/api/exporters/allmetrics.c b/web/api/exporters/allmetrics.c index 6fcb4fb0cb..f3118ba5f3 100644 --- a/web/api/exporters/allmetrics.c +++ b/web/api/exporters/allmetrics.c @@ -4,24 +4,26 @@ struct prometheus_output_options { char *name; - BACKENDS_PROMETHEUS_OUTPUT_OPTIONS flag; + PROMETHEUS_OUTPUT_OPTIONS flag; } prometheus_output_flags_root[] = { - { "help", BACKENDS_PROMETHEUS_OUTPUT_HELP }, - { "types", BACKENDS_PROMETHEUS_OUTPUT_TYPES }, - { "names", BACKENDS_PROMETHEUS_OUTPUT_NAMES }, - { "timestamps", BACKENDS_PROMETHEUS_OUTPUT_TIMESTAMPS }, - { "variables", BACKENDS_PROMETHEUS_OUTPUT_VARIABLES }, - { "oldunits", BACKENDS_PROMETHEUS_OUTPUT_OLDUNITS }, - { "hideunits", BACKENDS_PROMETHEUS_OUTPUT_HIDEUNITS }, - // terminator - { NULL, BACKENDS_PROMETHEUS_OUTPUT_NONE }, + { "help", PROMETHEUS_OUTPUT_HELP }, + { "types", PROMETHEUS_OUTPUT_TYPES }, + { "names", PROMETHEUS_OUTPUT_NAMES }, + { "timestamps", PROMETHEUS_OUTPUT_TIMESTAMPS }, + { "variables", PROMETHEUS_OUTPUT_VARIABLES }, + { "oldunits", PROMETHEUS_OUTPUT_OLDUNITS }, + { "hideunits", PROMETHEUS_OUTPUT_HIDEUNITS }, + // terminator + { NULL, PROMETHEUS_OUTPUT_NONE }, }; inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client *w, char *url) { int format = ALLMETRICS_SHELL; const char *prometheus_server = w->client_ip; uint32_t prometheus_backend_options = global_backend_options; - BACKENDS_PROMETHEUS_OUTPUT_OPTIONS prometheus_output_options = BACKENDS_PROMETHEUS_OUTPUT_TIMESTAMPS | ((global_backend_options & BACKEND_OPTION_SEND_NAMES)?BACKENDS_PROMETHEUS_OUTPUT_NAMES:0); + PROMETHEUS_OUTPUT_OPTIONS prometheus_output_options = + PROMETHEUS_OUTPUT_TIMESTAMPS | + ((global_backend_options & BACKEND_OPTION_SEND_NAMES) ? PROMETHEUS_OUTPUT_NAMES : 0); const char *prometheus_prefix = global_backend_prefix; while(url) { @@ -84,7 +86,7 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client case ALLMETRICS_PROMETHEUS: w->response.data->contenttype = CT_PROMETHEUS; - backends_rrd_stats_api_v1_charts_allmetrics_prometheus_single_host( + rrd_stats_api_v1_charts_allmetrics_prometheus_single_host( host , w->response.data , prometheus_server @@ -96,7 +98,7 @@ inline int web_client_api_request_v1_allmetrics(RRDHOST *host, struct web_client case ALLMETRICS_PROMETHEUS_ALL_HOSTS: w->response.data->contenttype = CT_PROMETHEUS; - backends_rrd_stats_api_v1_charts_allmetrics_prometheus_all_hosts( + rrd_stats_api_v1_charts_allmetrics_prometheus_all_hosts( host , w->response.data , prometheus_server |