root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 76 Packages Projects Releases Wiki Activity

feat(elasticsearch): add support for model setting

This commit is contained in:
carl bergquist 2015-12-11 09:19:05 +01:00
parent 662430d5db
commit 4fa92198a0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/elasticsearch/partials/metricAgg.html
View File

@ -45,7 +45,7 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form last" ng-if="agg.settings.window !== undefined"> <div class="tight-form" ng-if="agg.settings.window !== undefined">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 75px;"> <li class="tight-form-item" style="width: 75px;">
Window Window
@ -56,6 +56,17 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="tight-form last" ng-if="agg.settings.model !== undefined">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 75px;">
Model
</li>
<li>
<input type="text" class="input-medium tight-form-input" ng-change="onChangeInternal()" ng-model="agg.settings.model" blur="onChange()" spellcheck='false'>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last" ng-if="agg.type === 'percentiles'"> <div class="tight-form last" ng-if="agg.type === 'percentiles'">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item"> <li class="tight-form-item">

3
public/app/plugins/datasource/elasticsearch/query_def.js
View File

@ -70,7 +70,8 @@ function (_) {
pipelineOptions: { pipelineOptions: {
'moving_avg' : [ 'moving_avg' : [
{text: 'window', default: 5} {text: 'window', default: 5},
{text: 'model', default: 'simple'}
], ],
'derivative': [] 'derivative': []
}, },