Fix Grafana deployment over Docker Swarm 35/9035/2
authorlavado <glavado@whitestack.com>
Fri, 8 May 2020 19:07:21 +0000 (14:07 -0500)
committerlavado <glavado@whitestack.com>
Wed, 3 Jun 2020 16:51:25 +0000 (18:51 +0200)
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)

installers/docker/docker-compose.yaml

index 3fdfbc1..44fbea6 100644 (file)
@@ -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}"