Skip to content

Commit e120fd4

Browse files
whotwagnerwhotwagner
committed
Merge branch 'development'
2 parents 9a254ea + dc6ace9 commit e120fd4

File tree

253 files changed

+8398
-3288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+8398
-3288
lines changed

‎.bandit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[bandit]
2+
exclude = aecid-testsuite/unit,.venv,/usr/lib/logdata-anomaly-miner/aecid-testsuite/unit,/usr/lib/logdata-anomaly-miner/.venv
3+
skips = B108

‎.deepsource.toml

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.flake8

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[flake8]
2+
exclude = aecid-testsuite/unit,aecid-testsuite/system,aecid-testsuite/integration,.venv,/usr/lib/logdata-anomaly-miner/aecid-testsuite/unit,/usr/lib/logdata-anomaly-miner/aecid-testsuite/system,/usr/lib/logdata-anomaly-miner/aecid-testsuite/integration,/usr/lib/logdata-anomaly-miner/.venv
3+
max-line-length = 140
4+
statistics = True

‎.pre-commit-config.yaml

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,63 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v3.2.0
5+
rev: v4.6.0
66
hooks:
77
- id: trailing-whitespace
8+
exclude: aecid-testsuite/runAminerXmlInputDemo.sh
89
- id: end-of-file-fixer
910
- id: check-yaml
11+
exclude: aecid-testsuite/unit/data/configfiles/invalid_config.yml
1012
- id: check-added-large-files
13+
- id: check-ast
14+
- id: check-docstring-first
15+
- id: check-executables-have-shebangs
16+
- id: check-shebang-scripts-are-executable
17+
- id: check-symlinks
18+
- id: check-toml
19+
- id: check-xml
20+
21+
- repo: https://github.com/pre-commit/pygrep-hooks
22+
rev: v1.10.0
23+
hooks:
24+
- id: python-check-blanket-noqa
25+
- id: python-no-log-warn
1126

1227
- repo: https://github.com/pre-commit/mirrors-mypy
13-
rev: v0.790
28+
rev: v1.10.0
1429
hooks:
1530
- id: mypy
16-
additional_dependencies: [pydantic]
31+
additional_dependencies: [pydantic, types-PyYAML]
32+
args: [--install-types, --ignore-missing-imports, --disable-error-code=attr-defined, --implicit-optional]
33+
exclude: aecid-testsuite|source/root/usr/lib/logdata-anomaly-miner/aminer/__init__.py
1734

18-
- repo: https://gitlab.com/pycqa/flake8
19-
rev: 3.8.4
35+
- repo: https://github.com/PyCQA/flake8
36+
rev: 7.0.0
2037
hooks:
2138
- id: flake8
22-
args: [--max-line-length=140]
39+
exclude: ^aecid-testsuite/unit/|^aecid-testsuite/system/|^aecid-testsuite/integration/|.venv/
40+
args: [--statistics]
41+
42+
- repo: https://github.com/PyCQA/docformatter
43+
rev: v1.7.5
44+
hooks:
45+
- id: docformatter
46+
exclude: ^aecid-testsuite/unit/|^aecid-testsuite/system/|^aecid-testsuite/integration/|.venv/
47+
48+
- repo: https://github.com/PyCQA/bandit
49+
rev: 1.7.8
50+
hooks:
51+
- id: bandit
2352
exclude: ^aecid-testsuite/
2453

54+
- repo: https://github.com/jendrikseipp/vulture
55+
rev: 'v2.11'
56+
hooks:
57+
- id: vulture
58+
2559
- repo: https://github.com/pre-commit/mirrors-autopep8
26-
rev: v1.7.0
60+
rev: v2.0.4
2761
hooks:
2862
- id: autopep8
2963
args: [--max-line-length=140, --diff]
64+
exclude: ^aecid-testsuite/unit/|^aecid-testsuite/system/|^aecid-testsuite/integration/|.venv/

‎Dockerfile

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ ARG UNAME=aminer
1515
ARG UID=1000
1616
ARG GID=1000
1717

18-
# allow the system to use two package managers (apt and pip), as we do it intentionally (needed since Debain Bookworm - see PEP 668
19-
ENV PIP_BREAK_SYSTEM_PACKAGES=1
18+
ARG varbranch="main"
19+
ENV BRANCH=$varbranch
2020

