From 7ccd8f905eae17047939c89e187caaad17e40ee3 Mon Sep 17 00:00:00 2001
From: Vincent Fournier <v.fournier11@gmail.com>
Date: Mon, 1 Jun 2015 18:52:06 -0400
Subject: [PATCH] Integrate Grafana

Change-Id: Idf5c6dc5bd26977b01d65bda45b0e89dc3057773
---
 docker-compose-production.yml |  5 ++---
 docker-compose.yml            | 24 +++++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docker-compose-production.yml b/docker-compose-production.yml
index d554f4a..d722273 100644
--- a/docker-compose-production.yml
+++ b/docker-compose-production.yml
@@ -68,15 +68,13 @@ influxdb:
    - ./container-data/influxdb:/data
 
 grafana:
-  image: savoirfairelinux/grafana:2.0.2
+  image: savoirfairelinux/grafana:2.1.0-pre1
   environment:
     INFLUXDB_HOST: "influxdb"
     INFLUXDB_PORT: "8086"
     INFLUXDB_NAME: "db"
     INFLUXDB_USER: "root"
     INFLUXDB_PASS: "root"
-  ports:
-    - "8888:80"
   links:
     - influxdb
 
@@ -90,3 +88,4 @@ bansho:
     - "80:8888"
   links:
     - surveil
+    - grafana
diff --git a/docker-compose.yml b/docker-compose.yml
index 92a4d0d..40bf554 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,24 +42,26 @@ influxdb:
     - "8086:8086"
 
 grafana:
-  image: savoirfairelinux/grafana
+  image: savoirfairelinux/grafana:2.1.0-pre1
   environment:
+    GRAFANA_ROOT_URL: "%(protocol)s://%(domain)s:%(http_port)s/grafana/"
+    GRAFANA_AUTH_PROXY_ENABLED: true
+    GRAFANA_AUTH_PROXY_HEADER_NAME: grafana-user
+  links:
+    - influxdb
+
+bansho:
+  image: bansho
+  environment:
+    BANSHO_BACKEND: "surveil"
+    BANSHO_SURVEIL_URL: "http://surveil:8080/"
     INFLUXDB_HOST: "influxdb"
     INFLUXDB_PORT: "8086"
     INFLUXDB_NAME: "db"
     INFLUXDB_USER: "root"
     INFLUXDB_PASS: "root"
-  ports:
-    - "80:80"
-  links:
-    - influxdb
-
-bansho:
-  image: savoirfairelinux/bansho
-  environment:
-    BANSHO_BACKEND: "surveil"
-    BANSHO_SURVEIL_URL: "http://surveil:8080/"
   ports:
     - "8888:8888"
   links:
     - surveil
+    - grafana