From: lavado <glavado@whitestack.com>
Date: Fri, 8 May 2020 19:07:21 +0000 (-0500)
Subject: Fix Grafana deployment over Docker Swarm
X-Git-Tag: v7.1.0rc6^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F9035%2F2;p=osm%2Fdevops.git

Fix Grafana deployment over Docker Swarm

Change 8782 broke Grafana deployment over docker swarm,
as configuration files where reorganized.

Change-Id: I0a18157df014508dd95f8a720a308b896381e382
Signed-off-by: lavado <glavado@whitestack.com>
(cherry picked from commit 914aa7e56ead00b02f2a9098b5c3fba9ea85cfde)
---

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 3fdfbc1a..44fbea66 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -264,10 +264,10 @@ services:
   grafana:
     image: grafana/grafana
     volumes:
-      - ./files/dashboards-osm.yml:/etc/grafana/provisioning/dashboards/dashboards-osm.yml
-      - ./files/osm-sample-dashboard.json:/etc/grafana/provisioning/dashboards/osm-sample-dashboard.json
-      - ./files/osm-system-dashboard.json:/etc/grafana/provisioning/dashboards/osm-system-dashboard.json
-      - ./files/datasource-prometheus.yml:/etc/grafana/provisioning/datasources/datasource-prometheus.yml
+      - ./grafana/dashboards-osm.yml:/etc/grafana/provisioning/dashboards/dashboards-osm.yml
+      - ./grafana/osm-sample-dashboard.json:/etc/grafana/provisioning/dashboards/osm-sample-dashboard.json
+      - ./grafana/osm-system-dashboard.json:/etc/grafana/provisioning/dashboards/osm-system-dashboard.json
+      - ./grafana/datasource-prometheus.yml:/etc/grafana/provisioning/datasources/datasource-prometheus.yml
     hostname: grafana
     ports:
       - "${OSM_GRAFANA_PORTS:-3000:3000}"