From a09e81588869aa5fe0a4a6429dc82a662bf2684f Mon Sep 17 00:00:00 2001
From: aviau <alexandre.viau@savoirfairelinux.com>
Date: Thu, 23 Jul 2015 10:44:10 -0400
Subject: [PATCH] mod-surveil-config -> mod-surveil

Change-Id: I57378d98ff63baa31abb084947698940fa37c0a0
---
 Dockerfile                                                | 1 +
 surveil/api/hooks.py                                      | 2 ++
 tools/docker/alignak_container/Dockerfile                 | 8 ++++----
 .../etc/alignak/arbiters/arbiter-master.cfg               | 2 +-
 .../alignak/modules/{surveil-config.cfg => surveil.cfg}   | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename tools/docker/alignak_container/etc/alignak/modules/{surveil-config.cfg => surveil.cfg} (65%)

diff --git a/Dockerfile b/Dockerfile
index 30a06e8..de6e653 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get install -y subversion && \
 
 ADD requirements.txt /opt/surveil/requirements.txt
 RUN /opt/surveil/env/bin/pip install -U "pbr>=1.3,<2.0"
+RUN /opt/surveil/env/bin/pip install python-termstyle
 RUN /opt/surveil/env/bin/pip install -r /opt/surveil/requirements.txt
 
 ADD tools/docker/surveil_container/setup.sh /opt/surveil/setup.sh
diff --git a/surveil/api/hooks.py b/surveil/api/hooks.py
index 18a8ba2..27989b9 100644
--- a/surveil/api/hooks.py
+++ b/surveil/api/hooks.py
@@ -13,6 +13,7 @@
 # under the License.
 
 import influxdb
+import mongoengine
 from pecan import hooks
 import pymongo
 
@@ -32,6 +33,7 @@ class DBHook(hooks.PecanHook):
         state.request.influxdb_client = influxdb.InfluxDBClient.from_DSN(
             self.influxdb_url
         )
+        mongoengine.connect('shinken', host=self.mongo_url)
 
     def after(self, state):
         self.mongoclient.close()
diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile
index 855a12b..3dc3d08 100644
--- a/tools/docker/alignak_container/Dockerfile
+++ b/tools/docker/alignak_container/Dockerfile
@@ -31,13 +31,13 @@ RUN cd /tmp && \
     mv /tmp/mod-booster-nrpe-*/module /var/lib/alignak/modules/mod-booster-nrpe && \
     rm -rfv /tmp/mod-booster-nrpe*
 
-# mod-surveil-config
+# mod-surveil
 RUN pip install python-surveilclient==0.11.0
 RUN cd /tmp && \
-    wget -O mod-surveil-config.tar.gz https://github.com/Alignak-monitoring/mod-surveil-config/archive/6331d3626fd92deaeb5e372c5cdb1eedd8b09d9b.tar.gz && \
+    wget -O mod-surveil-config.tar.gz https://github.com/Alignak-monitoring/mod-surveil/archive/8d7e37333de85f5e90d6fe1780e55e4d90515a2f.tar.gz && \
     tar -zxvf mod-surveil-config.tar.gz && \
-    mv /tmp/mod-surveil-config-*/alignak/modules/mod_surveil_config /var/lib/alignak/modules/mod-surveil-config && \
-    rm -rfv /tmp/mod-surveil-config*
+    mv /tmp/mod-surveil-*/alignak/modules/mod_surveil /var/lib/alignak/modules/mod-surveil && \
+    rm -rfv /tmp/mod-surveil*
 
 # mod-influxdb
 RUN pip install influxdb==2.3.0
diff --git a/tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg b/tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg
index a98d893..56f516e 100644
--- a/tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg
+++ b/tools/docker/alignak_container/etc/alignak/arbiters/arbiter-master.cfg
@@ -35,7 +35,7 @@ define arbiter {
     # - FileTag			= Tag an host if it's on a flat file
     # - CSVTag			= Tag an host from the content of a CSV file
 
-    modules    	 surveil_config,ws-arbiter,mongo_live_config
+    modules    	 surveil,ws-arbiter,mongo_live_config
     #modules     named-pipe, mongodb, nsca, VMWare_auto_linking, ws-arbiter, Collectd, mport-landscape, SnmpBooster, AWS
 
     # Enable https or not
diff --git a/tools/docker/alignak_container/etc/alignak/modules/surveil-config.cfg b/tools/docker/alignak_container/etc/alignak/modules/surveil.cfg
similarity index 65%
rename from tools/docker/alignak_container/etc/alignak/modules/surveil-config.cfg
rename to tools/docker/alignak_container/etc/alignak/modules/surveil.cfg
index 54418c6..d046b62 100644
--- a/tools/docker/alignak_container/etc/alignak/modules/surveil-config.cfg
+++ b/tools/docker/alignak_container/etc/alignak/modules/surveil.cfg
@@ -1,6 +1,6 @@
 define module {
-    module_name         surveil_config
-    module_type         surveil_config
+    module_name         surveil
+    module_type         surveil
     surveil_api_url     http://surveil:5311/v2
     surveil_auth_url    http://surveil:5311/v2/auth
     surveil_version     2_0