config changes
diff --git a/README.md b/README.md
index 7e0e5fc..e6b3be2 100755
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
source:
type: 'git'
address: https://github.com/torkelo/grafana.git
- rev: v1.4.0
+ rev: master
elasticsearch:
host: localhost
port: 9200
diff --git a/conf/config.js b/conf/config.js
index 3c24257..9eed6f0 100755
--- a/conf/config.js
+++ b/conf/config.js
@@ -22,24 +22,28 @@
* in nginx or apache for cross origin domain sharing to work (CORS).
* Check install documentation on github
*/
- {% set data = pillar.grafana.server.data %}
+ {% if data in pillar.grafana.server.data.count == 1 %}
- {% if data.get("type", "") == "graphite" %}
- {% if data.get("ssl", "false") %}
- graphiteUrl: "https://"+{{ data.get("host", "") }}+":{{ data.get("port", 443) }}",
- {% else %}
- graphiteUrl: "http://"+{{ data.get("host", "") }}+":{{ data.get("port", 80) }}",
- {% endif %}
- {% endif %}
+ {% for data in pillar.grafana.server.data %}
+ {%- if data.type == "graphite" %}
+ graphiteUrl: "http://"+{{ data.host }}+":{{ data.port }}",
+ {%- endif %}
+ {% endfor %}
+
+ {%- else %}
+ /*graphiteUrl: "http://"+{{ salt['pillar.get']('grafana:server:data:host', "")}}+":{{ salt['pillar.get']('grafana:server:data:port', 80)}}",
+ */
/**
* Multiple graphite servers? Comment out graphiteUrl and replace with
*
* datasources: {
+
* data_center_us: { type: 'graphite', url: 'http://<graphite_url>', default: true },
* data_center_eu: { type: 'graphite', url: 'http://<graphite_url>' }
* }
*/
+ {%- endif %}
default_route: '/dashboard/file/default.json',