Skip to content

N
nexpie-grafana-theme
Commit 096a554b by Torkel Ödegaard
Options

Merge branch 'elasticsearch-datasource' of https://github.com/aheinz-sg/grafana into elastic_ds

parents 74da5a61 d3e307b1
Showing with 362 additions and 2 deletions
public/app/plugins/datasource/elasticsearch/datasource.js
...@@ -4,9 +4,11 @@ define([ ...@@ -4,9 +4,11 @@ define([
'config', 'config',
'kbn', 'kbn',
'moment', 'moment',
'./queryBuilder',
'./queryCtrl',
'./directives' './directives'
], ],
function (angular, _, config, kbn, moment) { function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
...@@ -292,8 +294,48 @@ function (angular, _, config, kbn, moment) { ...@@ -292,8 +294,48 @@ function (angular, _, config, kbn, moment) {
}); });
}; };
return ElasticDatasource; ElasticDatasource.prototype.testDatasource = function() {
var query = JSON.stringify();
return this._post('/_search?search_type=count', query).then(function() {
return { status: "success", message: "Data source is working", title: "Success" };
});
};
ElasticDatasource.prototype.query = function(options) {
var queryBuilder = new ElasticQueryBuilder;
var query = queryBuilder.build(options.targets);
query = query.replace(/\$interval/g, options.interval);
query = query.replace(/\$rangeFrom/g, options.range.from);
query = query.replace(/\$rangeTo/g, options.range.to);
query = query.replace(/\$maxDataPoints/g, options.maxDataPoints);
query = templateSrv.replace(query, options.scopedVars);
return this._post('/_search?search_type=count', query).then(this._getTimeSeries);
};
ElasticDatasource.prototype._getTimeSeries = function(results) {
var _aggregation2timeSeries = function(aggregation) {
var datapoints = aggregation.date_histogram.buckets.map(function(entry) {
return [entry.stats.avg, entry.key];
}); });
return { target: aggregation.key, datapoints: datapoints };
};
var data = [];
if (results && results.aggregations) {
for (var target in results.aggregations) {
if (!results.aggregations.hasOwnProperty(target)) {
continue;
}
if (results.aggregations[target].date_histogram && results.aggregations[target].date_histogram.buckets) {
data.push(_aggregation2timeSeries(results.aggregations[target]));
} else if (results.aggregations[target].terms && results.aggregations[target].terms.buckets) {
[].push.apply(data, results.aggregations[target].terms.buckets.map(_aggregation2timeSeries));
}
}
}
return { data: data };
};
return ElasticDatasource;
});
}); });
public/app/plugins/datasource/elasticsearch/directives.js
...@@ -6,6 +6,14 @@ function (angular) { ...@@ -6,6 +6,14 @@ function (angular) {
var module = angular.module('grafana.directives'); var module = angular.module('grafana.directives');
module.directive('metricQueryEditorElasticsearch', function() {
return {controller: 'ElasticQueryCtrl', templateUrl: 'app/plugins/datasource/elasticsearch/partials/query.editor.html'};
});
module.directive('metricQueryOptionsElasticsearch', function() {
return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/query.options.html'};
});
module.directive('annotationsQueryEditorElasticsearch', function() { module.directive('annotationsQueryEditorElasticsearch', function() {
return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/annotations.editor.html'}; return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/annotations.editor.html'};
}); });
......
public/app/plugins/datasource/elasticsearch/partials/query.editor.html 0 → 100644
<div class="editor-row">
<div ng-repeat="target in panel.targets" ng-controller="ElasticQueryCtrl" ng-init="init()" ng-class="{'tight-form-disabled': target.hide}" class="tight-form-container-no-item-borders" style="margin-bottom: 10px">
<div class="tight-form">
<ul class="tight-form-list pull-right">
<li ng-show="parserError" class="tight-form-item">
<a bs-tooltip="parserError" style="color: rgb(229, 189, 28)" role="menuitem">
<i class="fa fa-warning"></i>
</a>
</li>
<li class="tight-form-item">
<a class="pointer" tabindex="1" ng-click="toggleQueryMode()">
<i class="fa fa-pencil"></i>
</a>
</li>
<li class="tight-form-item">
<div class="dropdown">
<a class="pointer dropdown-toggle"
data-toggle="dropdown"
tabindex="1">
<i class="fa fa-bars"></i>
</a>
<ul class="dropdown-menu pull-right" role="menu">
<li role="menuitem">
<a tabindex="1"
ng-click="duplicate()">
Duplicate
</a>
</li>
<li role="menuitem">
<a tabindex="1"
ng-click="moveMetricQuery($index, $index-1)">
Move up
</a>
</li>
<li role="menuitem">
<a tabindex="1"
ng-click="moveMetricQuery($index, $index+1)">
Move down
</a>
</li>
</ul>
</div>
</li>
<li class="tight-form-item last">
<a class="pointer" tabindex="1" ng-click="removeDataQuery(target)">
<i class="fa fa-remove"></i>
</a>
</li>
</ul>
<ul class="tight-form-list">
<li>
<a class="tight-form-item"
ng-click="target.hide = !target.hide; get_data();"
role="menuitem">
<i class="fa fa-eye"></i>
</a>
</li>
</ul>
<input type="text" class="tight-form-clear-input" style="width: 80%" ng-model="target.query" focus-me="target.rawQuery" spellcheck='false' ng-model-onblur ng-change="get_data()" ng-show="target.rawQuery"/>
<ul class="tight-form-list" role="menu" ng-hide="target.rawQuery">
<li class="tight-form-item query-keyword" style="width: 75px;">
Function
</li>
<li class="dropdown tight-form-item">
<a gf-dropdown="functionMenu" class="dropdown-toggle" data-toggle="dropdown">
{{target.function}}<span>(value)</span>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form" ng-hide="target.rawQuery">
<ul class="tight-form-list">
<li class="tight-form-item">
<i class="fa fa-eye invisible"></i>
</li>
<li class="tight-form-item query-keyword" style="width: 75px;">
Key Field
</li>
<li>
<metric-segment segment="keyFieldSegment" on-value-changed="keyFieldChanged()"></metric-segment>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form" ng-hide="target.rawQuery">
<ul class="tight-form-list">
<li class="tight-form-item">
<i class="fa fa-eye invisible"></i>
</li>
<li class="tight-form-item query-keyword" style="width: 75px;">
Value Field
</li>
<li>
<metric-segment segment="valueFieldSegment" on-value-changed="valueFieldChanged()"></metric-segment>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form" ng-hide="target.rawQuery">
<ul class="tight-form-list">
<li class="tight-form-item">
<i class="fa fa-eye invisible"></i>
</li>
<li class="tight-form-item query-keyword" style="width: 75px;">
Term
</li>
<li>
<metric-segment segment="termKeySegment" on-value-changed="termKeySegmentChanged()"></metric-segment>
</li>
<li>
<span class="tight-form-item">:</span>
</li>
<li>
<metric-segment segment="termValueSegment" on-value-changed="termValueSegmentChanged()"></metric-segment>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form" ng-hide="target.rawQuery">
<ul class="tight-form-list">
<li class="tight-form-item">
<i class="fa fa-eye invisible"></i>
</li>
<li class="tight-form-item query-keyword" style="width: 75px;">
Group By
</li>
<li>
<metric-segment segment="groupByFieldSegment" on-value-changed="groupByFieldChanged()"></metric-segment>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div>
public/app/plugins/datasource/elasticsearch/partials/query.options.html 0 → 100644
<section class="grafana-metric-options">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item tight-form-item-icon">
<i class="fa fa-wrench"></i>
</li>
<li class="tight-form-item">
Group by time interval
</li>
<li>
<input type="text" class="input-medium tight-form-input" ng-model="panel.interval" ng-blur="get_data();"
spellcheck='false' placeholder="example: >10s">
</li>
<li class="tight-form-item">
<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item tight-form-item-icon">
<i class="fa fa-info-circle"></i>
</li>
<li class="tight-form-item">
<a ng-click="toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
alias patterns
</a>
</li>
<li class="tight-form-item">
<a ng-click="toggleEditorHelp(2)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
stacking &amp; and fill
</a>
</li>
<li class="tight-form-item">
<a ng-click="toggleEditorHelp(3)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
group by time
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</section>
<div class="editor-row">
<div class="pull-left" style="margin-top: 30px;">
<div class="grafana-info-box span6" ng-if="editorHelpIndex === 1">
<h5>Alias patterns</h5>
<ul>
<li>$m = replaced with measurement name</li>
<li>$measurement = replaced with measurement name</li>
<li>$tag_hostname = replaced with the value of the hostname tag</li>
<li>You can also use [[tag_hostname]] pattern replacement syntax</li>
</ul>
</div>
<div class="grafana-info-box span6" ng-if="editorHelpIndex === 2">
<h5>Stacking and fill</h5>
<ul>
<li>When stacking is enabled it important that points align</li>
<li>If there are missing points for one series it can cause gaps or missing bars</li>
<li>You must use fill(0), and select a group by time low limit</li>
<li>Use the group by time option below your queries and specify for example &gt;10s if your metrics are written every 10 seconds</li>
<li>This will insert zeros for series that are missing measurements and will make stacking work properly</li>
</ul>
</div>
<div class="grafana-info-box span6" ng-if="editorHelpIndex === 3">
<h5>Group by time</h5>
<ul>
<li>Group by time is important, otherwise the query could return many thousands of datapoints that will slow down Grafana</li>
<li>Leave the group by time field empty for each query and it will be calculated based on time range and pixel width of the graph</li>
<li>If you use fill(0) or fill(null) set a low limit for the auto group by time interval</li>
<li>The low limit can only be set in the group by time option below your queries</li>
<li>You set a low limit by adding a greater sign before the interval</li>
<li>Example: &gt;60s if you write metrics to ElasticDB every 60 seconds</li>
</ul>
</div>
</div>
</div>
public/app/plugins/datasource/elasticsearch/queryBuilder.js 0 → 100644
define([
],
function () {
'use strict';
function ElasticQueryBuilder() {
}
ElasticQueryBuilder.prototype.build = function(targets) {
var query = {
"aggs": {},
"size": "$maxDataPoints"
};
var self = this;
targets.forEach(function(target) {
if (!target.hide) {
query["aggs"][target.termKey + "_" + target.termValue] = {
"filter": {
"and": [
self._buildRangeFilter(target),
self._buildTermFilter(target)
]
},
"aggs": {
"date_histogram": {
"date_histogram": {
"interval": target.interval || "$interval",
"field": target.keyField,
"min_doc_count": 0,
},
"aggs": {
"stats": {
"stats": {
"field": target.valueField
}
}
}
}
}
};
if (target.groupByField) {
query["aggs"][target.termKey + "_" + target.termValue]["aggs"] = {
"terms": {
"terms": {
"field": target.groupByField
},
"aggs": query["aggs"][target.termKey + "_" + target.termValue]["aggs"]
}
};
}
}
});
query = JSON.stringify(query);
return query;
};
ElasticQueryBuilder.prototype._buildRangeFilter = function(target) {
var filter = {"range":{}};
filter["range"][target.keyField] = {
"gte": "$rangeFrom",
"lte": "$rangeTo"
};
return filter;
};
ElasticQueryBuilder.prototype._buildTermFilter = function(target) {
var filter = {"term":{}};
filter["term"][target.termKey] = target.termValue;
return filter;
};
return ElasticQueryBuilder;
});
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