From 3e94f95882d1b566a546059240631358e6460501 Mon Sep 17 00:00:00 2001 From: Gordon Kelly Date: Wed, 20 Dec 2017 16:51:28 +0000 Subject: [PATCH] docker_grafana: add dashboards to docker and move dashboards from docker/ to docker/grafana Change-Id: I8bfb3c9aa11f89b987e7cf20dd3ce7904cb3f8b8 Signed-off-by: gordonkelly --- docker/grafana/Dockerfile | 1 + docker/{ => grafana}/dashboards/average_load_dashboard.json | 0 docker/{ => grafana}/dashboards/configure_grafana.sh | 0 docker/{ => grafana}/dashboards/cpu_usage_dashboard.json | 0 docker/{ => grafana}/dashboards/host_overview_dashboard.json | 0 docker/{ => grafana}/dashboards/hugepages_dashboard.json | 0 docker/{ => grafana}/dashboards/intel_pmu_dashboard.json | 0 docker/{ => grafana}/dashboards/intel_rdt_dashboard.json | 0 docker/{ => grafana}/dashboards/ipmi_dashboard.json | 0 docker/{ => grafana}/dashboards/mcelog_dashboard.json | 0 docker/{ => grafana}/dashboards/ovs_stats_dashboard.json | 0 docker/{ => grafana}/dashboards/virt_dashboard.json | 0 12 files changed, 1 insertion(+) rename docker/{ => grafana}/dashboards/average_load_dashboard.json (100%) rename docker/{ => grafana}/dashboards/configure_grafana.sh (100%) rename docker/{ => grafana}/dashboards/cpu_usage_dashboard.json (100%) rename docker/{ => grafana}/dashboards/host_overview_dashboard.json (100%) rename docker/{ => grafana}/dashboards/hugepages_dashboard.json (100%) rename docker/{ => grafana}/dashboards/intel_pmu_dashboard.json (100%) rename docker/{ => grafana}/dashboards/intel_rdt_dashboard.json (100%) rename docker/{ => grafana}/dashboards/ipmi_dashboard.json (100%) rename docker/{ => grafana}/dashboards/mcelog_dashboard.json (100%) rename docker/{ => grafana}/dashboards/ovs_stats_dashboard.json (100%) rename docker/{ => grafana}/dashboards/virt_dashboard.json (100%) diff --git a/docker/grafana/Dockerfile b/docker/grafana/Dockerfile index e459531b..32a78862 100644 --- 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 -- 2.16.6