Skip to content

N
nexpie-grafana-theme
Commit 3e9aca3e by Torkel Ödegaard
Options

feat(elasticsearch): terms aggregation options are working, things are starting… 

feat(elasticsearch): terms aggregation options are working, things are starting to come together, #1034
parent 2d832e10
Showing with 150 additions and 122 deletions
public/app/plugins/datasource/elasticsearch/advancedOptions.js deleted 100644 → 0
define([
'angular',
'lodash',
'jquery',
],
function (angular, _, $) {
'use strict';
angular
.module('grafana.directives')
.directive('tightFormAdvancedOption', function($compile, uiSegmentSrv, $q) {
return {
templateUrl: 'app/plugins/datasource/elasticsearch/partials/advancedOption.html',
restrict: 'E',
scope: {
model: "=",
option: "=",
},
link: function postLink($scope, elem) {
}
};
});
});
public/app/plugins/datasource/elasticsearch/bucketAgg.js
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'jquery', './queryDef',
], ],
function (angular, _, $) { function (angular, _, queryDef) {
'use strict'; 'use strict';
var module = angular.module('grafana.directives'); var module = angular.module('grafana.directives');
module.controller('ElasticBucketAggCtrl', function($scope, uiSegmentSrv, $q) { module.controller('ElasticBucketAggCtrl', function($scope, uiSegmentSrv, $q, $rootScope) {
var bucketAggs = $scope.target.bucketAggs; var bucketAggs = $scope.target.bucketAggs;
$scope.bucketAggTypes = [ $scope.orderByOptions = [];
{text: "Terms", value: 'terms' }, $scope.bucketAggTypes = queryDef.bucketAggTypes;
{text: "Date Histogram", value: 'date_histogram' }, $scope.orderOptions = queryDef.orderOptions;
]; $scope.sizeOptions = queryDef.sizeOptions;
$scope.orderOptions = [ $rootScope.onAppEvent('elastic-query-updated', function() {
{text: "Top", value: 'desc' }, $scope.validateModel();
{text: "Bottom", value: 'asc' }, $scope.updateOrderByOptions();
];
$scope.sizeOptions = [
{text: "No limit", value: '0' },
{text: "1", value: '1' },
{text: "2", value: '2' },
{text: "3", value: '4' },
{text: "5", value: '5' },
{text: "10", value: '10' },
{text: "15", value: '15' },
{text: "20", value: '20' },
];
$scope.$watch("index", function() {
$scope.isFirst = $scope.index === 0;
$scope.isLast = $scope.index === bucketAggs.length - 1;
}); });
$scope.init = function() { $scope.init = function() {
$scope.agg = bucketAggs[$scope.index]; $scope.agg = bucketAggs[$scope.index];
$scope.modelIsValid(); $scope.validateModel();
}; };
$scope.onChangeInternal = function() { $scope.onChangeInternal = function() {
if ($scope.modelIsValid()) { if ($scope.validateModel()) {
$scope.onChange(); $scope.onChange();
} }
}; };
$scope.modelIsValid = function() { $scope.validateModel = function() {
if ($scope.agg.type === "terms") { $scope.isFirst = $scope.index === 0;
$scope.aggOptionsString = "Top 5, Order by: sum @value"; $scope.isLast = $scope.index === bucketAggs.length - 1;
$scope.aggOptionsString = "";
if ($scope.agg.type === "terms") {
$scope.agg.order = $scope.agg.order || "desc"; $scope.agg.order = $scope.agg.order || "desc";
$scope.agg.size = $scope.agg.size || "0"; $scope.agg.size = $scope.agg.size || "0";
$scope.agg.orderBy = $scope.agg.orderBy || "_count"; $scope.agg.orderBy = $scope.agg.orderBy || "_count";
if ($scope.agg.size === '0') {
$scope.aggOptionsString = "";
} else {
$scope.aggOptionsString = queryDef.describeOrder($scope.agg.order) + ' ' + $scope.agg.size + ', '
}
$scope.aggOptionsString += 'Order by: ' + queryDef.describeOrderBy($scope.agg.orderBy, $scope.target);
if ($scope.agg.size === '0') {
$scope.aggOptionsString += ' (' + $scope.agg.order + ')';
} }
}
return true; return true;
}; };
$scope.toggleOptions = function() { $scope.toggleOptions = function() {
$scope.showOptions = !$scope.showOptions; $scope.showOptions = !$scope.showOptions;
$scope.updateOrderByOptions();
};
$scope.orderByOptions = [ $scope.updateOrderByOptions = function() {
{text: "Doc Count", value: '_count' }, $scope.orderByOptions = queryDef.getOrderByOptions($scope.target);
{text: "Term name", value: '_term' }, };
{text: "Average of @value", value: '1' },
];
}
$scope.addBucketAgg = function() { $scope.addBucketAgg = function() {
// if last is date histogram add it before // if last is date histogram add it before
...@@ -83,6 +80,7 @@ function (angular, _, $) { ...@@ -83,6 +80,7 @@ function (angular, _, $) {
}, 0); }, 0);
bucketAggs.splice(addIndex, 0, {type: "terms", field: "select field", id: (id+1).toString()}); bucketAggs.splice(addIndex, 0, {type: "terms", field: "select field", id: (id+1).toString()});
$scope.onChange();
}; };
$scope.removeBucketAgg = function() { $scope.removeBucketAgg = function() {
...@@ -94,19 +92,4 @@ function (angular, _, $) { ...@@ -94,19 +92,4 @@ function (angular, _, $) {
}); });
module.directive('elasticBucketAgg', function() {
return {
templateUrl: 'app/plugins/datasource/elasticsearch/partials/bucketAgg.html',
controller: 'ElasticBucketAggCtrl',
restrict: 'E',
scope: {
target: "=",
index: "=",
onChange: "&",
getFields: "&",
},
link: function postLink($scope, elem) {
}
};
});
}); });
public/app/plugins/datasource/elasticsearch/directives.js
...@@ -20,4 +20,32 @@ function (angular) { ...@@ -20,4 +20,32 @@ function (angular) {
return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/annotations.editor.html'}; return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/annotations.editor.html'};
}); });
module.directive('elasticMetricAgg', function() {
return {
templateUrl: 'app/plugins/datasource/elasticsearch/partials/metricAgg.html',
controller: 'ElasticMetricAggCtrl',
restrict: 'E',
scope: {
target: "=",
index: "=",
onChange: "&",
getFields: "&",
}
};
});
module.directive('elasticBucketAgg', function() {
return {
templateUrl: 'app/plugins/datasource/elasticsearch/partials/bucketAgg.html',
controller: 'ElasticBucketAggCtrl',
restrict: 'E',
scope: {
target: "=",
index: "=",
onChange: "&",
getFields: "&",
}
};
});
}); });
public/app/plugins/datasource/elasticsearch/metricAgg.js
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'jquery', './queryDef'
], ],
function (angular, _, $) { function (angular, _, queryDef) {
'use strict'; 'use strict';
var module = angular.module('grafana.directives'); var module = angular.module('grafana.directives');
...@@ -11,14 +11,7 @@ function (angular, _, $) { ...@@ -11,14 +11,7 @@ function (angular, _, $) {
module.controller('ElasticMetricAggCtrl', function($scope, uiSegmentSrv, $q) { module.controller('ElasticMetricAggCtrl', function($scope, uiSegmentSrv, $q) {
var metricAggs = $scope.target.metrics; var metricAggs = $scope.target.metrics;
$scope.metricAggTypes = [ $scope.metricAggTypes = queryDef.metricAggTypes;
{text: "Count", value: 'count' },
{text: "Average of", value: 'avg' },
{text: "Sum of", value: 'sum' },
{text: "Max of", value: 'max' },
{text: "Min of", value: 'min' },
{text: "Standard Deviations", value: 'std_dev' },
];
$scope.init = function() { $scope.init = function() {
$scope.agg = metricAggs[$scope.index]; $scope.agg = metricAggs[$scope.index];
...@@ -56,19 +49,4 @@ function (angular, _, $) { ...@@ -56,19 +49,4 @@ function (angular, _, $) {
}); });
module.directive('elasticMetricAgg', function() {
return {
templateUrl: 'app/plugins/datasource/elasticsearch/partials/metricAgg.html',
controller: 'ElasticMetricAggCtrl',
restrict: 'E',
scope: {
target: "=",
index: "=",
onChange: "&",
getFields: "&",
},
link: function postLink($scope, elem) {
}
};
});
}); });
public/app/plugins/datasource/elasticsearch/partials/bucketAgg.html
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<div class="tight-form last"> <div class="tight-form last">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 60px"> <li class="tight-form-item" style="width: 60px">
By Order By
</li> </li>
<li> <li>
<metric-segment-model property="agg.orderBy" options="orderByOptions" on-change="onChangeInternal()" css-class="last"></metric-segment-model> <metric-segment-model property="agg.orderBy" options="orderByOptions" on-change="onChangeInternal()" css-class="last"></metric-segment-model>
......
public/app/plugins/datasource/elasticsearch/queryCtrl.js
...@@ -16,24 +16,7 @@ function (angular, _, ElasticQueryBuilder) { ...@@ -16,24 +16,7 @@ function (angular, _, ElasticQueryBuilder) {
target.timeField = target.timeField || '@timestamp'; target.timeField = target.timeField || '@timestamp';
target.metrics = target.metrics || [{ type: 'count', id: '1' }]; target.metrics = target.metrics || [{ type: 'count', id: '1' }];
target.bucketAggs = target.bucketAggs || []; target.bucketAggs = target.bucketAggs || [{ type: 'date_histogram', field: '@timestmap', id: '2'}];
target.bucketAggs = [
{
type: 'terms',
field: '@hostname',
id: '2'
},
{
type: 'date_histogram',
field: '@timestamp',
id: '3'
},
];
$scope.timeSegment = uiSegmentSrv.newSegment(target.timeField);
$scope.removeSelectSegment = uiSegmentSrv.newSegment({fake: true, value: '-- remove select --'});
$scope.resetSelectSegment = uiSegmentSrv.newSegment({fake: true, value: '-- reset --'});
$scope.queryBuilder = new ElasticQueryBuilder(target); $scope.queryBuilder = new ElasticQueryBuilder(target);
$scope.rawQueryOld = angular.toJson($scope.queryBuilder.build($scope.target), true); $scope.rawQueryOld = angular.toJson($scope.queryBuilder.build($scope.target), true);
...@@ -46,12 +29,13 @@ function (angular, _, ElasticQueryBuilder) { ...@@ -46,12 +29,13 @@ function (angular, _, ElasticQueryBuilder) {
}; };
$scope.queryUpdated = function() { $scope.queryUpdated = function() {
console.log('qery updated');
var newJson = angular.toJson($scope.queryBuilder.build($scope.target), true); var newJson = angular.toJson($scope.queryBuilder.build($scope.target), true);
if (newJson !== $scope.oldQueryRaw) { if (newJson !== $scope.oldQueryRaw) {
$scope.rawQueryOld = newJson; $scope.rawQueryOld = newJson;
$scope.get_data(); $scope.get_data();
} }
$scope.appEvent('elastic-query-updated');
}; };
$scope.transformToSegments = function(addTemplateVars) { $scope.transformToSegments = function(addTemplateVars) {
...@@ -65,7 +49,6 @@ function (angular, _, ElasticQueryBuilder) { ...@@ -65,7 +49,6 @@ function (angular, _, ElasticQueryBuilder) {
segments.unshift(uiSegmentSrv.newSegment({ type: 'template', value: '$' + variable.name, expandable: true })); segments.unshift(uiSegmentSrv.newSegment({ type: 'template', value: '$' + variable.name, expandable: true }));
}); });
} }
return segments; return segments;
}; };
}; };
......
public/app/plugins/datasource/elasticsearch/queryDef.js 0 → 100644
define([
'lodash'
],
function (_) {
'use strict';
return {
metricAggTypes: [
{text: "Count", value: 'count' },
{text: "Average of", value: 'avg' },
{text: "Sum of", value: 'sum' },
{text: "Max of", value: 'max' },
{text: "Min of", value: 'min' },
{text: "Standard Deviations", value: 'std_dev' },
],
bucketAggTypes: [
{text: "Terms", value: 'terms' },
{text: "Date Histogram", value: 'date_histogram' },
],
orderByOptions: [
{text: "Doc Count", value: '_count' },
{text: "Term value", value: '_term' },
],
orderOptions: [
{text: "Top", value: 'desc' },
{text: "Bottom", value: 'asc' },
],
sizeOptions: [
{text: "No limit", value: '0' },
{text: "1", value: '1' },
{text: "2", value: '2' },
{text: "3", value: '4' },
{text: "5", value: '5' },
{text: "10", value: '10' },
{text: "15", value: '15' },
{text: "20", value: '20' },
],
getOrderByOptions: function(target) {
var self = this;
var metricRefs = [];
_.each(target.metrics, function(metric) {
if (metric.type !== 'count') {
metricRefs.push({text: self.describeMetric(metric), value: metric.id});
}
});
return this.orderByOptions.concat(metricRefs);
},
describeOrder: function(order) {
var def = _.findWhere(this.orderOptions, {value: order});
return def.text;
},
describeMetric: function(metric) {
var def = _.findWhere(this.metricAggTypes, {value: metric.type});
return def.text + ' ' + metric.field;
},
describeOrderBy: function(orderBy, target) {
var def = _.findWhere(this.orderByOptions, {value: orderBy});
if (def) {
return def.text;
}
var metric = _.findWhere(target.metrics, {id: orderBy});
if (metric) {
return this.describeMetric(metric);
} else {
return "metric not found";
}
},
};
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment