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 branch 'es_drop_first_last' of https://github.com/Qtax/grafana into Qtax-es_drop_first_last

Browse Source
This commit is contained in:
carl bergquist
2015-12-16 09:48:14 +01:00
parent 48539c851e bf41eb824d
commit d882af9f94
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
View File

@@ -37,7 +37,7 @@
<div class="tight-form-inner-box" ng-if="agg.type === 'date_histogram'">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 94px">
<li class="tight-form-item" style="width: 140px">
Interval
</li>
<li>
@@ -46,13 +46,29 @@
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 94px">
<li class="tight-form-item" style="width: 140px">
Min Doc Count
</li>
<li>
<input type="number" class="tight-form-input" ng-model="agg.settings.min_doc_count" ng-blur="onChangeInternal()"></input>
<input type="number" class="tight-form-input" ng-model="agg.settings.min_doc_count" ng-blur="onChangeInternal()">
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 140px">
Drop first &amp; last value
</li>
<li class="tight-form-item">
<input class="cr1" type="checkbox" id="agg[{{agg.id}}].settings.dropFirstLast"
ng-model="agg.settings.dropFirstLast" ng-checked="agg.settings.dropFirstLast" ng-change="onChangeInternal()">
<label for="agg[{{agg.id}}].settings.dropFirstLast" class="cr1"></label>
</li>
<li class="tight-form-item last">
<i class="fa fa-question-circle" bs-tooltip="'Ignore the first and last values of the dataset'" data-placement="right"></i>
</li>
</ul>
<div class="clearfix"></div>