2121
# Set local timezone
2222
ENV TZ=Europe/Vienna
@@ -31,23 +31,8 @@ RUN apt-get update && apt-get install -y \
3131
supervisor \
3232
python3 \
3333
python3-pip \
34-
python3-tz \
35-
python3-scipy \
36-
python3-pkg-resources \
37-
python3-setuptools \
38-
python3-dateutil \
39-
python3-six \
40-
python3-scipy \
41-
python3-kafka \
42-
python3-cerberus \
43-
python3-yaml \
44-
python3-pylibacl \
45-
python3-urllib3 \
46-
python3-statsmodels \
47-
python3-patsy \
48-
python3-numpy \
49-
python3-defusedxml \
5034
libacl1-dev \
35+
sudo \
5136
rsyslog
5237

5338
# Docs
@@ -57,6 +42,9 @@ RUN apt-get update && apt-get install -y \
5742
python3-recommonmark \
5843
make
5944

45+
ADD . /home/aminer/logdata-anomaly-miner
46+
RUN cd /home/aminer/logdata-anomaly-miner && scripts/aminer_install.sh -b $BRANCH -s /home/aminer/logdata-anomaly-miner
47+
6048
# For Docs
6149
ADD docs /docs
6250
ADD README.md /docs
@@ -79,35 +67,15 @@ ADD source/root/etc/aminer/conf-available/generic /etc/aminer/conf-available/gen
7967
ADD scripts/aminerwrapper.sh /aminerwrapper.sh
8068

8169
# Prepare the system and link all python-modules
82-
RUN ln -s /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py /usr/bin/aminerremotecontrol \
83-
&& ln -s /usr/lib/logdata-anomaly-miner/aminer.py /usr/bin/aminer \
84-
&& chmod 0755 /usr/lib/logdata-anomaly-miner/aminer.py \
85-
&& chmod 0755 /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py \
70+
RUN chmod 0755 /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py \
8671
&& chmod 0755 /etc/aminer \
87-
&& ln -s /usr/lib/python3/dist-packages/kafka /usr/lib/logdata-anomaly-miner/kafka \
88-
&& ln -s /usr/lib/python3/dist-packages/cerberus /usr/lib/logdata-anomaly-miner/cerberus \
89-
&& ln -s /usr/lib/python3/dist-packages/scipy /usr/lib/logdata-anomaly-miner/scipy \
90-
&& ln -s /usr/lib/python3/dist-packages/numpy /usr/lib/logdata-anomaly-miner/numpy \
91-
&& ln -s /usr/lib/python3/dist-packages/pkg_resources /usr/lib/logdata-anomaly-miner/pkg_resources \
92-
&& ln -s /usr/lib/python3/dist-packages/yaml /usr/lib/logdata-anomaly-miner/yaml \
93-
&& ln -s /usr/lib/python3/dist-packages/pytz /usr/lib/logdata-anomaly-miner/pytz \
94-
&& ln -s /usr/lib/python3/dist-packages/dateutil /usr/lib/logdata-anomaly-miner/dateutil \
95-
&& ln -s /usr/lib/python3/dist-packages/six.py /usr/lib/logdata-anomaly-miner/six.py \
96-
&& ln -s /usr/lib/python3/dist-packages/urllib3 /usr/lib/logdata-anomaly-miner/urllib3 \
97-
&& ln -s /usr/lib/python3/dist-packages/statsmodels /usr/lib/logdata-anomaly-miner/statsmodels \
98-
&& ln -s /usr/lib/python3/dist-packages/packaging /usr/lib/logdata-anomaly-miner/packaging \
99-
&& ln -s /usr/lib/python3/dist-packages/patsy /etc/aminer/conf-enabled/patsy \
100-
&& ln -s /usr/lib/python3/dist-packages/defusedxml /etc/aminer/conf-enabled/defusedxml \
101-
&& groupadd -g $GID -o $UNAME && useradd -u $UID -g $GID -ms /usr/sbin/nologin $UNAME && mkdir -p /var/lib/aminer/logs \
72+
&& mkdir -p /var/lib/aminer/logs \
10273
&& chown $UID.$GID -R /var/lib/aminer \
10374
&& chown $UID.$GID -R /docs \
10475
&& chmod 0755 /aminerwrapper.sh
10576

10677
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
10778

