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

public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html

@@ -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">

public/app/plugins/datasource/elasticsearch/query_builder.js

@@ -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