Merge pull request #29 from hastarin/master

Update Grafana to 5.0.1 and update Prometheus dashboard.

docker-compose.yml

@@ -58,7 +58,7 @@ services:
           memory: 64M
 
   grafana:
-    image: stefanprodan/swarmprom-grafana:4.6.3
+    image: hastarin/swarmprom-grafana:5.0.1
     networks:
       - net
     environment:

grafana/.dockerignore

+screens/

grafana/Dockerfile

-FROM grafana/grafana:4.6.3
+FROM grafana/grafana:5.0.1
 # https://hub.docker.com/r/grafana/grafana/tags/
 
-COPY docker-entrypoint.sh /etc/grafana/docker-entrypoint.sh
-COPY datasources /etc/grafana/datasources/
+COPY datasources /etc/grafana/provisioning/datasources/
+COPY swarmprom_dashboards.yml /etc/grafana/provisioning/dashboards/
 COPY dashboards /etc/grafana/dashboards/
 
 ENV GF_SECURITY_ADMIN_PASSWORD=admin \
-    GF_SECURITY_ADMIN_USER=admin
-
-ENTRYPOINT ["/etc/grafana/docker-entrypoint.sh"]
+    GF_SECURITY_ADMIN_USER=admin \
+    GF_PATHS_PROVISIONING=/etc/grafana/provisioning/

grafana/datasources/prometheus.json

-{"name":"Prometheus","type":"prometheus","access":"proxy","url":"http://prometheus:9090","isDefault":true}

grafana/datasources/prometheus.yaml

+apiVersion: 1
+
+deleteDatasources:
+  - name: Prometheus
+
+datasources:
+- name: Prometheus
+  type: prometheus
+  access: proxy
+  url: http://prometheus:9090
+  isDefault: true
+  version: 1
+  editable: true

grafana/docker-entrypoint.sh

-#!/bin/bash
-
-# Script to configure grafana datasources and dashboards.
-# https://github.com/grafana/grafana-docker/issues/74
-
-GRAFANA_URL=http://${GF_SECURITY_ADMIN_USER}:${GF_SECURITY_ADMIN_PASSWORD}@${GF_SERVER_HTTP_ADDR:-localhost}:${GF_SERVER_HTTP_PORT:-3000}
-DATASOURCES_PATH=${DATASOURCES_PATH:-/etc/grafana/datasources}
-DASHBOARDS_PATH=${DASHBOARDS_PATH:-/etc/grafana/dashboards}
-
-# Generic function to call the Vault API
-grafana_api() {
-  local verb=$1
-  local url=$2
-  local params=$3
-  local bodyfile=$4
-  local response
-  local cmd
-
-  cmd="curl -L -s --fail -H \"Accept: application/json\" -H \"Content-Type: application/json\" -X ${verb} -k ${GRAFANA_URL}${url}"
-  [[ -n "${params}" ]] && cmd="${cmd} -d \"${params}\""
-  [[ -n "${bodyfile}" ]] && cmd="${cmd} --data @${bodyfile}"
-  echo "Running ${cmd}"
-  eval ${cmd} || return 1
-  return 0
-}
-
-wait_for_api() {
-  while ! grafana_api GET /api/user/preferences
-  do
-    sleep 5
-  done
-}
-
-install_datasources() {
-  local datasource
-
-  for datasource in ${DATASOURCES_PATH}/*.json
-  do
-    if [[ -f "${datasource}" ]]; then
-      echo "Installing datasource ${datasource}"
-      if grafana_api POST /api/datasources "" "${datasource}"; then
-        echo "installed ok"
-      else
-        echo "install failed"
-      fi
-    fi
-  done
-}
-
-install_dashboards() {
-  local dashboard
-
-  for dashboard in ${DASHBOARDS_PATH}/*.json
-  do
-    if [[ -f "${dashboard}" ]]; then
-      echo "Installing dashboard ${dashboard}"
-      if grafana_api POST /api/dashboards/db "" "${dashboard}"; then
-        echo "installed ok"
-      else
-        echo "install failed"
-      fi
-    fi
-  done
-}
-
-configure_grafana() {
-  wait_for_api
-  install_datasources
-  install_dashboards
-}
-
-echo "Running configure_grafana in the background..."
-configure_grafana &
-/run.sh
-exit 0

grafana/swarmprom_dashboards.yml

+apiVersion: 1
+
+providers:
+- name: 'default'
+  orgId: 1
+  folder: ''
+  type: file
+  disableDeletion: false
+  editable: true
+  options:
+    path: /etc/grafana/dashboards