From d3b8fc53aad72ffb60b26235fd1b842169c68862 Mon Sep 17 00:00:00 2001
From: Isabella Siu <Isabella.siu@grafana.com>
Date: Thu, 27 Jan 2022 11:35:13 -0500
Subject: [PATCH] CloudMonitoring: Fix resource labels in query editor (#44550)

---
 .../cloud-monitoring/CloudMonitoringMetricFindQuery.ts          | 1 +
 .../cloud-monitoring/components/MetricQueryEditor.tsx           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts b/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts
index b3bff0f4753..b8132e06bae 100644
--- a/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/CloudMonitoringMetricFindQuery.ts
@@ -100,6 +100,7 @@ export default class CloudMonitoringMetricFindQuery {
       return [];
     }
     const refId = 'handleLabelValuesQuery';
+    // REDUCE_MEAN is needed so the groupBy is not ignored
     const labels = await this.datasource.getLabels(selectedMetricType, refId, projectName, {
       groupBys: [labelKey],
       crossSeriesReducer: 'REDUCE_MEAN',
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
index 65eab988c40..31b262b987a 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
@@ -67,7 +67,7 @@ function Editor({
   useEffect(() => {
     if (projectName && metricType) {
       datasource
-        .getLabels(metricType, refId, projectName, { groupBys, crossSeriesReducer })
+        .getLabels(metricType, refId, projectName)
         .then((labels) => setState((prevState) => ({ ...prevState, labels })));
     }
   }, [datasource, groupBys, metricType, projectName, refId, crossSeriesReducer]);