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

Merge branch 'master' of https://github.com/limefamily/grafana into limefamily-master

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-23 14:48:14 +02:00
commit 648e8a9547
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,8 @@
<div class="gf-form">
<label class="gf-form-label width-10">Query {{$index + 1}}</label>
<input type="text" class="gf-form-input max-width-12" ng-model="filter.query" spellcheck='false' placeholder="Lucene query" ng-blur="onChangeInternal()">
<label class="gf-form-label width-10">Label {{$index + 1}}</label>
<input type="text" class="gf-form-input max-width-12" ng-model="filter.label" spellcheck='false' placeholder="Readable Label" ng-blur="onChangeInternal()">
</div>
<div class="gf-form">
<label class="gf-form-label" ng-if="$first">

5
public/app/plugins/datasource/elasticsearch/query_builder.js
View File

@ -96,8 +96,9 @@ function (queryDef) {
var filterObj = {};
for (var i = 0; i < aggDef.settings.filters.length; i++) {
var query = aggDef.settings.filters[i].query;
filterObj[query] = {
var label = aggDef.settings.filters[i].label;
label = label==='' || label === undefined?query:label;
filterObj[label] = {
query_string: {
query: query,
analyze_wildcard: true