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

add elasticsearch query fields to the es query editor

Browse Source
This commit is contained in:
Joseph Jones 2015-07-02 10:54:39 -04:00 committed by Adam Heinz
parent d618526037
commit 923f9345a7
4 changed files with 113 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@ -300,14 +300,21 @@ function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
if (target.hide) { return []; }
var queryBuilder = new ElasticQueryBuilder(target);
var query = queryBuilder.build();
console.log(target);
query = query.replace(/\$interval/g, target.interval || 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 = query.replace(/\$keyField/g, target.keyField);
query = query.replace(/\$valueField/g, target.valueField);
query = query.replace(/\$termKey/g, target.termKey);
query = query.replace(/\$termValue/g, target.termValue);
query = templateSrv.replace(query, options.scopedVars);
return query;
}).join("\n");
console.log(allQueries);
return this._post('/_search?search_type=count', allQueries).then(function(results) {
if (!results || !results.facets) {
return { data: [] };

69
public/app/plugins/datasource/elasticsearch/partials/query.editor.html
View File

@ -63,7 +63,7 @@
<ul class="tight-form-list" role="menu" ng-hide="target.rawQuery">
<li class="tight-form-item query-keyword" style="width: 75px;">
SELECT
Function
</li>
<li class="dropdown tight-form-item">
<a gf-dropdown="functionMenu" class="dropdown-toggle" data-toggle="dropdown">
@ -75,16 +75,48 @@
<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;">
Measurement
</li>
<li>
<metric-segment segment="measurementSegment" get-alt-segments="getMeasurements()" on-value-changed="measurementChanged()"></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;">
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;">
FROM
Value Field
</li>
<li>
<metric-segment segment="measurementSegment" get-alt-segments="getMeasurements()" on-value-changed="measurementChanged()"></metric-segment>
<metric-segment segment="valueFieldSegment" on-value-changed="valueFieldChanged()"></metric-segment>
</li>
</ul>
@ -92,6 +124,31 @@
</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>
@ -106,9 +163,9 @@
</li>
</ul>
<div class="clearfix"></div>
</div>
</div> -->
<div class="tight-form">
<!-- <div class="tight-form">
<ul class="tight-form-list" ng-hide="target.rawQuery">
<li class="tight-form-item">
<i class="fa fa-eye invisible"></i>
@ -150,7 +207,7 @@
</li>
</ul>
<div class="clearfix"></div>
</div>
</div> -->
</div>
</div>

6
public/app/plugins/datasource/elasticsearch/queryBuilder.js
View File

@ -14,9 +14,9 @@ function () {
"metric": {
"date_histogram": {
"interval": "$interval",
"key_field": "@timestamp",
"key_field": "$keyField",
"min_doc_count": 0,
"value_field": "metric"
"value_field": "$valueField"
}
}
},
@ -34,7 +34,7 @@ function () {
},
{
"term": {
"service": "cpu",
"$termKey": "$termValue",
}
}
]

40
public/app/plugins/datasource/elasticsearch/queryCtrl.js
View File

@ -24,6 +24,26 @@ function (angular, _, ElasticQueryBuilder) {
$scope.queryBuilder = new ElasticQueryBuilder(target);
if (!target.keyField) {
target.keyField = '@timestamp';
}
$scope.keyFieldSegment = new MetricSegment({value: target.keyField});
if (!target.valueField) {
target.valueField = 'metric';
}
$scope.valueFieldSegment = new MetricSegment({value: target.valueField});
if (!target.termKey) {
target.termKey = 'service';
}
$scope.termKeySegment = new MetricSegment({value: target.termKey});
if (!target.termValue) {
target.termValue = 'cpu';
}
$scope.termValueSegment = new MetricSegment({value: target.termValue});
if (!target.measurement) {
$scope.measurementSegment = MetricSegment.newSelectMeasurement();
} else {
@ -53,6 +73,26 @@ function (angular, _, ElasticQueryBuilder) {
$scope.removeGroupBySegment = new MetricSegment({fake: true, value: '-- remove group by --'});
};
$scope.valueFieldChanged = function() {
$scope.target.valueField = $scope.valueFieldSegment.value;
$scope.$parent.get_data();
};
$scope.keyFieldChanged = function() {
$scope.target.keyField = $scope.keyFieldSegment.value;
$scope.$parent.get_data();
};
$scope.termValueSegmentChanged = function() {
$scope.target.termValue = $scope.termValueSegment.value;
$scope.$parent.get_data();
};
$scope.termKeySegmentChanged = function() {
$scope.target.termKey = $scope.termKeySegment.value;
$scope.$parent.get_data();
};
$scope.fixTagSegments = function() {
var count = $scope.tagSegments.length;
var lastSegment = $scope.tagSegments[Math.max(count-1, 0)];