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: Fix caching for default labels request (#20718)

Browse Source
This commit is contained in:
Andrej Ocenas 2019-11-28 16:55:38 +01:00 committed by GitHub
parent 130fb02b17
commit f2574f4944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
public/app/plugins/datasource/prometheus/specs/language_provider.test.ts → public/app/plugins/datasource/prometheus/language_provider.test.ts
View File

@ -1,9 +1,10 @@
import Plain from 'slate-plain-serializer';
import { Editor as SlateEditor } from 'slate';
import LanguageProvider from '../language_provider';
import { PrometheusDatasource } from '../datasource';
import LanguageProvider from './language_provider';
import { PrometheusDatasource } from './datasource';
import { HistoryItem } from '@grafana/data';
import { PromQuery } from '../types';
import { PromQuery } from './types';
import Mock = jest.Mock;
describe('Language completion provider', () => {
const datasource: PrometheusDatasource = ({
@ -411,5 +412,28 @@ describe('Language completion provider', () => {
},
]);
});
it('does not re-fetch default labels', async () => {
const datasource: PrometheusDatasource = ({
metadataRequest: jest.fn(() => ({ data: { data: [] as any[] } })),
getTimeRange: jest.fn(() => ({ start: 0, end: 1 })),
} as any) as PrometheusDatasource;
const instance = new LanguageProvider(datasource);
const value = Plain.deserialize('{}');
const ed = new SlateEditor({ value });
const valueWithSelection = ed.moveForward(1).value;
const args = {
text: '',
prefix: '',
wrapperClasses: ['context-labels'],
value: valueWithSelection,
};
await instance.provideCompletionItems(args);
// one call for 2 default labels job, instance
expect((datasource.metadataRequest as Mock).mock.calls.length).toBe(2);
await instance.provideCompletionItems(args);
expect((datasource.metadataRequest as Mock).mock.calls.length).toBe(2);
});
});
});

13
public/app/plugins/datasource/prometheus/language_provider.ts
View File

@ -308,12 +308,17 @@ export default class PromQlLanguageProvider extends LanguageProvider {
const existingKeys = parsedSelector ? parsedSelector.labelKeys : [];
// Query labels for selector
if (selector && (!this.labelValues[selector] || this.timeRangeChanged())) {
if (selector) {
if (selector === EMPTY_SELECTOR) {
// Query label values for default labels
await Promise.all(DEFAULT_KEYS.map(key => this.fetchLabelValues(key)));
// For empty selector we do not need to check range
if (!this.labelValues[selector]) {
// Query label values for default labels
await Promise.all(DEFAULT_KEYS.map(key => this.fetchLabelValues(key)));
}
} else {
await this.fetchSeriesLabels(selector, !containsMetric);
if (!this.labelValues[selector] || this.timeRangeChanged()) {
await this.fetchSeriesLabels(selector, !containsMetric);
}
}
}