diff --git a/public/app/plugins/datasource/elasticsearch/directives.js b/public/app/plugins/datasource/elasticsearch/directives.js
index 8ab75f8e4ad..2d6825a70c7 100644
--- a/public/app/plugins/datasource/elasticsearch/directives.js
+++ b/public/app/plugins/datasource/elasticsearch/directives.js
@@ -6,6 +6,14 @@ function (angular) {
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() {
return {templateUrl: 'app/plugins/datasource/elasticsearch/partials/annotations.editor.html'};
});
diff --git a/public/app/plugins/datasource/elasticsearch/partials/query.editor.html b/public/app/plugins/datasource/elasticsearch/partials/query.editor.html
index 63abb5f1f76..84028675ce5 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/query.editor.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/query.editor.html
@@ -149,90 +149,3 @@
-
-
-
-
-
-
-
-
Alias patterns
-
- - $m = replaced with measurement name
- - $measurement = replaced with measurement name
- - $tag_hostname = replaced with the value of the hostname tag
- - You can also use [[tag_hostname]] pattern replacement syntax
-
-
-
-
-
Stacking and fill
-
- - When stacking is enabled it important that points align
- - If there are missing points for one series it can cause gaps or missing bars
- - You must use fill(0), and select a group by time low limit
- - Use the group by time option below your queries and specify for example >10s if your metrics are written every 10 seconds
- - This will insert zeros for series that are missing measurements and will make stacking work properly
-
-
-
-
-
Group by time
-
- - Group by time is important, otherwise the query could return many thousands of datapoints that will slow down Grafana
- - 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
- - If you use fill(0) or fill(null) set a low limit for the auto group by time interval
- - The low limit can only be set in the group by time option below your queries
- - You set a low limit by adding a greater sign before the interval
- - Example: >60s if you write metrics to ElasticDB every 60 seconds
-
-
-
-
-
-
+
+
+
+
Alias patterns
+
+ - $m = replaced with measurement name
+ - $measurement = replaced with measurement name
+ - $tag_hostname = replaced with the value of the hostname tag
+ - You can also use [[tag_hostname]] pattern replacement syntax
+
+
+
+
+
Stacking and fill
+
+ - When stacking is enabled it important that points align
+ - If there are missing points for one series it can cause gaps or missing bars
+ - You must use fill(0), and select a group by time low limit
+ - Use the group by time option below your queries and specify for example >10s if your metrics are written every 10 seconds
+ - This will insert zeros for series that are missing measurements and will make stacking work properly
+
+
+
+
+
Group by time
+
+ - Group by time is important, otherwise the query could return many thousands of datapoints that will slow down Grafana
+ - 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
+ - If you use fill(0) or fill(null) set a low limit for the auto group by time interval
+ - The low limit can only be set in the group by time option below your queries
+ - You set a low limit by adding a greater sign before the interval
+ - Example: >60s if you write metrics to ElasticDB every 60 seconds
+
+
+
+
+
+