Browse Source

Merge pull request #14192 from grafana/davkal/fix-14190

Explore: Fix JS error when switching between 2 prometheus datasources
David 7 years ago
parent
commit
2257f63543

+ 1 - 1
public/app/plugins/datasource/prometheus/datasource.ts

@@ -437,7 +437,7 @@ export class PrometheusDatasource {
   }
 
   getQueryHints(query: DataQuery, result: any[]) {
-    return getQueryHints(query.expr, result, this);
+    return getQueryHints(query.expr || '', result, this);
   }
 
   loadRules() {

+ 1 - 1
public/app/plugins/datasource/prometheus/query_hints.ts

@@ -96,7 +96,7 @@ export function getQueryHints(query: string, series?: any[], datasource?: any):
     }
   }
 
-  if (series.length >= SUM_HINT_THRESHOLD_COUNT) {
+  if (series && series.length >= SUM_HINT_THRESHOLD_COUNT) {
     const simpleMetric = query.trim().match(/^\w+$/);
     if (simpleMetric) {
       hints.push({