Address issue with Thanos Receiver (#15094)
* fix_label_order: fix label order to export data for Thanos * fix_label_order: Split chart and family inside generate_as_collected_prom_metric * fix_label_order: Unify calls to buffer_sprintf and fix typo
thiagoftsm committed
May 24, 2023 at 14:45 UTC
51e1185dc5adf4d40bc8557abca9156ced741fb5
1 file changed
+6
-6
exporting/prometheus/prometheus.c
+6
-6
@@ -470,12 +470,12 @@ static void generate_as_collected_prom_metric(BUFFER *wb, struct gen_parameters
470
if (!homogeneous)
471
buffer_sprintf(wb, "_%s", p->dimension);
472
473
- buffer_sprintf(wb, "%s{chart=\"%s\",family=\"%s\"", p->suffix, p->chart, p->family);
473
+ buffer_sprintf(wb, "%s{chart=\"%s\"", p->suffix, p->chart);
474
475
if (homogeneous)
476
buffer_sprintf(wb, ",dimension=\"%s\"", p->dimension);
477
478
- buffer_sprintf(wb, "%s} ", p->labels);
478
+ buffer_sprintf(wb, ",family=\"%s\"%s} ", p->family, p->labels);
479
480
if (prometheus_collector)
481
buffer_sprintf(
@@ -713,30 +713,30 @@ static void rrd_stats_api_v1_charts_allmetrics_prometheus(
713
if (output_options & PROMETHEUS_OUTPUT_TIMESTAMPS)
714
buffer_sprintf(
715
wb,
716
- "%s_%s%s%s{chart=\"%s\",family=\"%s\",dimension=\"%s\"%s} " NETDATA_DOUBLE_FORMAT
716
+ "%s_%s%s%s{chart=\"%s\",dimension=\"%s\",family=\"%s\"%s} " NETDATA_DOUBLE_FORMAT
717
" %llu\n",
718
prefix,
719
context,
720
units,
721
suffix,
722
chart,
723
- family,
723
dimension,
724
+ family,
725
labels,
726
value,
727
last_time * MSEC_PER_SEC);
728
else
729
buffer_sprintf(
730
wb,
731
- "%s_%s%s%s{chart=\"%s\",family=\"%s\",dimension=\"%s\"%s} " NETDATA_DOUBLE_FORMAT
731
+ "%s_%s%s%s{chart=\"%s\",dimension=\"%s\",family=\"%s\"%s} " NETDATA_DOUBLE_FORMAT
732
"\n",
733
prefix,
734
context,
735
units,
736
suffix,
737
chart,
738
- family,
738
dimension,
739
+ family,
740
labels,
741
value);
742
}