docker_grafana: add dashboards to docker and move dashboards from docker/ to docker...

Change-Id: I8bfb3c9aa11f89b987e7cf20dd3ce7904cb3f8b8
Signed-off-by: gordonkelly <gordon.kelly@intel.com>

diff --git a/docker/grafana/Dockerfile b/docker/grafana/Dockerfile
index e459531..32a7886 100644 (file)
--- a/docker/grafana/Dockerfile
+++ b/docker/grafana/Dockerfile
@@ -2,4 +2,5 @@ FROM grafana/grafana:latest
 
 COPY ./configure_grafana.sh /
 COPY ./run.sh /
+COPY ./dashboards/ /var/lib/grafana/dashboards/
 RUN chmod 755 run.sh configure_grafana.sh

diff --git a/docker/dashboards/average_load_dashboard.json b/docker/grafana/dashboards/average_load_dashboard.json
similarity index 100%
rename from docker/dashboards/average_load_dashboard.json
rename to docker/grafana/dashboards/average_load_dashboard.json

diff --git a/docker/dashboards/configure_grafana.sh b/docker/grafana/dashboards/configure_grafana.sh
similarity index 100%
rename from docker/dashboards/configure_grafana.sh
rename to docker/grafana/dashboards/configure_grafana.sh

diff --git a/docker/dashboards/cpu_usage_dashboard.json b/docker/grafana/dashboards/cpu_usage_dashboard.json
similarity index 100%
rename from docker/dashboards/cpu_usage_dashboard.json
rename to docker/grafana/dashboards/cpu_usage_dashboard.json

diff --git a/docker/dashboards/host_overview_dashboard.json b/docker/grafana/dashboards/host_overview_dashboard.json
similarity index 100%
rename from docker/dashboards/host_overview_dashboard.json
rename to docker/grafana/dashboards/host_overview_dashboard.json

diff --git a/docker/dashboards/hugepages_dashboard.json b/docker/grafana/dashboards/hugepages_dashboard.json
similarity index 100%
rename from docker/dashboards/hugepages_dashboard.json
rename to docker/grafana/dashboards/hugepages_dashboard.json

diff --git a/docker/dashboards/intel_pmu_dashboard.json b/docker/grafana/dashboards/intel_pmu_dashboard.json
similarity index 100%
rename from docker/dashboards/intel_pmu_dashboard.json
rename to docker/grafana/dashboards/intel_pmu_dashboard.json

diff --git a/docker/dashboards/intel_rdt_dashboard.json b/docker/grafana/dashboards/intel_rdt_dashboard.json
similarity index 100%
rename from docker/dashboards/intel_rdt_dashboard.json
rename to docker/grafana/dashboards/intel_rdt_dashboard.json

diff --git a/docker/dashboards/ipmi_dashboard.json b/docker/grafana/dashboards/ipmi_dashboard.json
similarity index 100%
rename from docker/dashboards/ipmi_dashboard.json
rename to docker/grafana/dashboards/ipmi_dashboard.json

diff --git a/docker/dashboards/mcelog_dashboard.json b/docker/grafana/dashboards/mcelog_dashboard.json
similarity index 100%
rename from docker/dashboards/mcelog_dashboard.json
rename to docker/grafana/dashboards/mcelog_dashboard.json

diff --git a/docker/dashboards/ovs_stats_dashboard.json b/docker/grafana/dashboards/ovs_stats_dashboard.json
similarity index 100%
rename from docker/dashboards/ovs_stats_dashboard.json
rename to docker/grafana/dashboards/ovs_stats_dashboard.json

diff --git a/docker/dashboards/virt_dashboard.json b/docker/grafana/dashboards/virt_dashboard.json
similarity index 100%
rename from docker/dashboards/virt_dashboard.json
rename to docker/grafana/dashboards/virt_dashboard.json