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 #13927 from grafana/davkal/explore-start-task

Browse Source 
Explore: fix metric selector for additional rows
This commit is contained in:
David
2018-11-05 12:30:02 +01:00
committed by GitHub
parent 24e5922d68 edd575b552
commit 0df14f3fa8
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ export default class PromQlLanguageProvider extends LanguageProvider {
labelKeys?: { [index: string]: string[] }; // metric -> [labelKey,...]
labelValues?: { [index: string]: { [index: string]: string[] } }; // metric -> labelKey -> [labelValue,...]
metrics?: string[];
started: boolean;
startTask: Promise<any>;
constructor(datasource: any, initialValues?: any) {
super();
@@ -56,7 +56,6 @@ export default class PromQlLanguageProvider extends LanguageProvider {
this.labelKeys = {};
this.labelValues = {};
this.metrics = [];
this.started = false;
Object.assign(this, initialValues);
}
@@ -72,11 +71,10 @@ export default class PromQlLanguageProvider extends LanguageProvider {
};
start = () => {
if (!this.started) {
this.started = true;
return this.fetchMetricNames().then(() => [this.fetchHistogramMetrics()]);
if (!this.startTask) {
this.startTask = this.fetchMetricNames().then(() => [this.fetchHistogramMetrics()]);
}
return Promise.resolve([]);
return this.startTask;
};
// Keep this DOM-free for testing