IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-27 19:30:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-20 15:16:05 +02:00
commit 9eb7b192b8
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/shareModalCtrl.js
View File

@ -75,7 +75,7 @@ function (angular, _, require, config) {
$scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>'; $scope.iframeHtml = '<iframe src="' + soloUrl + '" width="450" height="200" frameborder="0"></iframe>';
$scope.imageUrl = soloUrl.replace('/dashboard-solo/', '/render/dashboard-solo/'); $scope.imageUrl = soloUrl.replace(config.appSubUrl + '/dashboard-solo/', config.appSubUrl + '/render/dashboard-solo/');
$scope.imageUrl += '&width=1000'; $scope.imageUrl += '&width=1000';
$scope.imageUrl += '&height=500'; $scope.imageUrl += '&height=500';
}; };

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

@ -256,23 +256,14 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
return this.renderTemplate(options.legendFormat, labelData) || '{}'; return this.renderTemplate(options.legendFormat, labelData) || '{}';
}; };
this.renderTemplate = function(format, data) { this.renderTemplate = function(aliasPattern, aliasData) {
var originalSettings = _.templateSettings; var aliasRegex = /\{\{\s*(.+?)\s*\}\}/g;
_.templateSettings = { return aliasPattern.replace(aliasRegex, function(match, g1) {
interpolate: /\{\{(.+?)\}\}/g if (aliasData[g1]) {
}; return aliasData[g1];
}
var template = _.template(templateSrv.replace(format)); return g1;
var result; });
try {
result = template(data);
} catch (e) {
result = null;
}
_.templateSettings = originalSettings;
return result;
}; };
this.getOriginalMetricName = function(labelData) { this.getOriginalMetricName = function(labelData) {