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

feat(templating): prometheus now works with new template variable formating/escaping, #2918

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-03-01 16:11:05 +01:00
parent 23a136d9ef
commit d1bac6cde0
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/blocks/prometheus/prometheus.yml
View File

@@ -23,4 +23,4 @@ scrape_configs:
# scheme defaults to 'http'. # scheme defaults to 'http'.
target_groups: target_groups:
- targets: ['localhost:9090', '172.17.42.1:9091'] - targets: ['localhost:9090', '172.17.0.1:9091']

2
public/app/features/templating/templateSrv.js
View File

@@ -50,7 +50,7 @@ function (angular, _) {
} }
var escapedValues = _.map(value, regexEscape); var escapedValues = _.map(value, regexEscape);
return '(' + escapedValues.join('|') + ')'; return escapedValues.join('|');
} }
case "lucene": { case "lucene": {
if (typeof value === 'string') { if (typeof value === 'string') {

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

@@ -52,7 +52,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
} }
var query: any = {}; var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars); query.expr = templateSrv.replace(target.expr, options.scopedVars, 'regex');
var interval = target.interval || options.interval; var interval = target.interval || options.interval;
var intervalFactor = target.intervalFactor || 1; var intervalFactor = target.intervalFactor || 1;

3
public/app/plugins/datasource/prometheus/plugin.json
View File

@@ -4,6 +4,5 @@
"id": "prometheus", "id": "prometheus",
"metrics": true, "metrics": true,
"annotations": true, "annotations": true
"defaultMatchFormat": "pipe"
} }

2
public/test/specs/templateSrv-specs.js
View File

@@ -127,7 +127,7 @@ define([
it('multi value and regex format should render regex string', function() { it('multi value and regex format should render regex string', function() {
var result = _templateSrv.formatValue(['test.','test2'], 'regex'); var result = _templateSrv.formatValue(['test.','test2'], 'regex');
expect(result).to.be('(test\\.|test2)'); expect(result).to.be('test\\.|test2');
}); });
it('multi value and pipe should render pipe string', function() { it('multi value and pipe should render pipe string', function() {