commit 04ec5afa5862a3546c9c11b137fcf46380897ff4
author Michael Kutý <6du1ro.n@gmail.com> Mon Mar 03 20:16:15 2014 +0100
committer Michael Kutý <6du1ro.n@gmail.com> Mon Mar 03 20:16:15 2014 +0100
tree aa093ed249bd5bae888d19c24277b5b25fd4003d
parent a52b0dbd8b9f73a4f0721a47dbcca1b206e2bd68

changes

conf/config.js

diff --git a/conf/config.js b/conf/config.js
index 504dfb6..956172c 100755
--- a/conf/config.js
+++ b/conf/config.js
@@ -13,7 +13,7 @@
      * elasticsearch url:
      * For Basic authentication use: http://username:password@domain.com:9200
      */
-    elasticsearch: "http://{{ salt['pillar.get']('grafana:server:elasticsearch:host', "") }}:{{ salt['pillar.get']('grafana:server:elasticsearch:port', 9200) }}",
+    elasticsearch: "http://{{ pillar.grafana.server.elasticsearch.host }}:{{ pillar.grafana.server.elasticsearch.port }}",
 
     /**
      * graphite-web url: