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

docker/blocks/prometheus/prometheus.yml

@@ -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']

public/app/features/templating/templateSrv.js

@@ -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') {

public/app/plugins/datasource/prometheus/datasource.ts

@@ -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;

public/app/plugins/datasource/prometheus/plugin.json

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

public/test/specs/templateSrv-specs.js

@@ -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() {