From 4a7153cabe1405d5e53ab43c75f86af84e71dfea Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:17:52 +0100 Subject: [PATCH] [v9.4.x] AzureMonitor: Ensure dimension labels are consistent (#66873) AzureMonitor: Ensure dimension labels are consistent (#66783) Ensure dimension labels are consistent (cherry picked from commit c161b28f2975906f10d0223005a86f2a07f0cf27) Co-authored-by: Andreas Christou --- .../components/MetricsQueryEditor/DimensionFields.test.tsx | 2 +- .../components/MetricsQueryEditor/DimensionFields.tsx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.test.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.test.tsx index 6fc76be570d..8c367e8c6b6 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.test.tsx +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.test.tsx @@ -140,7 +140,7 @@ describe(`Azure Monitor QueryEditor`, () => { { ...mockPanelData.series[0].fields[0], name: 'Test Dimension 1', - labels: { testdimension1: 'testlabel' }, + labels: { Testdimension1: 'testlabel' }, }, ], }, diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.tsx index 33765f4173a..34a33bf9799 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.tsx +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.tsx @@ -33,10 +33,11 @@ const useDimensionLabels = (data: PanelData | undefined, query: AzureMonitorQuer for (const label of labels) { // Labels only exist for series that have a dimension selected for (const [dimension, value] of Object.entries(label)) { - if (labelsObj[dimension]) { - labelsObj[dimension].add(value); + const dimensionLower = dimension.toLowerCase(); + if (labelsObj[dimensionLower]) { + labelsObj[dimensionLower].add(value); } else { - labelsObj[dimension] = new Set([value]); + labelsObj[dimensionLower] = new Set([value]); } } }