opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cloud Monitoring: Fix legend naming with display name override (#30440)

Browse Source 
* Cloud Monitoring: Fix legend naming with display name override

* include MQL queries

* cover all bases

* refactor
This commit is contained in:
Will Browne
2021-01-21 15:08:57 +01:00
committed by GitHub
parent ffa68f6f91
commit 7562c6749d
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/tsdb/cloudmonitoring/time_series_filter.go
View File

@ -175,6 +175,9 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, nil, additionalLabels, timeSeriesFilter) frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, nil, additionalLabels, timeSeriesFilter)
valueField.Name = frameName valueField.Name = frameName
valueField.Labels = seriesLabels
setDisplayNameAsFieldName(valueField)
buckets[i] = &data.Frame{ buckets[i] = &data.Frame{
Name: frameName, Name: frameName,
Fields: []*data.Field{ Fields: []*data.Field{
@ -198,6 +201,9 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{}) valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{})
frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, seriesLabels, additionalLabels, timeSeriesFilter) frameName := formatLegendKeys(series.Metric.Type, defaultMetricName, seriesLabels, additionalLabels, timeSeriesFilter)
valueField.Name = frameName valueField.Name = frameName
valueField.Labels = seriesLabels
setDisplayNameAsFieldName(valueField)
buckets[i] = &data.Frame{ buckets[i] = &data.Frame{
Name: frameName, Name: frameName,
Fields: []*data.Field{ Fields: []*data.Field{
@ -259,6 +265,7 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) handleNonDistributionSe
dataField := frame.Fields[1] dataField := frame.Fields[1]
dataField.Name = metricName dataField.Name = metricName
dataField.Labels = seriesLabels dataField.Labels = seriesLabels
setDisplayNameAsFieldName(dataField)
} }
func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseToAnnotations(queryRes *tsdb.QueryResult, data cloudMonitoringResponse, title string, text string, tags string) error { 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() 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 { func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) getRefID() string {
return timeSeriesFilter.RefID return timeSeriesFilter.RefID
} }

8
pkg/tsdb/cloudmonitoring/time_series_query.go
View File

@ -160,6 +160,8 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ts
metricName := formatLegendKeys(d.Key, defaultMetricName, seriesLabels, nil, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy}) metricName := formatLegendKeys(d.Key, defaultMetricName, seriesLabels, nil, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy})
dataField := frame.Fields[1] dataField := frame.Fields[1]
dataField.Name = metricName dataField.Name = metricName
dataField.Labels = seriesLabels
setDisplayNameAsFieldName(dataField)
frames = append(frames, frame) frames = append(frames, frame)
continue 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}) frameName := formatLegendKeys(d.Key, defaultMetricName, nil, additionalLabels, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy})
valueField.Name = frameName valueField.Name = frameName
valueField.Labels = seriesLabels
setDisplayNameAsFieldName(valueField)
buckets[i] = &data.Frame{ buckets[i] = &data.Frame{
Name: frameName, Name: frameName,
Fields: []*data.Field{ Fields: []*data.Field{
@ -215,6 +220,9 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ts
valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{}) valueField := data.NewField(data.TimeSeriesValueFieldName, nil, []float64{})
frameName := formatLegendKeys(d.Key, defaultMetricName, seriesLabels, additionalLabels, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy}) frameName := formatLegendKeys(d.Key, defaultMetricName, seriesLabels, additionalLabels, &cloudMonitoringTimeSeriesFilter{ProjectName: timeSeriesQuery.ProjectName, AliasBy: timeSeriesQuery.AliasBy})
valueField.Name = frameName valueField.Name = frameName
valueField.Labels = seriesLabels
setDisplayNameAsFieldName(valueField)
buckets[i] = &data.Frame{ buckets[i] = &data.Frame{
Name: frameName, Name: frameName,
Fields: []*data.Field{ Fields: []*data.Field{