change response format, response simple label map

grafana · Jan 25, 2022 · fc7bb7c · fc7bb7c
1 parent 5cf1cdf
commit fc7bb7c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 41 deletions.
diff --git a/pkg/tsdb/cloudmonitoring/time_series_filter.go b/pkg/tsdb/cloudmonitoring/time_series_filter.go
@@ -90,8 +90,8 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
 	for _, series := range response.TimeSeries {
 		seriesLabels := data.Labels{}
 		defaultMetricName := series.Metric.Type
-		labels := make(map[string]map[string]bool)
-		labels["resource.type"] = map[string]bool{series.Resource.Type: true}
+		labels := make(map[string]string)
+		labels["resource.type"] = series.Resource.Type
 		seriesLabels["resource.type"] = series.Resource.Type
 
 		frame := data.NewFrameOfFieldTypes("", len(series.Points), data.FieldTypeTime, data.FieldTypeFloat64)
@@ -101,10 +101,7 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
 		}
 
 		for key, value := range series.Metric.Labels {
-			if _, ok := labels["metric.label."+key]; !ok {
-				labels["metric.label."+key] = map[string]bool{}
-			}
-			labels["metric.label."+key][value] = true
+			labels["metric.label."+key] = value
 			seriesLabels["metric.label."+key] = value
 
 			if len(timeSeriesFilter.GroupBys) == 0 || containsLabel(timeSeriesFilter.GroupBys, "metric.label."+key) {
@@ -113,10 +110,7 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
 		}
 
 		for key, value := range series.Resource.Labels {
-			if _, ok := labels["resource.label."+key]; !ok {
-				labels["resource.label."+key] = map[string]bool{}
-			}
-			labels["resource.label."+key][value] = true
+			labels["resource.label."+key] = value
 			seriesLabels["resource.label."+key] = value
 
 			if containsLabel(timeSeriesFilter.GroupBys, "resource.label."+key) {
@@ -127,22 +121,19 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
 		for labelType, labelTypeValues := range series.MetaData {
 			for labelKey, labelValue := range labelTypeValues {
 				key := toSnakeCase(fmt.Sprintf("metadata.%s.%s", labelType, labelKey))
-				if _, ok := labels[key]; !ok {
-					labels[key] = map[string]bool{}
-				}
 
 				switch v := labelValue.(type) {
 				case string:
-					labels[key][v] = true
+					labels[key] = v
 					seriesLabels[key] = v
 				case bool:
 					strVal := strconv.FormatBool(v)
-					labels[key][strVal] = true
+					labels[key] = strVal
 					seriesLabels[key] = strVal
 				case []interface{}:
 					for _, v := range v {
 						strVal := v.(string)
-						labels[key][strVal] = true
+						labels[key] = strVal
 						if len(seriesLabels[key]) > 0 {
 							strVal = fmt.Sprintf("%s, %s", seriesLabels[key], strVal)
 						}
@@ -152,16 +143,10 @@ func (timeSeriesFilter *cloudMonitoringTimeSeriesFilter) parseResponse(queryRes
 			}
 		}
 
-		labelsByKey := make(map[string][]string)
-		for key, values := range labels {
-			for value := range values {
-				labelsByKey[key] = append(labelsByKey[key], value)
-			}
-		}
 		customFrameMeta := map[string]interface{}{}
 		customFrameMeta["alignmentPeriod"] = timeSeriesFilter.Params.Get("aggregation.alignmentPeriod")
 		customFrameMeta["perSeriesAligner"] = timeSeriesFilter.Params.Get("aggregation.perSeriesAligner")
-		customFrameMeta["labels"] = labelsByKey
+		customFrameMeta["labels"] = labels
 		customFrameMeta["groupBys"] = timeSeriesFilter.GroupBys
 		if frame.Meta != nil {
 			frame.Meta.Custom = customFrameMeta

diff --git a/pkg/tsdb/cloudmonitoring/time_series_query.go b/pkg/tsdb/cloudmonitoring/time_series_query.go
@@ -91,26 +91,23 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ba
 		frame.Meta = &data.FrameMeta{
 			ExecutedQueryString: executedQueryString,
 		}
-		labels := make(map[string]map[string]bool)
+		labels := make(map[string]string)
 
 		for n, d := range response.TimeSeriesDescriptor.LabelDescriptors {
 			key := toSnakeCase(d.Key)
 			key = strings.Replace(key, ".", ".label.", 1)
-			if _, ok := labels[key]; !ok {
-				labels[key] = map[string]bool{}
-			}
 
 			labelValue := series.LabelValues[n]
 			switch d.ValueType {
 			case "BOOL":
 				strVal := strconv.FormatBool(labelValue.BoolValue)
-				labels[key][strVal] = true
+				labels[key] = strVal
 				seriesLabels[key] = strVal
 			case "INT64":
-				labels[key][labelValue.Int64Value] = true
+				labels[key] = labelValue.Int64Value
 				seriesLabels[key] = labelValue.Int64Value
 			default:
-				labels[key][labelValue.StringValue] = true
+				labels[key] = labelValue.StringValue
 				seriesLabels[key] = labelValue.StringValue
 			}
 		}
@@ -124,10 +121,7 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ba
 				continue
 			}
 
-			if _, ok := labels["metric.name"]; !ok {
-				labels["metric.name"] = map[string]bool{}
-			}
-			labels["metric.name"][d.Key] = true
+			labels["metric.name"] = d.Key
 			seriesLabels["metric.name"] = d.Key
 			defaultMetricName := d.Key
 
@@ -239,14 +233,8 @@ func (timeSeriesQuery cloudMonitoringTimeSeriesQuery) parseResponse(queryRes *ba
 			}
 		}
 
-		labelsByKey := make(map[string][]string)
-		for key, values := range labels {
-			for value := range values {
-				labelsByKey[key] = append(labelsByKey[key], value)
-			}
-		}
 		customFrameMeta := map[string]interface{}{}
-		customFrameMeta["labels"] = labelsByKey
+		customFrameMeta["labels"] = labels
 		if frame.Meta != nil {
 			frame.Meta.Custom = customFrameMeta
 		} else {