From: thouveng <thouveng@gmail.com>
Date: Fri, 25 Nov 2016 10:45:07 +0000 (+0100)
Subject: Merge pull request #14 from thouveng/use-new-grafana-convention
X-Git-Tag: 2016.12~1^2
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=e1458a3bbb8969677d6fa06fb028e01245219e55;hp=8af626372b045afe3821c48de8abc9165c87a2c9

Merge pull request #14 from thouveng/use-new-grafana-convention

Put Grafana dashboards into their own directory
---

diff --git a/influxdb/files/grafana_influxdb.json b/influxdb/files/grafana_dashboards/influxdb_influxdb.json
similarity index 100%
rename from influxdb/files/grafana_influxdb.json
rename to influxdb/files/grafana_dashboards/influxdb_influxdb.json
diff --git a/influxdb/meta/grafana.yml b/influxdb/meta/grafana.yml
index f261acc..f63eb53 100644
--- a/influxdb/meta/grafana.yml
+++ b/influxdb/meta/grafana.yml
@@ -1,4 +1,4 @@
 dashboard:
   influxdb:
     format: json
-    template: influxdb/files/grafana_influxdb.json
+    template: influxdb/files/grafana_dashboards/influxdb_influxdb.json