Merge pull request #1098 from ait-aecid/development

Release 2.5.1

Author: 4cti0nfi9ure

.deepsource.toml

@@ -1,5 +1,10 @@
 version = 1
 
+exclude_patterns = [
+  "aecid-testsuite/**",
+  "source/root/etc/aminer/template_config.py"
+]
+
 [[analyzers]]
 name = "python"
 enabled = true
@@ -11,7 +16,3 @@ enabled = true
 [[analyzers]]
 name = "test-coverage"
 enabled = true
-
-exclude_patterns = [
-  "aecid-testsuite/system/performance-tests/results/*/*/*.py"
-]

.gitignore

@@ -121,6 +121,9 @@ ENV/
 env.bak/
 venv.bak/
 
+# PyCharm IDE
+.idea/
+
 # Spyder project settings
 .spyderproject
 .spyproject

Dockerfile

@@ -1,6 +1,9 @@
 # logdata-anomaly-miner Dockerfile
 #
-# Build:
+# Use build-script to create docker:
+#    scripts/build_docker.sh
+#
+# Build manually:
 #    docker build -t aecid/logdata-anomaly-miner:latest -t aecid/logdata-anomaly-miner:$(grep '__version__ =' source/root/usr/lib/logdata-anomaly-miner/metadata.py | awk -F '"' '{print $2}') .
 #
 # See: https://github.com/ait-aecid/logdata-anomaly-miner/wiki/Deployment-with-Docker
@@ -21,31 +24,31 @@ LABEL maintainer="wolfgang.hotwagner@ait.ac.at"
 # Install necessary debian packages
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
-        supervisor \
+    supervisor \
 	python3 \
 	python3-pip \
 	python3-pip \
-        python3-tz \
-        python3-scipy \
-        python3-pkg-resources \
-        python3-setuptools \
-        python3-dateutil \
-        python3-six \
-        python3-scipy \
-        python3-kafka \
-        python3-cerberus \
-        python3-yaml \
-        python3-pylibacl \
-        python3-urllib3 \
-        python3-statsmodels \
-        libacl1-dev
+    python3-tz \
+    python3-scipy \
+    python3-pkg-resources \
+    python3-setuptools \
+    python3-dateutil \
+    python3-six \
+    python3-scipy \
+    python3-kafka \
+    python3-cerberus \
+    python3-yaml \
+    python3-pylibacl \
+    python3-urllib3 \
+    python3-statsmodels \
+    libacl1-dev
 
 # Docs
 RUN apt-get update && apt-get install -y \
-        python3-sphinx \
-        python3-sphinx-rtd-theme \
-        python3-recommonmark \
-        make
+    python3-sphinx \
+    python3-sphinx-rtd-theme \
+    python3-recommonmark \
+    make
 
 # For Docs
 ADD docs /docs
@@ -57,6 +60,12 @@ ADD LICENSE /docs/LICENSE.md
 # Copy logdata-anomaly-miner-sources
 ADD source/root/usr/lib/logdata-anomaly-miner /usr/lib/logdata-anomaly-miner
 
