From 7c2b1cc9d0981f87675f39901ea7fb737f5135a4 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 27 Jan 2022 17:57:29 +0100 Subject: [PATCH] CloudMonitoring: Fix resource labels in query editor (#44550) (#44555) (cherry picked from commit d3b8fc53aad72ffb60b26235fd1b842169c68862) Co-authored-by: Isabella Siu --- .../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 40a129cbb04..48fcf346bc7 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx @@ -66,7 +66,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]);