diff --git a/pkg/tsdb/cloudmonitoring/time_series_filter.go b/pkg/tsdb/cloudmonitoring/time_series_filter.go index 7a8e1c169fd..643d43ba43c 100644 --- a/pkg/tsdb/cloudmonitoring/time_series_filter.go +++ b/pkg/tsdb/cloudmonitoring/time_series_filter.go @@ -175,6 +175,9 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, nil, additionalLabels, timeSeriesFilter) valueField.Name = frameName + valueField.Labels = seriesLabels + setDisplayNameAsFieldName(valueField) + buckets[i] = &data.Frame{ Name: frameName, Fields: []*data.Field{ @@ -198,6 +201,9 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{}) frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, seriesLabels, additionalLabels, timeSeriesFilter) valueField.Name = frameName + valueField.Labels = seriesLabels + setDisplayNameAsFieldName(valueField) + buckets[i] = &data.Frame{ Name: frameName, Fields: []*data.Field{ @@ -259,6 +265,7 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) handleNonDistributionSe dataField := frame.Fields[1] dataField.Name = metricName dataField.Labels = seriesLabels + setDisplayNameAsFieldName(dataField) } func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseToAnnotations(queryRes *tsdb.QueryResult, data cloudMonitoringResponse, title string, text string, tags string) error { @@ -359,6 +366,13 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) buildDeepLink() string return accountChooserURL.String() } +func setDisplayNameAsFieldName(f *data.Field) { + if f.Config == nil { + f.Config = &data.FieldConfig{} + } + f.Config.DisplayNameFromDS = f.Name +} + func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) getRefID() string { return timeSeriesFilter.RefID } diff --git a/pkg/tsdb/cloudmonitoring/time_series_query.go b/pkg/tsdb/cloudmonitoring/time_series_query.go index 91087ad7820..a9dcd6ae79b 100644 --- a/pkg/tsdb/cloudmonitoring/time_series_query.go +++ b/pkg/tsdb/cloudmonitoring/time_series_query.go @@ -160,6 +160,8 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ts metricName := formatLegendKeys(d.Key, defaultMetricName, seriesLabels, nil, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy}) dataField := frame.Fields[1] dataField.Name = metricName + dataField.Labels = seriesLabels + setDisplayNameAsFieldName(dataField) frames = append(frames, frame) continue @@ -190,6 +192,9 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ts frameName := formatLegendKeys(d.Key, defaultMetricName, nil, additionalLabels, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy}) valueField.Name = frameName + valueField.Labels = seriesLabels + setDisplayNameAsFieldName(valueField) + buckets[i] = &data.Frame{ Name: frameName, Fields: []*data.Field{ @@ -215,6 +220,9 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ts valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{}) frameName := formatLegendKeys(d.Key, defaultMetricName, seriesLabels, additionalLabels, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy}) valueField.Name = frameName + valueField.Labels = seriesLabels + setDisplayNameAsFieldName(valueField) + buckets[i] = &data.Frame{ Name: frameName, Fields: []*data.Field{