From 32bd9e22eedf58533a95ea9965359a22ed95865e Mon Sep 17 00:00:00 2001
From: Michael Hoffmann <mhoffm@posteo.de>
Date: Tue, 20 May 2025 12:09:08 +0200
Subject: [PATCH] prometheus: use getSeriesValues in metrics selector (#105361)

When we have labels selected and want to refresh the list of metrics that match this grafana would use an expensive
/api/v1/series call instead of /api/v1/label/__name__/values with matchers, even if the datasource is configured to be
ble to use matchers in label values calls.

Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
---
 packages/grafana-prometheus/src/language_provider.mock.ts   | 1 +
 .../querybuilder/components/MetricsLabelsSection.test.tsx   | 1 +
 .../src/querybuilder/components/MetricsLabelsSection.tsx    | 2 +-
 .../src/querybuilder/components/PromQueryBuilder.test.tsx   | 6 +++---
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-prometheus/src/language_provider.mock.ts b/packages/grafana-prometheus/src/language_provider.mock.ts
index e10c2844b19..2ea779fad26 100644
--- a/packages/grafana-prometheus/src/language_provider.mock.ts
+++ b/packages/grafana-prometheus/src/language_provider.mock.ts
@@ -10,6 +10,7 @@ export class EmptyLanguageProviderMock {
   getLabelKeys = jest.fn().mockReturnValue([]);
   getLabelValues = jest.fn().mockReturnValue([]);
   getSeries = jest.fn().mockReturnValue({ __name__: [] });
+  getSeriesValues = jest.fn().mockReturnValue([]);
   fetchSeries = jest.fn().mockReturnValue([]);
   fetchSeriesLabels = jest.fn().mockReturnValue([]);
   fetchSeriesLabelsMatch = jest.fn().mockReturnValue([]);
diff --git a/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.test.tsx
index 324e0c87af8..50c6ecac011 100644
--- a/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.test.tsx
+++ b/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.test.tsx
@@ -33,6 +33,7 @@ const createMockDatasource = () => {
       fetchSeriesValuesWithMatch: jest.fn().mockResolvedValue(['value1', 'value2']),
       getLabelValues: jest.fn().mockResolvedValue(['value1', 'value2']),
       getSeries: jest.fn().mockResolvedValue({ __name__: ['metric1', 'metric2'] }),
+      getSeriesValues: jest.fn().mockResolvedValue(['metric1', 'metric2']),
       loadMetricsMetadata: jest.fn().mockResolvedValue({}),
       metricsMetadata: { metric1: { type: 'counter', help: 'help text' } },
     },
diff --git a/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx b/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx
index feda40fe881..19a6bec7815 100644
--- a/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx
+++ b/packages/grafana-prometheus/src/querybuilder/components/MetricsLabelsSection.tsx
@@ -244,7 +244,7 @@ async function getMetrics(
   let metrics: string[];
   if (query.labels.length > 0) {
     const expr = promQueryModeller.renderLabels(query.labels);
-    metrics = (await datasource.languageProvider.getSeries(timeRange, expr, true))['__name__'] ?? [];
+    metrics = (await datasource.languageProvider.getSeriesValues(timeRange, '__name__', expr)) ?? [];
   } else {
     metrics = (await datasource.languageProvider.getLabelValues(timeRange, '__name__')) ?? [];
   }
diff --git a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx
index 9f88763fc69..bbf88e8107b 100644
--- a/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx
+++ b/packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilder.test.tsx
@@ -99,10 +99,10 @@ describe('PromQueryBuilder', () => {
     });
     await openMetricSelect(container);
     await waitFor(() =>
-      expect(languageProvider.getSeries).toHaveBeenCalledWith(
+      expect(languageProvider.getSeriesValues).toHaveBeenCalledWith(
         expect.anything(),
-        '{label_name="label_value"}',
-        expect.anything()
+        expect.anything(),
+        '{label_name="label_value"}'
       )
     );
   });