Remove grafana from surveil container

Change-Id: Iaaf3e7f52b2e877125f6abb462cdf645b87ce605

Dockerfile

@@ -32,19 +32,6 @@ RUN rm -rf /etc/shinken
 ADD tools/docker/etc/shinken /etc/shinken
 RUN chown -R root:shinken /etc/shinken
 
-### Grafana
-RUN apt-get install -y apache2 wget
-RUN wget http://grafanarel.s3.amazonaws.com/grafana-1.7.0-rc1.tar.gz
-RUN tar xvf grafana-1.7.0-rc1.tar.gz
-RUN mv grafana-1.7.0-rc1 /var/www/html/grafana
-ADD tools/docker/etc/apache2/sites-available/grafana.conf /etc/apache2/sites-available/grafana.conf
-ADD tools/docker/var/www/html/grafana/config.js /var/www/html/grafana/config.js
-
-## Influxdb reverse proxy for grafana
-RUN apt-get install -y libapache2-mod-proxy-html
-RUN a2enmod proxy_http
-ADD tools/docker/etc/apache2/conf-enabled/influxdb.conf /etc/apache2/conf-enabled/influxdb.conf
-
 ### Surveil
 ## Copy files
 ADD surveil /surveil/surveil
@@ -67,9 +54,6 @@ ADD tools/docker/etc/supervisor /etc/supervisor
 # Shinken WEBUI
 EXPOSE 7767
 
-# Grafana
-EXPOSE 80
-
 # Surveil
 EXPOSE 8080
 

fig.yml

@@ -5,7 +5,6 @@ surveil:
    - influxdb
   ports:
    - "8080:8080"
-   - "80:80"
    - "7767:7767"
 
 mongo:
@@ -15,3 +14,10 @@ influxdb:
   image: tutum/influxdb
   environment:
     PRE_CREATE_DB: "db;grafana"
+
+grafana:
+  image: reazem/grafana
+  ports:
+    - "80:80"
+  links:
+    - influxdb

tools/docker/etc/apache2/conf-enabled/influxdb.conf

@@ -1,6 +0,0 @@
-# ProxyPass /influxdb/db/db http://localhost:8086/db/db
-# ProxyPass /influxdb/db/grafana http://localhost:8086/db/grafana
-
-ProxyRequests Off
-ProxyPass /influxdb/ http://influxdb:8086/
-ProxyPassReverse /influxdb/ http://influxdb:8086/

tools/docker/etc/apache2/sites-available/grafana.conf

@@ -1,8 +0,0 @@
-Alias /grafana /var/www/html/grafana/
-
-<Location /grafana>
- Order allow,deny
- Allow from 127.0.0.1
- Allow from ::1
- Allow from all
-</Location>

tools/docker/etc/supervisor/conf.d/supervisor.conf

@@ -4,8 +4,5 @@ nodaemon=true
 [program:shinken]
 command=/bin/sh -c "service shinken start"
 
-[program:apache2]
-command=/bin/sh -c "service apache2 start"
-
 [program:surveil]
 command=/bin/sh -c "sleep 20 && surveil-api"