108-
RUN pip3 install orjson
109-
RUN PACK=$(find /usr/local/lib/ -name orjson.cpython\*.so) && FILE=$(echo $PACK | awk -F '/' '{print $NF}') ln -s $PACK /usr/lib/logdata-anomaly-miner/$FILE
110-
11179

11280
# Prepare Supervisord
11381
COPY scripts/supervisord.conf /etc/supervisor/conf.d/supervisord.conf

‎Jenkinsfile

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ void setBuildStatus(String message, String state) {
1010

1111
def ubuntu20image = false
1212
def ubuntu22image = false
13+
def ubuntu24image = false
1314
def debianbusterimage = false
1415
def debianbullseyeimage = false
1516
def debianbookwormimage = false
@@ -38,6 +39,26 @@ pipeline {
3839
sh "docker run -m=2G --rm aecid/logdata-anomaly-miner-testing:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID runMypy"
3940
}
4041
}
42+
stage("Bandit"){
43+
steps {
44+
sh "docker run -m=2G --rm aecid/logdata-anomaly-miner-testing:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID runBandit"
45+
}
46+
}
47+
stage("Vulture"){
48+
steps {
49+
sh "docker run -m=2G --rm aecid/logdata-anomaly-miner-testing:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID runVulture"
50+
}
51+
}
52+
stage("Flake8"){
53+
steps {
54+
sh "docker run -m=2G --rm aecid/logdata-anomaly-miner-testing:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID runFlake8"
55+
}
56+
}
57+
stage("Mccabe"){
58+
steps {
59+
sh "docker run -m=2G --rm aecid/logdata-anomaly-miner-testing:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID runMccabe"
60+
}
61+
}
4162
stage("Release String Check"){
4263
steps {
4364
sh "docker run -m=2G --rm aecid/logdata-anomaly-miner-testing:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID runReleaseStringCheck"
@@ -220,7 +241,7 @@ pipeline {
220241
script {
221242
productionimage = true
222243
}
223-
sh "docker build -f Dockerfile -t aecid/aminer-production:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID ."
244+
sh "docker build -f Dockerfile -t aecid/aminer-production:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID --build-arg=varbranch=development ."
224245
sh "mkdir -p /tmp/production-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID && mkdir /tmp/production-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/persistency && mkdir /tmp/production-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/logs"
225246
sh "cp aecid-testsuite/demo/aminer/access.log /tmp/production-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/logs/"
226247
sh "cp -r source/root/etc/aminer /tmp/production-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/aminercfg"
@@ -230,6 +251,26 @@ pipeline {
230251
sh "docker run -v $PWD/persistency:/var/lib/aminer -v $PWD/logs:/logs --rm -t aecid/aminer-production:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID aminer"
231252
}
232253
}
254+
stage("Ubuntu 24.04 Docker") {
255+
when {
256+
expression {
257+
BRANCH_NAME == "main" || BRANCH_NAME == "development"
258+
}
259+
}
260+
steps {
261+
script {
262+
ubuntu24image = true
263+
}
264+
sh "docker build -f aecid-testsuite/docker/Dockerfile_deb -t aecid/aminer-ubuntu-2404:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID --build-arg=varbranch=development --build-arg=vardistri=ubuntu:24.04 ."
265+
sh "mkdir -p /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID && mkdir /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/persistency && mkdir /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/logs"
266+
sh "cp aecid-testsuite/demo/aminer/access.log /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/logs/"
267+
sh "cp -r source/root/etc/aminer /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/aminercfg"
268+
sh "cp /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/aminercfg/template_config.yml /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/aminercfg/config.yml"
269+
sh "cp /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/aminercfg/conf-available/generic/ApacheAccessModel.py /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID/aminercfg/conf-enabled"
270+
sh "cd /tmp/ubuntu-2404-$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID"
271+
sh "docker run -v $PWD/persistency:/var/lib/aminer -v $PWD/logs:/logs --rm -t aecid/aminer-ubuntu-2404:$JOB_BASE_NAME-$EXECUTOR_NUMBER-$BUILD_ID aminer"
272+
}
273+
}
233274
stage("Ubuntu 22.04 Docker") {
234275
when {
235276
expression {

‎SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
## Reporting a Vulnerability
1111

12-
Please email reports about any security related issues you find to aecid@ait.ac.at. This mail is delivered to a small developer team. Your email will be acknowledged within one business day, and you'll receive a more detailed response to your email within 7 days indicating the next steps in handling your report.
12+
Please email reports about any security related issues you find to aecid@ait.ac.at. This mail is delivered to a small developer team. Your email will be acknowledged within one business day, and you'll receive a more detailed response to your email within 7 days indicating the next steps in handling your report.
1313

1414
Please use a descriptive subject line for your report email. After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix and announcement.
1515

‎aecid-testsuite/Dockerfile

Lines changed: 14 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends apt-utils
3535
RUN apt-get update && apt-get install -y \
3636
python3 \
3737
python3-pip \
38-
python3-tz \
39-
python3-scipy \
40-
python3-pkg-resources \
41-
python3-setuptools \
42-
python3-dateutil \
43-
python3-six \
44-
python3-kafka \
45-
python3-cerberus \
46-
python3-yaml \
47-
python3-pylibacl \
48-
python3-urllib3 \
49-
python3-statsmodels \
50-
python3-pandas \
51-
python3-patsy \
52-
python3-defusedxml \
38+
python3-bandit \
5339
libacl1-dev \
5440
postfix \
5541
procps \
@@ -63,20 +49,19 @@ RUN apt-get update && apt-get install -y \
6349
locales-all \
6450
rsyslog \
6551
git \
66-
mypy \
6752
wget
6853

6954
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
7055
sed -i -e 's/# de_AT ISO-8859-1/de_AT ISO-8859-1/' /etc/locale.gen && \
7156
dpkg-reconfigure --frontend=noninteractive locales && \
7257
update-locale LANG=en_US.UTF-8
7358

74-
ENV LANG en_US.UTF-8
75-
ENV LANGUAGE en_US:en
76-
ENV LC_ALL en_US.UTF-8
59+
ENV LANG=en_US.UTF-8
60+
ENV LANGUAGE=en_US:en
61+
ENV LC_ALL=en_US.UTF-8
7762

78-
79-
# RUN pip3 install coverage
63+
ADD . /home/aminer/logdata-anomaly-miner
64+
RUN cd /home/aminer/logdata-anomaly-miner && scripts/aminer_install.sh -b development -s /home/aminer/logdata-anomaly-miner
8065

8166
# Copy logdata-anomaly-miner-sources
8267
ADD source/root/usr/lib/logdata-anomaly-miner /usr/lib/logdata-anomaly-miner
@@ -92,54 +77,31 @@ ADD source/root/etc/aminer/conf-available/generic /etc/aminer/conf-available/gen
9277
# Entrypoint-wrapper
9378
ADD scripts/aminerwrapper.sh /aminerwrapper.sh
9479

95-
9680
# Prepare the system and link all python-modules
97-
RUN ln -s /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py /usr/bin/aminerremotecontrol \
98-
&& ln -s /usr/lib/logdata-anomaly-miner/aminer.py /usr/bin/aminer \
99-
&& chmod 0755 /usr/lib/logdata-anomaly-miner/aminer.py \
100-
&& chmod 0755 /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py \
101-
&& ln -s /usr/lib/python3/dist-packages/kafka /etc/aminer/conf-enabled/kafka \
102-
&& ln -s /usr/lib/python3/dist-packages/cerberus /etc/aminer/conf-enabled/cerberus \
103-
&& ln -s /usr/lib/python3/dist-packages/scipy /etc/aminer/conf-enabled/scipy \
104-
&& ln -s /usr/lib/python3/dist-packages/numpy /etc/aminer/conf-enabled/numpy \
105-
&& ln -s /usr/lib/python3/dist-packages/pkg_resources /etc/aminer/conf-enabled/pkg_resources \
106-
&& ln -s /usr/lib/python3/dist-packages/yaml /etc/aminer/conf-enabled/yaml \
107-
&& ln -s /usr/lib/python3/dist-packages/pytz /etc/aminer/conf-enabled/pytz \
108-
&& ln -s /usr/lib/python3/dist-packages/dateutil /etc/aminer/conf-enabled/dateutil \
109-
&& ln -s /usr/lib/python3/dist-packages/six.py /etc/aminer/conf-enabled/six.py \
110-
&& ln -s /usr/lib/python3/dist-packages/urllib3 /etc/aminer/conf-enabled/urllib3 \
111-
&& ln -s /usr/lib/python3/dist-packages/statsmodels /etc/aminer/conf-enabled/statsmodels \
112-
&& ln -s /usr/lib/python3/dist-packages/packaging /etc/aminer/conf-enabled/packaging \
113-
&& ln -s /usr/lib/python3/dist-packages/pandas /etc/aminer/conf-enabled/pandas \
114-
&& ln -s /usr/lib/python3/dist-packages/patsy /etc/aminer/conf-enabled/patsy \
115-
&& ln -s /usr/lib/python3/dist-packages/defusedxml /etc/aminer/conf-enabled/defusedxml \
116-
&& useradd -ms /usr/sbin/nologin aminer && mkdir -p /var/lib/aminer/log && chmod 0755 /aminerwrapper.sh \
81+
RUN chmod 0755 /usr/lib/logdata-anomaly-miner/aminerremotecontrol.py \
82+
&& mkdir -p /var/lib/aminer/log && chmod 0755 /aminerwrapper.sh \
11783
&& chown aminer.aminer -R /var/lib/aminer && chmod 0755 /etc/aminer
11884

11985
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
12086

12187
# Add config
12288
ADD source/root/etc/aminer /etc/aminer
12389

124-
# Copy the testsuite
125-
ADD aecid-testsuite /home/aminer/aecid-testsuite
126-
12790
RUN chown aminer.aminer -R /home/aminer \
128-
&& ln -s /usr/lib/logdata-anomaly-miner/aminer /home/aminer/aecid-testsuite/aminer \
129-
&& ln -s /etc/aminer/template_config.py /home/aminer/aecid-testsuite/demo/aminer/template_config.py \
130-
&& ln -s /etc/aminer/template_config.yml /home/aminer/aecid-testsuite/demo/aminer/template_config.yml \
131-
&& chmod +x /home/aminer/aecid-testsuite/*.sh \
91+
&& ln -sf /usr/lib/logdata-anomaly-miner/aminer /home/aminer/logdata-anomaly-miner/aecid-testsuite/aminer \
92+
&& ln -s /etc/aminer/template_config.py /home/aminer/logdata-anomaly-miner/aecid-testsuite/demo/aminer/template_config.py \
93+
&& ln -s /etc/aminer/template_config.yml /home/aminer/logdata-anomaly-miner/aecid-testsuite/demo/aminer/template_config.yml \
94+
&& chmod +x /home/aminer/logdata-anomaly-miner/aecid-testsuite/*.sh \
13295
&& echo "aminer ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/aminer
13396

13497
ADD scripts/testingwrapper.sh /testingwrapper.sh
13598
ADD source /home/aminer/source
13699
ADD docs /home/aminer/docs
137100

138-
RUN pip3 install orjson
139-
RUN PACK=$(find /usr/local/lib/ -name orjson.cpython\*.so) && FILE=$(echo $PACK | awk -F '/' '{print $NF}') ln -s $PACK /usr/lib/logdata-anomaly-miner/$FILE
101+
RUN pip3 install flake8 pycodestyle vulture
140102

141103
USER aminer
142-
WORKDIR /home/aminer/aecid-testsuite
104+
WORKDIR /home/aminer/logdata-anomaly-miner/aecid-testsuite
143105

144106
# The following volumes can be mounted
145107
VOLUME ["/etc/aminer","/var/lib/aminer","/logs"]

‎aecid-testsuite/Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ python3 -m unittest AnalysisComponentsPerformanceTest.py
209209
```
210210

211211
## System Performance Testing:
212-
The goal of these performance tests is to simulate different scenarious of available computing power and memory. For this purpose a virtual machine is configured with more or less CPU's and RAM.
212+
The goal of these performance tests is to simulate different scenarious of available computing power and memory. For this purpose a virtual machine is configured with more or less CPU's and RAM.
213213

214214
The **first config (performance-config.py)** is very simple with very little output. It consists of following components:
215215
#### Analysis
@@ -237,7 +237,7 @@ The **second config (performance-config1.py)** is very similar to the demo-confi
237237

238238
/model/Login Details does not exist
239239
* NewMatchDetector
240-
* EnhancedNewMatchPathValueComboDetector
240+
* EnhancedNewMatchPathValueComboDetector
241241
two attributes and output after 10000 data elements were collected
242242
* HistogramAnalysis
243243
two different PathDependentHistogramAnalysis instances

0 commit comments

Comments
 (0)