+# copy these files instead as symlinks would need absolute paths.
+ADD source/root/etc/aminer/conf-available/ait-lds/* /etc/aminer/conf-enabled/
+ADD source/root/etc/aminer/conf-available/generic/* /etc/aminer/conf-enabled/
+ADD source/root/etc/aminer/conf-available/ait-lds /etc/aminer/conf-available/ait-lds
+ADD source/root/etc/aminer/conf-available/generic /etc/aminer/conf-available/generic
+
 # Entrypoint-wrapper
 ADD scripts/aminerwrapper.sh /aminerwrapper.sh
 
@@ -65,6 +74,7 @@ RUN ln -s /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py /usr/bin/aminerr
 	&& ln -s /usr/lib/logdata-anomaly-miner/aminer.py /usr/bin/aminer \
 	&& chmod 0755 /usr/lib/logdata-anomaly-miner/aminer.py  \
 	&& chmod 0755 /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py \
+	&& chmod 0755 /etc/aminer \
 	&& ln -s /usr/lib/python3/dist-packages/kafka /usr/lib/logdata-anomaly-miner/kafka \
 	&& ln -s /usr/lib/python3/dist-packages/cerberus /usr/lib/logdata-anomaly-miner/cerberus \
 	&& ln -s /usr/lib/python3/dist-packages/scipy /usr/lib/logdata-anomaly-miner/scipy \
@@ -76,10 +86,10 @@ RUN ln -s /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py /usr/bin/aminerr
 	&& ln -s /usr/lib/python3/dist-packages/six.py /usr/lib/logdata-anomaly-miner/six.py \
 	&& ln -s /usr/lib/python3/dist-packages/urllib3 /usr/lib/logdata-anomaly-miner/urllib3 \
 	&& ln -s /usr/lib/python3/dist-packages/statsmodels /usr/lib/logdata-anomaly-miner/statsmodels \
-	&& groupadd -g $GID -o $UNAME && useradd -u $UID -g $GID -ms /usr/sbin/nologin $UNAME && mkdir -p /var/lib/aminer/logs && mkdir /etc/aminer \
-        && chown $UID.$GID -R /var/lib/aminer \
-        && chown $UID.$GID -R /docs \
-        && chmod 0755 /aminerwrapper.sh
+	&& groupadd -g $GID -o $UNAME && useradd -u $UID -g $GID -ms /usr/sbin/nologin $UNAME && mkdir -p /var/lib/aminer/logs \
+    && chown $UID.$GID -R /var/lib/aminer \
+    && chown $UID.$GID -R /docs \
+    && chmod 0755 /aminerwrapper.sh
 
 RUN PACK=$(find /usr/lib/python3/dist-packages -name posix1e.cpython\*.so) && FILE=$(echo $PACK | awk -F '/' '{print $NF}') ln -s $PACK /usr/lib/logdata-anomaly-miner/$FILE
 

Jenkinsfile

@@ -1,6 +1,6 @@
 #
 # PLEASE NOTE THAT YOUR WORKING-DIRECTORY MUST BE THE ROOT OF THIS REPOSITORY
-# IN ORDER WO BUIILD THIS CONTAINER-IMAGE!!!
+# IN ORDER WO BUILD THIS CONTAINER-IMAGE!!!
 #
 # Build:
 #    docker build -f aecid-testsuite/Dockerfile -t aecid/logdata-anomaly-miner-testing:latest .
@@ -59,10 +59,6 @@ RUN apt-get update && apt-get install -y \
     git \
     mypy
 
-
-
-
-
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
     sed -i -e 's/# de_AT ISO-8859-1/de_AT ISO-8859-1/' /etc/locale.gen && \
     dpkg-reconfigure --frontend=noninteractive locales && \
@@ -73,7 +69,7 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 
-RUN pip3 install coverage
+# RUN pip3 install coverage
 
 # Copy logdata-anomaly-miner-sources
 ADD source/root/usr/lib/logdata-anomaly-miner /usr/lib/logdata-anomaly-miner
@@ -105,7 +101,7 @@ RUN ln -s /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py /usr/bin/aminerr
 	&& ln -s /usr/lib/python3/dist-packages/urllib3 /etc/aminer/conf-enabled/urllib3 \
 	&& ln -s /usr/lib/python3/dist-packages/statsmodels /etc/aminer/conf-enabled/statsmodels \
 	&& useradd -ms /usr/sbin/nologin aminer && mkdir -p /var/lib/aminer/log && chmod 0755 /aminerwrapper.sh \
-        && chown aminer.aminer -R /var/lib/aminer
+    && chown aminer.aminer -R /var/lib/aminer && chmod 0755 /etc/aminer
 
 RUN PACK=$(find /usr/lib/python3/dist-packages -name posix1e.cpython\*.so) && FILE=$(echo $PACK | awk -F '/' '{print $NF}') ln -s $PACK /usr/lib/logdata-anomaly-miner/$FILE 
 
@@ -123,6 +119,8 @@ RUN chown aminer.aminer -R /home/aminer \
     && echo "aminer ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/aminer
 
 ADD scripts/testingwrapper.sh /testingwrapper.sh
+ADD source /home/aminer/source
+ADD docs /home/aminer/docs
 
 USER aminer
 WORKDIR /home/aminer/aecid-testsuite