From 3624587f08a8e179ff1c823f803a24f3e20c9eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 29 Feb 2016 13:42:55 +0100
Subject: [PATCH] misc(): added elasticsearch.yml config file to docker test
 env

---
 docker/blocks/elastic/elasticsearch.yml                 | 2 ++
 docker/blocks/elastic/elasticsearch/config/.placeholder | 1 -
 docker/blocks/elastic/fig                               | 2 ++
 public/app/features/templating/templateValuesSrv.js     | 1 +
 public/sass/base/_fonts.scss                            | 6 +-----
 5 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 docker/blocks/elastic/elasticsearch.yml
 delete mode 100644 docker/blocks/elastic/elasticsearch/config/.placeholder

diff --git a/docker/blocks/elastic/elasticsearch.yml b/docker/blocks/elastic/elasticsearch.yml
new file mode 100644
index 00000000000..c57b2c12908
--- /dev/null
+++ b/docker/blocks/elastic/elasticsearch.yml
@@ -0,0 +1,2 @@
+script.inline: on
+script.indexed: on
diff --git a/docker/blocks/elastic/elasticsearch/config/.placeholder b/docker/blocks/elastic/elasticsearch/config/.placeholder
deleted file mode 100644
index 9ad266259c2..00000000000
--- a/docker/blocks/elastic/elasticsearch/config/.placeholder
+++ /dev/null
@@ -1 +0,0 @@
-Ensure the existence of the parent folder.
diff --git a/docker/blocks/elastic/fig b/docker/blocks/elastic/fig
index 498402ac7b0..357352cabaa 100644
--- a/docker/blocks/elastic/fig
+++ b/docker/blocks/elastic/fig
@@ -4,3 +4,5 @@ elasticsearch:
   ports:
     - "9200:9200"
     - "9300:9300"
+  volumes:
+    - ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
diff --git a/public/app/features/templating/templateValuesSrv.js b/public/app/features/templating/templateValuesSrv.js
index 2760bb42ca0..bcc27317998 100644
--- a/public/app/features/templating/templateValuesSrv.js
+++ b/public/app/features/templating/templateValuesSrv.js
@@ -45,6 +45,7 @@ function (angular, _, kbn) {
     };
 
     this.setVariableFromUrl = function(variable, urlValue) {
+      debugger;
       var option = _.findWhere(variable.options, { text: urlValue });
       option = option || { text: urlValue, value: urlValue };
 
diff --git a/public/sass/base/_fonts.scss b/public/sass/base/_fonts.scss
index f43721afb3a..eece414d45d 100644
--- a/public/sass/base/_fonts.scss
+++ b/public/sass/base/_fonts.scss
@@ -8,7 +8,7 @@
     font-weight: normal;
     font-style: normal;
 }
- 
+
 .icon-gf {
     /* use !important to prevent issues with browser extensions that change fonts */
     font-family: 'grafana-icons' !important;
@@ -28,10 +28,6 @@
     vertical-align: middle;
 }
 
-
-
-
-
 .icon-gf-raintank_wordmark:before {
     content: "\e600";
 }