Merge pull request grafana#2867 from juliusv/fix-prometheus-link

torkelo · torkelo · commit f44eaae88a04 · 2015-10-01T18:43:19.000+02:00
Fix "Link to Prometheus" button for proxied Prometheus sources.
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
@@ -81,6 +81,11 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 			dsMap["index"] = ds.Database
 		}
 
+		if ds.Type == m.DS_PROMETHEUS {
+			// add unproxied server URL for link to Prometheus web UI
+			dsMap["directUrl"] = ds.Url
+		}
+
 		datasources[ds.Name] = dsMap
 	}
 
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
@@ -12,6 +12,7 @@ const (
 	DS_ES            = "elasticsearch"
 	DS_OPENTSDB      = "opentsdb"
 	DS_CLOUDWATCH    = "cloudwatch"
+	DS_PROMETHEUS    = "prometheus"
 	DS_ACCESS_DIRECT = "direct"
 	DS_ACCESS_PROXY  = "proxy"
 )
diff --git a/public/app/plugins/datasource/prometheus/datasource.js b/public/app/plugins/datasource/prometheus/datasource.js
@@ -21,12 +21,8 @@ function (angular, _, moment, dateMath) {
       this.name = datasource.name;
       this.supportMetrics = true;
 
-      var url = datasource.url;
-      if (url[url.length-1] === '/') {
-        // remove trailing slash
-        url = url.substr(0, url.length - 1);
-      }
-      this.url = url;
+      this.url = datasource.url.replace(/\/$/g, '');
+      this.directUrl = datasource.directUrl.replace(/\/$/g, '');
       this.basicAuth = datasource.basicAuth;
       this.lastErrors = {};
     }
diff --git a/public/app/plugins/datasource/prometheus/queryCtrl.js b/public/app/plugins/datasource/prometheus/queryCtrl.js
@@ -111,7 +111,7 @@ function (angular, _, kbn, dateMath) {
       };
 
       var hash = encodeURIComponent(JSON.stringify([expr]));
-      return $scope.datasource.url + '/graph#' + hash;
+      return $scope.datasource.directUrl + '/graph#' + hash;
     };
 
     $scope.calculateInterval = function() {
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts b/public/app/plugins/datasource/prometheus/specs/datasource_specs.ts
@@ -10,11 +10,11 @@ describe('PrometheusDatasource', function() {
   beforeEach(angularMocks.module('grafana.services'));
   beforeEach(ctx.createService('PrometheusDatasource'));
   beforeEach(function() {
-    ctx.ds = new ctx.service({ url: '', user: 'test', password: 'mupp' });
+    ctx.ds = new ctx.service({ url: 'proxied', directUrl: 'direct', user: 'test', password: 'mupp' });
   });
   describe('When querying prometheus with one target using query editor target spec', function() {
     var results;
-    var urlExpected = '/api/v1/query_range?query=' +
+    var urlExpected = 'proxied/api/v1/query_range?query=' +
                       encodeURIComponent('test{job="testjob"}') +
                       '&start=1443438675&end=1443460275&step=60s';
     var query = {
@@ -53,7 +53,7 @@ describe('PrometheusDatasource', function() {
         status: "success",
         data: ["value1", "value2", "value3"]
       };
-      ctx.$httpBackend.expect('GET', '/api/v1/label/resource/values').respond(response);
+      ctx.$httpBackend.expect('GET', 'proxied/api/v1/label/resource/values').respond(response);
       ctx.ds.metricFindQuery('label_values(resource)').then(function(data) { results = data; });
       ctx.$httpBackend.flush();
       ctx.$rootScope.$apply();
@@ -71,7 +71,7 @@ describe('PrometheusDatasource', function() {
           ]
         }
       };
-      ctx.$httpBackend.expect('GET', /\/api\/v1\/query\?query=count\(metric\)%20by%20\(resource\)&time=.*/).respond(response);
+      ctx.$httpBackend.expect('GET', /proxied\/api\/v1\/query\?query=count\(metric\)%20by%20\(resource\)&time=.*/).respond(response);
       ctx.ds.metricFindQuery('label_values(metric, resource)').then(function(data) { results = data; });
       ctx.$httpBackend.flush();
       ctx.$rootScope.$apply();
@@ -82,7 +82,7 @@ describe('PrometheusDatasource', function() {
         status: "success",
         data: ["metric1","metric2","metric3","nomatch"]
       };
-      ctx.$httpBackend.expect('GET', '/api/v1/label/__name__/values').respond(response);
+      ctx.$httpBackend.expect('GET', 'proxied/api/v1/label/__name__/values').respond(response);
       ctx.ds.metricFindQuery('metrics(metric.*)').then(function(data) { results = data; });
       ctx.$httpBackend.flush();
       ctx.$rootScope.$apply();

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,11 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro`
`81`	`81`	`dsMap["index"] = ds.Database`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ if ds.Type == m.DS_PROMETHEUS {`
	`85`	`+ // add unproxied server URL for link to Prometheus web UI`
	`86`	`+ dsMap["directUrl"] = ds.Url`
	`87`	`+ }`
	`88`	`+`
`84`	`89`	`datasources[ds.Name] = dsMap`
`85`	`90`	`}`
`86`	`91`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ const (`
`12`	`12`	`DS_ES = "elasticsearch"`
`13`	`13`	`DS_OPENTSDB = "opentsdb"`
`14`	`14`	`DS_CLOUDWATCH = "cloudwatch"`
	`15`	`+ DS_PROMETHEUS = "prometheus"`
`15`	`16`	`DS_ACCESS_DIRECT = "direct"`
`16`	`17`	`DS_ACCESS_PROXY = "proxy"`
`17`	`18`	`)`