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

Merge pull request #2808 from utkarshcmu/master

Browse Source 
Implemented Opentsdb MultiSelect Templating.
This commit is contained in:
Torkel Ödegaard
2015-09-23 11:16:01 +02:00
parent 4100c9881a 6f43cbf665
commit 71984b25e9
5 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/templating/partials/editor.html
View File

@@ -186,7 +186,7 @@
All format
</li>
<li ng-show="current.includeAll">
<select class="input-medium tight-form-input last" ng-model="current.allFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'wildcard', 'regex wildcard', 'regex values', 'lucene']"></select>
<select class="input-medium tight-form-input last" ng-model="current.allFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'wildcard', 'regex wildcard', 'regex values', 'lucene', 'pipe']"></select>
</li>
</ul>
<div class="clearfix"></div>
@@ -217,7 +217,7 @@
Multi format
</li>
<li ng-show="current.multi">
<select class="input-medium tight-form-input last" ng-model="current.multiFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'regex values', 'lucene']"></select>
<select class="input-medium tight-form-input last" ng-model="current.multiFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'regex values', 'lucene', 'pipe']"></select>
</li>
</ul>
<div class="clearfix"></div>

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

@@ -46,6 +46,9 @@ function (angular, _) {
case "lucene": {
return '(' + value.join(' OR ') + ')';
}
case "pipe": {
return value.join('|');
}
default: {
return '{' + value.join(',') + '}';
}

4
public/app/features/templating/templateValuesSrv.js
View File

@@ -271,6 +271,10 @@ function (angular, _, kbn) {
}).join('|') + ')';
break;
}
case 'pipe': {
allValue = _.pluck(variable.options, 'text').join('|');
break;
}
default: {
allValue = '{';
allValue += _.pluck(variable.options, 'text').join(',');

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

@@ -81,6 +81,16 @@ define([
expect(result).to.be('(test|test2)');
});
it('multi value and pipe should render pipe string', function() {
var result = _templateSrv.renderVariableValue({
multiFormat: 'pipe',
current: {
value: ['test','test2'],
}
});
expect(result).to.be('test|test2');
});
});
describe('can check if variable exists', function() {

11
public/test/specs/templateValuesSrv-specs.js
View File

@@ -349,6 +349,17 @@ define([
});
});
describeUpdateVariable('with include all pipe all values', function(scenario) {
scenario.setup(function() {
scenario.variable = { type: 'query', query: 'apps.*', name: 'test', includeAll: true, allFormat: 'pipe' };
scenario.queryResult = [{text: 'backend1'}, {text: 'backend2'}, { text: 'backend3'}];
});
it('should add pipe delimited string', function() {
expect(scenario.variable.options[0].value).to.be('backend1|backend2|backend3');
});
});
});
});