mod-surveil-config -> mod-surveil

Change-Id: I57378d98ff63baa31abb084947698940fa37c0a0

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

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()

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 && \
+    mv /tmp/mod-surveil-*/alignak/modules/mod_surveil /var/lib/alignak/modules/mod-surveil && \
-    rm -rfv /tmp/mod-surveil-config*
+    rm -rfv /tmp/mod-surveil*
 
 # mod-influxdb
 RUN pip install influxdb==2.3.0

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

tools/docker/alignak_container/etc/alignak/modules/surveil.cfg

@@ -1,6 +1,6 @@
 define module {
-    module_name         surveil_config
+    module_name         surveil
-    module_type         surveil_config
+    module_type         surveil
     surveil_api_url     http://surveil:5311/v2
     surveil_auth_url    http://surveil:5311/v2/auth
     surveil_version     2_0