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

Datasource/Loki: Fixes issue where cached log values weren't merged when labels were refreshed (#24101)

Browse Source 
* Datasource/Loki: Fixes issue where cached log values weren't merged when labels were refreshed

Closes #24087
This commit is contained in:
kay delaney
2020-05-05 13:19:52 +01:00
committed by GitHub
parent ed73d06846
commit 79a084392f
3 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap
View File

@@ -54,6 +54,7 @@ exports[`LokiExploreQueryEditor should render component 1`] = `
datasource={
Object {
"languageProvider": LokiLanguageProvider {
"addLabelValuesToOptions": [Function],
"cleanText": [Function],
"datasource": [Circular],
"fetchSeriesLabels": [Function],

34
public/app/plugins/datasource/loki/language_provider.test.ts
View File

@@ -144,6 +144,40 @@ describe('Language completion provider', () => {
]);
});
});
describe('label values', () => {
it('should fetch label values if not cached', async () => {
const absoluteRange: AbsoluteTimeRange = {
from: 0,
to: 5000,
};
const datasource = makeMockLokiDatasource({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
const provider = await getLanguageProvider(datasource);
const requestSpy = jest.spyOn(provider, 'request');
const labelValues = await provider.fetchLabelValues('testkey', absoluteRange);
expect(requestSpy).toHaveBeenCalled();
expect(labelValues).toEqual(['label1_val1', 'label1_val2']);
});
it('should return cached values', async () => {
const absoluteRange: AbsoluteTimeRange = {
from: 0,
to: 5000,
};
const datasource = makeMockLokiDatasource({ testkey: ['label1_val1', 'label1_val2'], label2: [] });
const provider = await getLanguageProvider(datasource);
const requestSpy = jest.spyOn(provider, 'request');
const labelValues = await provider.fetchLabelValues('testkey', absoluteRange);
expect(requestSpy).toHaveBeenCalledTimes(1);
expect(labelValues).toEqual(['label1_val1', 'label1_val2']);
const nextLabelValues = await provider.fetchLabelValues('testkey', absoluteRange);
expect(requestSpy).toHaveBeenCalledTimes(1);
expect(nextLabelValues).toEqual(['label1_val1', 'label1_val2']);
});
});
});
describe('Request URL', () => {

25
public/app/plugins/datasource/loki/language_provider.ts
View File

@@ -449,6 +449,7 @@ export default class LokiLanguageProvider extends LanguageProvider {
const cacheKey = this.generateCacheKey(url, start, end, key);
const params = { start, end };
let value = this.labelsCache.get(cacheKey);
if (!value) {
try {
@@ -459,20 +460,24 @@ export default class LokiLanguageProvider extends LanguageProvider {
value = values;
this.labelsCache.set(cacheKey, value);
// Add to label options
this.logLabelOptions = this.logLabelOptions.map(keyOption => {
if (keyOption.value === key) {
return {
...keyOption,
children: values.map(value => ({ label: value, value })),
};
}
return keyOption;
});
this.logLabelOptions = this.addLabelValuesToOptions(key, values);
} catch (e) {
console.error(e);
}
} else {
this.logLabelOptions = this.addLabelValuesToOptions(key, value);
}
return value;
}
private addLabelValuesToOptions = (labelKey: string, values: string[]) => {
return this.logLabelOptions.map(keyOption =>
keyOption.value === labelKey
? {
...keyOption,
children: values.map(value => ({ label: value, value })),
}
: keyOption
);
};
}