Merge pull request #1 from PagerTree/grafana-5.4.2

Moves to Grafana 5.4.2

README.md

@@ -58,21 +58,6 @@ Here's a list of all the services that are created:
 
 ## Post Configuration
 
-### Datasource Configuration
-Now we need to create the Prometheus Datasource in order to connect Grafana to Prometheus
-* Click the `Grafana` Menu at the top left corner (looks like a fireball)
-* Click `Data Sources`
-* Click the green button `Add Data Source`.
-* Input the following parameters **exactly as shown**
-    * Name - `Prometheus`, Default - `checked`
-    * Type - `Prometheus`
-    * HTTP settings
-        * URL - `http://prometheus:9090`
-        * Access - `proxy`
-* Click `Save & Test`
-
-<img src="images/add-data-source.png" alt="Add Data Source">
-
 ### Ping Configuration
 
 If you would like to add or change the Ping targets should be monitored you'll want to edit the `targets` section in [prometheus/prometheus.yml](prometheus/prometheus.yml)

config.monitoring

@@ -1,3 +1 @@
 GF_SECURITY_ADMIN_PASSWORD=9uT46ZKE
-GF_DASHBOARDS_JSON_ENABLED=true
-GF_DASHBOARDS_JSON_PATH=/var/lib/grafana/dashboards

docker-compose.yml

@@ -72,14 +72,15 @@ services:
       mode: global
 
   grafana:
-    image: grafana/grafana:4.6.3
+    image: grafana/grafana:5.4.2
     depends_on:
       - prometheus
     ports:
       - 3000:3000
     volumes:
       - grafana_data:/var/lib/grafana
       - ./grafana/dashboards:/var/lib/grafana/dashboards
+      - ./grafana/provisioning:/etc/grafana/provisioning
     env_file:
       - config.monitoring
 

grafana/provisioning/dashboards/all.yml

@@ -0,0 +1,11 @@
+apiVersion: 1
+
+providers:
+- name: 'default'
+  orgId: 1
+  folder: ''
+  type: file
+  disableDeletion: false
+  updateIntervalSeconds: 10 #how often Grafana will scan for changed dashboards
+  options:
+    path: /var/lib/grafana/dashboards

grafana/provisioning/datasources/all.yml

@@ -0,0 +1,20 @@
+# config file version
+apiVersion: 1
+
+# list of datasources that should be deleted from the database
+deleteDatasources:
+  - name: Prometheus
+    orgId: 1
+
+# list of datasources to insert/update depending
+# whats available in the database
+datasources:
+  # <string, required> name of the datasource. Required
+- name: 'Prometheus'
+  type: 'prometheus'
+  access: 'proxy'
+  org_id: 1
+  url: 'http://prometheus:9090'
+  is_default: true
+  version: 1
+  editable: true