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

Added Filters UI

Browse Source
This commit is contained in:
utkarshcmu 2016-02-08 21:51:59 -08:00
parent 2623240635
commit d92172f50c
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
public/app/plugins/datasource/opentsdb/partials/query.editor.html
View File

@ -82,10 +82,53 @@
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form" ng-if="ctrl.tsdbVersion == 2">
<ul class="tight-form-list" role="menu">
<li class="tight-form-item tight-form-align query-keyword" style="width: 100px">
Filters
</li>
<li ng-repeat="filter in ctrl.target.filters track by $index" class="tight-form-item">
{{filter.type}}:{{filter.key}}&nbsp;=&nbsp;{{filter.value}}:{{filter.groupByFlag}}
<a ng-click="ctrl.editFilter(filter.type, filter.key, filter.value, filter.groupByFlag)">
<i class="fa fa-pencil"></i>
</a>
<a ng-click="ctrl.removeFilter(filter.type, filter.key)">
<i class="fa fa-remove"></i>
</a>
</li>
<li class="tight-form-item query-keyword" ng-hide="ctrl.addFilterMode">
<a ng-click="ctrl.addFilter()">
<i class="fa fa-plus"></i>
</a>
</li>
<li ng-show="ctrl.addFilterMode">
<input type="text" class="input-small tight-form-input" spellcheck='false'
bs-typeahead="ctrl.suggestFilterKeys" data-min-length=0 data-items=100
ng-model="ctrl.target.currentFilterKey" placeholder="key"></input>
<input type="text" class="input-small tight-form-input"
spellcheck='false' bs-typeahead="ctrl.suggestFilterValues"
data-min-length=0 data-items=100 ng-model="ctrl.target.currentFilterValue" placeholder="value">
</input>
<a ng-click="ctrl.addFilter()">
add filter
</a>
<a bs-tooltip="ctrl.errors.filters"
style="color: rgb(229, 189, 28)"
ng-show="target.errors.filters">
<i class="fa fa-warning"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form"> <div class="tight-form">
<ul class="tight-form-list" role="menu"> <ul class="tight-form-list" role="menu">
<li class="tight-form-item tight-form-align query-keyword" style="width: 100px"> <li class="tight-form-item tight-form-align query-keyword" style="width: 100px">
Tags Tags
<tip ng-if="ctrl.tsdbVersion == 2">Please use filters, tags are deprecated in opentsdb 2.2</tip>
</li> </li>
<li ng-repeat="(key, value) in ctrl.target.tags track by $index" class="tight-form-item"> <li ng-repeat="(key, value) in ctrl.target.tags track by $index" class="tight-form-item">
{{key}}&nbsp;=&nbsp;{{value}} {{key}}&nbsp;=&nbsp;{{value}}

2
public/app/plugins/datasource/opentsdb/query_ctrl.ts
View File

@ -8,6 +8,7 @@ export class OpenTsQueryCtrl extends QueryCtrl {
static templateUrl = 'partials/query.editor.html'; static templateUrl = 'partials/query.editor.html';
aggregators: any; aggregators: any;
fillPolicies: any; fillPolicies: any;
filterTypes: any;
tsdbVersion: any; tsdbVersion: any;
aggregator: any; aggregator: any;
downsampleInterval: any; downsampleInterval: any;
@ -26,6 +27,7 @@ export class OpenTsQueryCtrl extends QueryCtrl {
this.errors = this.validateTarget(); this.errors = this.validateTarget();
this.aggregators = ['avg', 'sum', 'min', 'max', 'dev', 'zimsum', 'mimmin', 'mimmax']; this.aggregators = ['avg', 'sum', 'min', 'max', 'dev', 'zimsum', 'mimmin', 'mimmax'];
this.fillPolicies = ['none', 'nan', 'null', 'zero']; this.fillPolicies = ['none', 'nan', 'null', 'zero'];
this.filterTypes = ['wildcard','iliteral_or','not_iliteral_or','not_literal_or','iwildcard','literal_or','regexp'];
this.tsdbVersion = this.datasource.tsdbVersion; this.tsdbVersion = this.datasource.tsdbVersion;