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 #14192 from grafana/davkal/fix-14190

Browse Source 
Explore: Fix JS error when switching between 2 prometheus datasources
This commit is contained in:
David 2018-11-26 14:20:16 +01:00 committed by GitHub
commit 2257f63543
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/prometheus/datasource.ts
View File

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

2
public/app/plugins/datasource/prometheus/query_hints.ts
View File

@ -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+$/); const simpleMetric = query.trim().match(/^\w+$/);
if (simpleMetric) { if (simpleMetric) {
hints.push({ hints.push({