commit 914aa7e56ead00b02f2a9098b5c3fba9ea85cfde
author lavado <glavado@whitestack.com> Fri May 08 14:07:21 2020 -0500
committer beierlm <mark.beierl@canonical.com> Wed Jun 03 17:00:42 2020 +0200
tree 1d7405d51c97755836f72dcc23f51a1ed2509f45
parent 1e76a0c26ec0fd74c7b93aa67232402f6d760a66

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>

installers/docker/docker-compose.yaml

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 3fdfbc1..44fbea6 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -264,10 +264,10 @@
   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}"