Merge branch 'dev' into 'test'

Dev

See merge request !91

.gitlab-ci.yml

@@ -39,7 +39,7 @@ deploy_test:
     - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
     - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
     - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
-    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
+    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -v /home/ubuntu/telegraf.conf:/etc/telegraf/telegraf.conf:ro -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
 
@@ -61,7 +61,7 @@ deploy_dev:
     - docker ps -a -q | xargs -I{} docker rm  {} || echo "No containers to remove"
     - docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
     - docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
-    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always  -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
+    - docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always -v /home/ubuntu/telegraf.conf:/etc/telegraf/telegraf.conf:ro -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
   dependencies:
     - build
     

Dockerfile

 FROM ubuntu
 WORKDIR /opt/strudel2/src
 COPY . /opt/strudel2/src
-RUN apt update && apt install -y python3 gcc python3-pip openssh-client
+RUN apt update && apt install -y python3 gcc python3-pip openssh-client telegraf
 RUN pip3 install -r requirements.txt &&  pip install .
 RUN mkdir -p /var/www/.ssh && chown www-data:www-data /var/www/.ssh && chmod 700 /var/www/.ssh
 EXPOSE 8080 8090

runscript

@@ -7,6 +7,8 @@ uwsgi \
         --protocol=http \
         --uid=www-data \
         --gid=www-data \
+        --stats /tmp/statsock \
         -w tes.tes_wsgi &
+telegraf &
 twsproxy 8090 
 

tes/sshwrapper/__init__.py

@@ -42,7 +42,7 @@ class Ssh:
     """
     Ssh class can execute or create tunnelstat
     """
-    TIMEOUT=60
+    TIMEOUT=30
     SSHOPTS = [ '-o', 'StrictHostKeyChecking=no',
                 '-o', 'UserKnownHostsFile=/dev/null',
                 '-o', 'IdentityFile=/dev/null',