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

Fill Policy visible only in <=2.2

Browse Source
This commit is contained in:
utkarshcmu 2016-02-07 22:03:01 -08:00
parent 908e8577bb
commit 2623240635
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,12 +63,11 @@
</select> </select>
</li> </li>
<li class="tight-form-item query-keyword" style="width: 59px"> <li class="tight-form-item query-keyword" style="width: 59px" ng-if="ctrl.tsdbVersion == 2">
Fill Fill
<tip>Available since OpenTSDB 2.2</tip>
</li> </li>
<li> <li ng-if="ctrl.tsdbVersion == 2">
<select ng-model="ctrl.target.downsampleFillPolicy" class="tight-form-input input-small" <select ng-model="ctrl.target.downsampleFillPolicy" class="tight-form-input input-small"
ng-options="agg for agg in ctrl.fillPolicies" ng-options="agg for agg in ctrl.fillPolicies"
ng-change="ctrl.targetBlur()"> ng-change="ctrl.targetBlur()">

3
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;
tsdbVersion: any;
aggregator: any; aggregator: any;
downsampleInterval: any; downsampleInterval: any;
downsampleAggregator: any; downsampleAggregator: any;
@ -26,6 +27,8 @@ export class OpenTsQueryCtrl extends QueryCtrl {
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.tsdbVersion = this.datasource.tsdbVersion;
if (!this.target.aggregator) { if (!this.target.aggregator) {
this.target.aggregator = 'sum'; this.target.aggregator = 'sum';
} }