IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Render missing labels in legend formats as an empty string (#22355)

Browse Source 
* Empty value for unknown Prometheus label (grafana#16041)

* Empty value for unknown Prometheus label (grafana#16041)

* fix linter
This commit is contained in:
Denis 2020-03-18 21:57:11 +03:00 committed by GitHub
parent 5a5122e7e3
commit 26626d9073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/prometheus/prometheus.go
View File

@ -140,8 +140,7 @@ func formatLegend(metric model.Metric, query *PrometheusQuery) string {
if val, exists := metric[model.LabelName(labelName)]; exists { if val, exists := metric[model.LabelName(labelName)]; exists {
return []byte(val) return []byte(val)
} }
return []byte{}
return in
}) })
return string(result) return string(result)

2
pkg/tsdb/prometheus/prometheus_test.go
View File

@ -28,7 +28,7 @@ func TestPrometheus(t *testing.T) {
LegendFormat: "legend {{app}} {{ device }} {{broken}}", 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() { Convey("build full serie name", func() {

2
public/app/plugins/datasource/prometheus/result_transformer.ts
View File

@ -166,7 +166,7 @@ export class ResultTransformer {
if (aliasData[g1]) { if (aliasData[g1]) {
return aliasData[g1]; return aliasData[g1];
} }
return g1; return '';
}); });
} }