From bb8713bbc1c4594366fc735c04910edbf4c61aab Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 31 Mar 2021 14:59:21 +0200 Subject: Merging upstream version 1.30.0. Signed-off-by: Daniel Baumann --- backends/backends.c | 2 +- backends/prometheus/backend_prometheus.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'backends') diff --git a/backends/backends.c b/backends/backends.c index 6bf583e17..bc718cb29 100644 --- a/backends/backends.c +++ b/backends/backends.c @@ -206,7 +206,7 @@ inline int backends_can_send_rrdset(BACKEND_OPTIONS backend_options, RRDSET *st) } } - if(unlikely(!rrdset_is_available_for_backends(st))) { + if(unlikely(!rrdset_is_available_for_exporting_and_alarms(st))) { debug(D_BACKEND, "BACKEND: not sending chart '%s' of host '%s', because it is not available for backends.", st->id, host->hostname); return 0; } diff --git a/backends/prometheus/backend_prometheus.c b/backends/prometheus/backend_prometheus.c index a3ecf16ef..1fb3fd42c 100644 --- a/backends/prometheus/backend_prometheus.c +++ b/backends/prometheus/backend_prometheus.c @@ -545,7 +545,7 @@ inline static void remote_write_split_words(char *str, char **words, int max_wor int i = 0; while(*s && i < max_words - 1) { - while(*s && isspace(*s)) s++; // skip spaces to the begining of a tag name + while(*s && isspace(*s)) s++; // skip spaces to the beginning of a tag name if(*s) words[i] = s; @@ -560,7 +560,7 @@ inline static void remote_write_split_words(char *str, char **words, int max_wor s++; i++; - while(*s && isspace(*s)) s++; // skip spaces to the begining of a tag value + while(*s && isspace(*s)) s++; // skip spaces to the beginning of a tag value if(*s && *s == '"') s++; // strip an opening quote if(*s) -- cgit v1.2.3