IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Don't use match[] parameter if there is no metric (#89352)

Browse Source 
don't use match[] parameter if there is no metric
This commit is contained in:
ismail simsek 2024-06-19 08:19:49 +02:00 committed by GitHub
parent a5e02f033a
commit 76047d9365
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/grafana-prometheus/src/language_provider.test.ts
View File

@ -505,6 +505,20 @@ describe('Language completion provider', () => {
) )
); );
}); });
it('should dont send match[] parameter if there is no metric', async () => {
const mockQueries: PromQuery[] = [
{
refId: 'A',
expr: '',
},
];
const fetchLabel = languageProvider.fetchLabels;
const requestSpy = jest.spyOn(languageProvider, 'request');
await fetchLabel(tr, mockQueries);
expect(requestSpy).toHaveBeenCalled();
expect(requestSpy.mock.calls[0][0].indexOf('match[]')).toEqual(-1);
});
}); });
}); });

12
packages/grafana-prometheus/src/language_provider.ts
View File

@ -219,11 +219,13 @@ export default class PromQlLanguageProvider extends LanguageProvider {
const searchParams = new URLSearchParams({ ...timeParams }); const searchParams = new URLSearchParams({ ...timeParams });
queries?.forEach((q) => { queries?.forEach((q) => {
const visualQuery = buildVisualQueryFromString(q.expr); const visualQuery = buildVisualQueryFromString(q.expr);
searchParams.append('match[]', visualQuery.query.metric); if (visualQuery.query.metric !== '') {
if (visualQuery.query.binaryQueries) { searchParams.append('match[]', visualQuery.query.metric);
visualQuery.query.binaryQueries.forEach((bq) => { if (visualQuery.query.binaryQueries) {
searchParams.append('match[]', bq.query.metric); visualQuery.query.binaryQueries.forEach((bq) => {
}); searchParams.append('match[]', bq.query.metric);
});
}
} }
}); });