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

prometheus: fix variable query to fallback correctly to series query

Browse Source 
Using a query of for example up or up{job=job1}
This commit is contained in:
Marcus Efraimsson 2018-04-25 15:36:00 +02:00
parent 1290087b78
commit 6687409efb
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,4 +329,8 @@ export class PrometheusDatasource {
} }
return Math.ceil(date.valueOf() / 1000); return Math.ceil(date.valueOf() / 1000);
} }
getOriginalMetricName(labelData) {
return this.resultTransformer.getOriginalMetricName(labelData);
}
} }

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

@ -121,7 +121,7 @@ export default class PrometheusMetricFindQuery {
var self = this; var self = this;
return this.datasource.metadataRequest(url).then(function(result) { return this.datasource.metadataRequest(url).then(function(result) {
return _.map(result.data.data, function(metric) { return _.map(result.data.data, metric => {
return { return {
text: self.datasource.getOriginalMetricName(metric), text: self.datasource.getOriginalMetricName(metric),
expandable: true, expandable: true,