fix(grafana): Fix blank dashboards from appearing in dropdown

Move the dashboards from /usr/share/grafana/dashboards which is where we scan for other json dashboards to /usr/share/grafana/api/dashboards.
deis · Jul 18, 2016 · 8fd5ada · 8fd5ada
1 parent f2bcfaa
commit 8fd5ada
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 1 deletion.
diff --git a/...share/grafana/dashboards/deis_health.json → ...e/grafana/api/dashboards/deis_health.json b/...share/grafana/dashboards/deis_health.json → ...e/grafana/api/dashboards/deis_health.json
diff --git a/...share/grafana/dashboards/deis_router.json → ...e/grafana/api/dashboards/deis_router.json b/...share/grafana/dashboards/deis_router.json → ...e/grafana/api/dashboards/deis_router.json
diff --git a/.../usr/share/grafana/dashboards/influx.json → .../share/grafana/api/dashboards/influx.json b/.../usr/share/grafana/dashboards/influx.json → .../share/grafana/api/dashboards/influx.json
diff --git a/...grafana/dashboards/kubernetes_health.json → ...ana/api/dashboards/kubernetes_health.json b/...grafana/dashboards/kubernetes_health.json → ...ana/api/dashboards/kubernetes_health.json
diff --git a/.../share/grafana/dashboards/nsq_health.json → ...re/grafana/api/dashboards/nsq_health.json b/.../share/grafana/dashboards/nsq_health.json → ...re/grafana/api/dashboards/nsq_health.json
diff --git a/...s/usr/share/grafana/dashboards/redis.json → ...r/share/grafana/api/dashboards/redis.json b/...s/usr/share/grafana/dashboards/redis.json → ...r/share/grafana/api/dashboards/redis.json
diff --git a/grafana/rootfs/usr/share/grafana/start-grafana b/grafana/rootfs/usr/share/grafana/start-grafana
@@ -14,7 +14,7 @@ INFLUXDB_DATABASE=${INFLUXDB_DATABASE:-kubernetes}
 INFLUXDB_USER=${INFLUXDB_USER:-admin}
 INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD:-admin}
 
-DASHBOARD_LOCATION=${DASHBOARD_JSON_PATH:-"/usr/share/grafana/dashboards"}
+DASHBOARD_LOCATION=${DASHBOARD_JSON_PATH:-"/usr/share/grafana/api/dashboards"}
 
 echo "Building grafana.ini!"
 ./envtpl -in grafana.ini.tpl >> grafana.ini