@cryptotaxi247 / netdata-1 / commits / 9d85c2cb3

prometheus: HELP and TYPE lines are now comments

Costa Tsaousis (ktsaou) committed Jul 9, 2017 at 23:29 UTC 9d85c2cb39dba4765a5fcf6564a733d1b6ac4c78
1 file changed +5 -5
src/backend_prometheus.c
+5 -5
@@ -124,14 +124,14 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus(RRDHOST *host, BUFFER *wb, ui
124 }
125
126 if (unlikely(help))
127 - buffer_sprintf(wb, "# HELP %s_%s netdata chart \"%s\", context \"%s\", family \"%s\", dimension \"%s\", value * " COLLECTED_NUMBER_FORMAT " / " COLLECTED_NUMBER_FORMAT " %s %s (%s)\n",
127 + buffer_sprintf(wb, "# COMMENT HELP %s_%s netdata chart \"%s\", context \"%s\", family \"%s\", dimension \"%s\", value * " COLLECTED_NUMBER_FORMAT " / " COLLECTED_NUMBER_FORMAT " %s %s (%s)\n",
128 context, dimension, (names && st->name) ? st->name : st->id, st->context,
129 st->family, (names && rd->name) ? rd->name : rd->id, rd->multiplier,
130 rd->divisor, h, st->units, t
131 );
132
133 if (unlikely(types))
134 - buffer_sprintf(wb, "# TYPE %s_%s %s\n", context, dimension, t);
134 + buffer_sprintf(wb, "# COMMENT TYPE %s_%s %s\n", context, dimension, t);
135
136 buffer_sprintf(wb, "%s_%s{chart=\"%s\",family=\"%s\"%s} " COLLECTED_NUMBER_FORMAT " %llu\n",
137 context, dimension, chart, family, labels, rd->last_collected_value,
@@ -147,14 +147,14 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus(RRDHOST *host, BUFFER *wb, ui
147 prometheus_label_copy(dimension, (names && rd->name) ? rd->name : rd->id, PROMETHEUS_ELEMENT_MAX);
148
149 if (unlikely(help))
150 - buffer_sprintf(wb, "# HELP %s netdata chart \"%s\", context \"%s\", family \"%s\", dimension \"%s\", value gives %s (gauge)\n",
150 + buffer_sprintf(wb, "# COMMENT HELP %s netdata chart \"%s\", context \"%s\", family \"%s\", dimension \"%s\", value gives %s (gauge)\n",
151 context, (names && st->name) ? st->name : st->id, st->context,
152 st->family, (names && rd->name) ? rd->name : rd->id,
153 st->units
154 );
155
156 if (unlikely(types))
157 - buffer_sprintf(wb, "# TYPE %s gauge\n", context);
157 + buffer_sprintf(wb, "# COMMENT TYPE %s gauge\n", context);
158
159 buffer_sprintf(wb, "%s{chart=\"%s\",family=\"%s\",dimension=\"%s\"%s} " CALCULATED_NUMBER_FORMAT " %llu\n",
160 context, chart, family, dimension, labels, value,
@@ -197,7 +197,7 @@ static inline time_t prometheus_preparation(RRDHOST *host, BUFFER *wb, uint32_t
197 else
198 mode = "unknown";
199
200 - buffer_sprintf(wb, "# HELP netdata \"%s\" to %sprometheus \"%s\", source \"%s\", last seen %lu %s"
200 + buffer_sprintf(wb, "# COMMENT netdata \"%s\" to %sprometheus \"%s\", source \"%s\", last seen %lu %s"
201 , host->hostname
202 , (first_seen)?"FIRST SEEN ":""
203 , server