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

test for adding syntax in addition to [[variable]]

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-04 17:34:36 +02:00
parent 44edaad19d
commit 6ff188e4d9
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/controllers/graphiteTarget.js
View File

@ -165,7 +165,7 @@ function (angular, _, config, gfunc, Parser) {
_.each(templateSrv.variables, function(variable) { _.each(templateSrv.variables, function(variable) {
$scope.altSegments.unshift(new MetricSegment({ $scope.altSegments.unshift(new MetricSegment({
type: 'template', type: 'template',
value: '[[' + variable.name + ']]', value: '$' + variable.name + ']]',
expandable: true, expandable: true,
})); }));
}); });

8
src/app/partials/panelgeneral.html
View File

@ -4,8 +4,12 @@
<div class="editor-option"> <div class="editor-option">
<label class="small">Title</label><input type="text" class="input-medium" ng-model='panel.title'></input> <label class="small">Title</label><input type="text" class="input-medium" ng-model='panel.title'></input>
</div> </div>
<div class="editor-option" ng-hide="panel.sizeable == false"> <div class="editor-option">
<label class="small">Span</label> <select class="input-mini" ng-model="panel.span" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select> <label class="small">Span</label> <select class="input-mini" ng-model="panel.span" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select>
</div> </div>
<div class="editor-option">
<label class="small">Height</label><input type="text" class="input-medium" ng-model='panel.height'></select>
</div>
</div> </div>
</div> </div>

3
src/app/services/influxdb/influxdbDatasource.js
View File

@ -19,9 +19,6 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
this.username = datasource.username; this.username = datasource.username;
this.password = datasource.password; this.password = datasource.password;
this.name = datasource.name; this.name = datasource.name;
this.templateSettings = {
interpolate : /\[\[([\s\S]+?)\]\]/g,
};
this.saveTemp = _.isUndefined(datasource.save_temp) ? true : datasource.save_temp; this.saveTemp = _.isUndefined(datasource.save_temp) ? true : datasource.save_temp;
this.saveTempTTL = _.isUndefined(datasource.save_temp_ttl) ? '30d' : datasource.save_temp_ttl; this.saveTempTTL = _.isUndefined(datasource.save_temp_ttl) ? '30d' : datasource.save_temp_ttl;

10
src/app/services/templateSrv.js
View File

@ -8,10 +8,12 @@ function (angular, _) {
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
module.service('templateSrv', function($q, $routeParams) { module.service('templateSrv', function($q, $routeParams) {
var self = this;
this.init = function(variables) { this.init = function(variables) {
this.templateSettings = { interpolate : /\[\[([\s\S]+?)\]\]/g }; this.templateSettings = { interpolate : /\[\[([\s\S]+?)\]\]/g };
this.variables = variables; this.variables = variables;
this.regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g;
this.updateTemplateData(true); this.updateTemplateData(true);
}; };
@ -39,11 +41,11 @@ function (angular, _) {
}; };
this.replace = function(target) { this.replace = function(target) {
if (!target || target.indexOf('[[') === -1) { if (!target) { return; }
return target;
}
return _.template(target, this._templateData, this.templateSettings); return target.replace(this.regex, function(match, g1, g2) {
return self._templateData[g1 || g2] || match;
});
}; };
}); });

3
src/css/less/overrides.less
View File

@ -66,7 +66,8 @@ code, pre {
} }
.panel { .panel {
display: inline-table; display: inline-block;
float: left;
vertical-align: top; vertical-align: top;
} }