From 26626d907371aa1d642da1f2c1699234b29daa7f Mon Sep 17 00:00:00 2001 From: Denis Date: Wed, 18 Mar 2020 21:57:11 +0300 Subject: [PATCH] Prometheus: Render missing labels in legend formats as an empty string (#22355) * Empty value for unknown Prometheus label (grafana#16041) * Empty value for unknown Prometheus label (grafana#16041) * fix linter --- pkg/tsdb/prometheus/prometheus.go | 3 +-- pkg/tsdb/prometheus/prometheus_test.go | 2 +- public/app/plugins/datasource/prometheus/result_transformer.ts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go index 1244031bb47..76294da2624 100644 --- a/pkg/tsdb/prometheus/prometheus.go +++ b/pkg/tsdb/prometheus/prometheus.go @@ -140,8 +140,7 @@ func formatLegend(metric model.Metric, query *PrometheusQuery) string { if val, exists := metric[model.LabelName(labelName)]; exists { return []byte(val) } - - return in + return []byte{} }) return string(result) diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go index efb42318214..9005722aa93 100644 --- a/pkg/tsdb/prometheus/prometheus_test.go +++ b/pkg/tsdb/prometheus/prometheus_test.go @@ -28,7 +28,7 @@ func TestPrometheus(t *testing.T) { LegendFormat: "legend {{app}} {{ device }} {{broken}}", } - So(formatLegend(metric, query), ShouldEqual, "legend backend mobile {{broken}}") + So(formatLegend(metric, query), ShouldEqual, "legend backend mobile ") }) Convey("build full serie name", func() { diff --git a/public/app/plugins/datasource/prometheus/result_transformer.ts b/public/app/plugins/datasource/prometheus/result_transformer.ts index f1d42ea8931..9377f65fba4 100644 --- a/public/app/plugins/datasource/prometheus/result_transformer.ts +++ b/public/app/plugins/datasource/prometheus/result_transformer.ts @@ -166,7 +166,7 @@ export class ResultTransformer { if (aliasData[g1]) { return aliasData[g1]; } - return g1; + return ''; }); }