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

fix(elasticsearch): fixed predict default value, fixes #7145

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-01-06 07:06:41 +01:00
parent 6960fb46c2
commit 293fd93e6c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/elasticsearch/bucket_agg.js
View File

@@ -73,7 +73,7 @@ function (angular, _, queryDef) {
$scope.validateModel = function() {
$scope.index = _.indexOf(bucketAggs, $scope.agg);
$scope.isFirst = $scope.index === 0;
$scope.isLast = $scope.index === bucketAggs.length - 1;
$scope.bucketAggCount = bucketAggs.length;
var settingsLinkText = "";
var settings = $scope.agg.settings || {};

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

@@ -23,7 +23,7 @@
<label class="gf-form-label" ng-if="isFirst">
<a class="pointer" ng-click="addBucketAgg()"><i class="fa fa-plus"></i></a>
</label>
<label class="gf-form-label" ng-if="!isFirst">
<label class="gf-form-label" ng-if="bucketAggCount > 1">
<a class="pointer" ng-click="removeBucketAgg()"><i class="fa fa-minus"></i></a>
</label>
</div>

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

@@ -73,7 +73,7 @@ function (_) {
'moving_avg' : [
{text: 'window', default: 5},
{text: 'model', default: 'simple'},
{text: 'predict', default: 0}
{text: 'predict', default: undefined}
],
'derivative': [
{text: 'unit', default: undefined},