summaryrefslogtreecommitdiffstats
path: root/exporting
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-31 12:59:21 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-03-31 12:59:21 +0000
commitbb8713bbc1c4594366fc735c04910edbf4c61aab (patch)
treed7da56c0b89aa371dd8ad986995dd145fdf6670a /exporting
parentReleasing debian version 1.29.3-4. (diff)
downloadnetdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.tar.xz
netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.zip
Merging upstream version 1.30.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'exporting')
-rw-r--r--exporting/check_filters.c2
-rw-r--r--exporting/prometheus/prometheus.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/exporting/check_filters.c b/exporting/check_filters.c
index cfe0b4ce4..8d70c6f68 100644
--- a/exporting/check_filters.c
+++ b/exporting/check_filters.c
@@ -64,7 +64,7 @@ int rrdset_is_exportable(struct instance *instance, 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/exporting/prometheus/prometheus.c b/exporting/prometheus/prometheus.c
index 371f5a520..c10d94b90 100644
--- a/exporting/prometheus/prometheus.c
+++ b/exporting/prometheus/prometheus.c
@@ -37,7 +37,7 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st)
}
}
- if (unlikely(!rrdset_is_available_for_backends(st))) {
+ if (unlikely(!rrdset_is_available_for_exporting_and_alarms(st))) {
debug(
D_BACKEND,
"EXPORTING: not sending chart '%s' of host '%s', because it is not available for exporting.",
@@ -660,7 +660,8 @@ static void rrd_stats_api_v1_charts_allmetrics_prometheus(
rd->algorithm == RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL) {
p.type = "counter";
p.relation = "delta gives";
- p.suffix = "_total";
+ if (!prometheus_collector)
+ p.suffix = "_total";
}
if (homogeneous) {