From 2a5279911f6ef10db5516887f0f30681d52b3e5d Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Fri, 26 Mar 2021 16:20:46 +0200 Subject: [PATCH] Add legend name to dataframes config (#32356) --- pkg/tsdb/prometheus/prometheus.go | 2 +- pkg/tsdb/prometheus/prometheus_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go index e62f3bef790..713697a4082 100644 --- a/pkg/tsdb/prometheus/prometheus.go +++ b/pkg/tsdb/prometheus/prometheus.go @@ -216,7 +216,7 @@ func parseResponse(value model.Value, query *PrometheusQuery) (plugins.DataQuery } frames = append(frames, data.NewFrame(name, data.NewField("time", nil, timeVector), - data.NewField("value", tags, values))) + data.NewField("value", tags, values).SetConfig(&data.FieldConfig{DisplayNameFromDS: name}))) } queryRes.Dataframes = plugins.NewDecodedDataFrames(frames) diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go index b1a98a98b91..af3608950fd 100644 --- a/pkg/tsdb/prometheus/prometheus_test.go +++ b/pkg/tsdb/prometheus/prometheus_test.go @@ -182,6 +182,7 @@ func TestParseResponse(t *testing.T) { require.Len(t, decoded[0].Fields[1].Labels, 2) require.Equal(t, decoded[0].Fields[1].Labels.String(), "app=Application, tag2=tag2") require.Equal(t, decoded[0].Fields[1].Name, "value") + require.Equal(t, decoded[0].Fields[1].Config.DisplayNameFromDS, "legend Application") // Ensure the timestamps are UTC zoned testValue := decoded[0].Fields[0].At(0)