Merge branch 'master' into elastic5_support

2025-02-25 18:55:37 -06:00 · 2016-12-09 11:41:23 +01:00
parent ebec02ffae e58b6989c2
commit 619c5c4f1b
76 changed files with 1379 additions and 509 deletions
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -49,6 +49,10 @@ function (queryDef) {
      }
    }

+    if (aggDef.settings.missing) {
+      queryNode.terms.missing = aggDef.settings.missing;
+    }
+
    return queryNode;
  };

@@ -65,6 +69,10 @@ function (queryDef) {
      esAgg.interval = "$interval";
    }

+    if (settings.missing) {
+      esAgg.missing = settings.missing;
+    }
+
    return esAgg;
  };