Pārlūkot izejas kodu

misc(): added elasticsearch.yml config file to docker test env

Torkel Ödegaard 9 gadi atpakaļ
vecāks
revīzija
3624587f08

+ 2 - 0
docker/blocks/elastic/elasticsearch.yml

@@ -0,0 +1,2 @@
+script.inline: on
+script.indexed: on

+ 0 - 1
docker/blocks/elastic/elasticsearch/config/.placeholder

@@ -1 +0,0 @@
-Ensure the existence of the parent folder.

+ 2 - 0
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

+ 1 - 0
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 };
 

+ 1 - 5
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";
 }