#73 fix monitoring and Grafana to v5 with provisioning

smartemission · May 28, 2018 · b68cebe · b68cebe
1 parent 6906b59
commit b68cebe
Show file tree

Hide file tree

Showing 5 changed files with 21,776 additions and 2 deletions.
diff --git a/services/monitoring/docker-compose-14.4.yml b/services/monitoring/docker-compose-14.4.yml
@@ -65,7 +65,8 @@ services:
 #          - node.hostname == moby
 
   grafana:
-    image: grafana/grafana:4.6.3
+    image: grafana/grafana:5.1.3
+    # image: grafana/grafana:4.6.3
     container_name: grafanamon
     labels:
       - "traefik.backend=grafanamon"
@@ -82,8 +83,10 @@ services:
       - prometheus:prometheus
 #    ports:
 #      - 3000:3000
+
     volumes:
-      - grafana_data:/var/lib/grafana
+      - ./grafana/provisioning:/etc/grafana/provisioning:ro
+      # - grafana_data:/var/lib/grafana
     env_file:
       - grafana/grafana.conf
     networks:

diff --git a/services/monitoring/grafana/provisioning/dashboards/all.yml b/services/monitoring/grafana/provisioning/dashboards/all.yml
@@ -0,0 +1,13 @@
+apiVersion: 1
+
+# Docker Monitoring: https://github.com/philicious/grafana-dashboards nr 193
+# Node Exporter Dashboard Full: https://grafana.com/dashboards/5174
+providers:
+- name: 'Prometheus'
+  orgId: 1
+  folder: ''
+  type: file
+  disableDeletion: false
+  editable: true
+  options:
+    path: /etc/grafana/provisioning/dashboards