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"}' ) ); });