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

Merge pull request #14169 from grafana/davkal/explore-logging-keep-labels

Browse Source 
Explore: switching to logging should keep prometheus labels in case o…
This commit is contained in:
David 2018-11-23 11:47:39 +01:00 committed by GitHub
commit 16e7ae4e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/datasource/logging/language_provider.test.ts
View File

@ -95,5 +95,14 @@ describe('Query imports', () => {
const result = await instance.importPrometheusQuery('metric{foo="bar",baz="42"}'); const result = await instance.importPrometheusQuery('metric{foo="bar",baz="42"}');
expect(result).toEqual('{foo="bar"}'); expect(result).toEqual('{foo="bar"}');
}); });
it('returns selector query from selector query with all labels if logging label list is empty', async () => {
const datasourceWithLabels = {
metadataRequest: url => (url === '/api/prom/label' ? { data: { data: [] } } : { data: { data: [] } }),
};
const instance = new LanguageProvider(datasourceWithLabels);
const result = await instance.importPrometheusQuery('metric{foo="bar",baz="42"}');
expect(result).toEqual('{baz="42",foo="bar"}');
});
}); });
}); });

23
public/app/plugins/datasource/logging/language_provider.ts
View File

@ -194,17 +194,24 @@ export default class LoggingLanguageProvider extends LanguageProvider {
// Keep only labels that exist on origin and target datasource // Keep only labels that exist on origin and target datasource
await this.start(); // fetches all existing label keys await this.start(); // fetches all existing label keys
const commonLabels = {}; const existingKeys = this.labelKeys[EMPTY_SELECTOR];
for (const key in labels) { let labelsToKeep = {};
const existingKeys = this.labelKeys[EMPTY_SELECTOR]; if (existingKeys && existingKeys.length > 0) {
if (existingKeys && existingKeys.indexOf(key) > -1) { // Check for common labels
// Should we check for label value equality here? for (const key in labels) {
commonLabels[key] = labels[key]; if (existingKeys && existingKeys.indexOf(key) > -1) {
// Should we check for label value equality here?
labelsToKeep[key] = labels[key];
}
} }
} else {
// Keep all labels by default
labelsToKeep = labels;
} }
const labelKeys = Object.keys(commonLabels).sort();
const labelKeys = Object.keys(labelsToKeep).sort();
const cleanSelector = labelKeys const cleanSelector = labelKeys
.map(key => `${key}${commonLabels[key].operator}${commonLabels[key].value}`) .map(key => `${key}${labelsToKeep[key].operator}${labelsToKeep[key].value}`)
.join(','); .join(',');
return ['{', cleanSelector, '}'].join(''); return ['{', cleanSelector, '}'].join('');