summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Kelly <gordon.kelly@intel.com>2017-12-20 16:51:28 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2018-01-10 15:14:45 +0000
commit3e94f95882d1b566a546059240631358e6460501 (patch)
treebfe42a030f7d917a3330396a218f9c6a22130268
parent4dff681899d1f609f9e1bbdd171adb00fe6c0fc6 (diff)
docker_grafana: add dashboards to docker and move dashboards from docker/ to docker/grafana
Change-Id: I8bfb3c9aa11f89b987e7cf20dd3ce7904cb3f8b8 Signed-off-by: gordonkelly <gordon.kelly@intel.com>
-rw-r--r--docker/grafana/Dockerfile1
-rw-r--r--docker/grafana/dashboards/average_load_dashboard.json (renamed from docker/dashboards/average_load_dashboard.json)0
-rwxr-xr-xdocker/grafana/dashboards/configure_grafana.sh (renamed from docker/dashboards/configure_grafana.sh)0
-rw-r--r--docker/grafana/dashboards/cpu_usage_dashboard.json (renamed from docker/dashboards/cpu_usage_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/host_overview_dashboard.json (renamed from docker/dashboards/host_overview_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/hugepages_dashboard.json (renamed from docker/dashboards/hugepages_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/intel_pmu_dashboard.json (renamed from docker/dashboards/intel_pmu_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/intel_rdt_dashboard.json (renamed from docker/dashboards/intel_rdt_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/ipmi_dashboard.json (renamed from docker/dashboards/ipmi_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/mcelog_dashboard.json (renamed from docker/dashboards/mcelog_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/ovs_stats_dashboard.json (renamed from docker/dashboards/ovs_stats_dashboard.json)0
-rw-r--r--docker/grafana/dashboards/virt_dashboard.json (renamed from docker/dashboards/virt_dashboard.json)0
12 files changed, 1 insertions, 0 deletions
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
index ae797f75..ae797f75 100644
--- a/docker/dashboards/average_load_dashboard.json
+++ b/docker/grafana/dashboards/average_load_dashboard.json
diff --git a/docker/dashboards/configure_grafana.sh b/docker/grafana/dashboards/configure_grafana.sh
index 8ce9689b..8ce9689b 100755
--- a/docker/dashboards/configure_grafana.sh
+++ b/docker/grafana/dashboards/configure_grafana.sh
diff --git a/docker/dashboards/cpu_usage_dashboard.json b/docker/grafana/dashboards/cpu_usage_dashboard.json
index c9509fa0..c9509fa0 100644
--- a/docker/dashboards/cpu_usage_dashboard.json
+++ b/docker/grafana/dashboards/cpu_usage_dashboard.json
diff --git a/docker/dashboards/host_overview_dashboard.json b/docker/grafana/dashboards/host_overview_dashboard.json
index e6d3ad95..e6d3ad95 100644
--- a/docker/dashboards/host_overview_dashboard.json
+++ b/docker/grafana/dashboards/host_overview_dashboard.json
diff --git a/docker/dashboards/hugepages_dashboard.json b/docker/grafana/dashboards/hugepages_dashboard.json
index 146fccf4..146fccf4 100644
--- a/docker/dashboards/hugepages_dashboard.json
+++ b/docker/grafana/dashboards/hugepages_dashboard.json
diff --git a/docker/dashboards/intel_pmu_dashboard.json b/docker/grafana/dashboards/intel_pmu_dashboard.json
index e1fad5fa..e1fad5fa 100644
--- a/docker/dashboards/intel_pmu_dashboard.json
+++ b/docker/grafana/dashboards/intel_pmu_dashboard.json
diff --git a/docker/dashboards/intel_rdt_dashboard.json b/docker/grafana/dashboards/intel_rdt_dashboard.json
index 49efec7a..49efec7a 100644
--- a/docker/dashboards/intel_rdt_dashboard.json
+++ b/docker/grafana/dashboards/intel_rdt_dashboard.json
diff --git a/docker/dashboards/ipmi_dashboard.json b/docker/grafana/dashboards/ipmi_dashboard.json
index 04179ef6..04179ef6 100644
--- a/docker/dashboards/ipmi_dashboard.json
+++ b/docker/grafana/dashboards/ipmi_dashboard.json
diff --git a/docker/dashboards/mcelog_dashboard.json b/docker/grafana/dashboards/mcelog_dashboard.json
index 9618bacc..9618bacc 100644
--- a/docker/dashboards/mcelog_dashboard.json
+++ b/docker/grafana/dashboards/mcelog_dashboard.json
diff --git a/docker/dashboards/ovs_stats_dashboard.json b/docker/grafana/dashboards/ovs_stats_dashboard.json
index 34c8b7bf..34c8b7bf 100644
--- a/docker/dashboards/ovs_stats_dashboard.json
+++ b/docker/grafana/dashboards/ovs_stats_dashboard.json
diff --git a/docker/dashboards/virt_dashboard.json b/docker/grafana/dashboards/virt_dashboard.json
index 5317b701..5317b701 100644
--- a/docker/dashboards/virt_dashboard.json
+++ b/docker/grafana/dashboards/virt_dashboard.json