Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build_test_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
- main
- dev
pull_request:
branches:
- main
jobs:
build_test_linux:
name: ${{ matrix.python-version }} on ${{ matrix.os }}
Expand All @@ -15,8 +13,10 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest" ]
python-version: [ "3.11",
"3.10",
python-version: [
"3.12",
"3.13",
"3.14"
]

steps:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/build_test_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
- main
- dev
pull_request:
branches:
- main
jobs:
build_test_macos:
name: ${{ matrix.python-version }} on ${{ matrix.os }}
Expand All @@ -15,8 +13,9 @@ jobs:
fail-fast: false
matrix:
os: [ "macos-14" ]
python-version: [ "3.11",
"3.10",
python-version: [ "3.12",
"3.13",
"3.14"
]

steps:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ on:
- main
- dev
pull_request:
branches:
- main

jobs:
build:
Expand All @@ -16,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v4.2.0

- name: Setup py-3.11
- name: Setup py-3.14
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.14'
cache: 'pip'
cache-dependency-path: |
requirements/requirements.*.txt
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
ref: ${{ github.event.pull_request.base.ref }}

- name: Setup Docker buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Log into registry ${{ env.REGISTRY }}
uses: docker/login-action@v3
Expand All @@ -143,10 +143,10 @@ jobs:
type=raw,value=latest-dev

- name: Build and push Docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
file: ./docker/dockerfiles/Dockerfile.${{ matrix.container }}
file: ./docker/dockerfiles/Dockerfile.${{ matrix.container }}
4 changes: 2 additions & 2 deletions .github/workflows/publish_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
echo "major_minor=v${MAJOR}.${MINOR}" >> "$GITHUB_OUTPUT"

- name: Setup Docker buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Log into registry ${{ env.REGISTRY }}
uses: docker/login-action@v3
Expand All @@ -170,7 +170,7 @@ jobs:
type=raw,value=latest

- name: Build and push Docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest" ]
python-version: [ "3.11" ]
python-version: [ "3.14" ]
permissions:
issues: write
pull-requests: write
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@

## Getting Started

### Requirements

HAMSTRING currently supports Python 3.12 through 3.14.

#### Run **HAMSTRING** using Docker Compose:
```sh
HOST_IP=127.0.0.1 docker compose -f docker/docker-compose.yml --profile prod up
Expand Down
34 changes: 16 additions & 18 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,33 +46,33 @@ pipeline:
max_workers: 1
instances:
dga_collector:
max_workers: 2
max_workers: 1
domainator_collector:
max_workers: 2
max_workers: 1
log_filtering.prefilter:
executor: thread
max_workers: 2
max_workers: 1
instances:
dga_filter:
max_workers: 2
max_workers: 1
no_filter:
max_workers: 2
max_workers: 1
data_inspection.inspector:
executor: thread
max_workers: 2
instances:
dga_inspector:
max_workers: 2
max_workers: 1
no_inspector:
max_workers: 2
max_workers: 1
data_analysis.detector:
executor: thread
max_workers: 2
max_workers: 1
instances:
RF-dga_detector:
max_workers: 2
max_workers: 1
domainator:
max_workers: 3
max_workers: 2
domainator_attributor:
max_workers: 1
domainator_attributor_behaviour:
Expand All @@ -83,12 +83,10 @@ pipeline:
max_workers: 1
pipeline.alerter:
executor: thread
max_workers: 2
max_workers: 1
instances:
generic:
max_workers: 2
attributor:
max_workers: 2
max_workers: 1
monitoring.agent:
executor: thread
max_workers: 2
Expand Down Expand Up @@ -197,7 +195,7 @@ pipeline:
use_scaler: false
checksum: a4aac4c585f1e614c3cf0d737e80b960c5de6e87b253f7cdd07125d9ce486476
base_url: https://heibox.uni-heidelberg.de/d/0d5cbcbe16cd46a58021/
threshold: 0.05
threshold: 0.5
consume_from: inspector
inspector_name: "domainator_inspector"
next_detectors:
Expand All @@ -218,7 +216,7 @@ pipeline:
use_scaler: false
checksum: d8f302edc166ecc80985838a30b5dff16ccc83480ea3c2480652f49c8f6b5e9b
base_url: https://heibox.uni-heidelberg.de/d/0d5cbcbe16cd46a58021/
threshold: 0.05
threshold: 0.5
consume_from: detector
detector_name: "domainator"
next_detectors: ""
Expand All @@ -236,7 +234,7 @@ pipeline:
use_scaler: false
checksum: 9a0970b4160b22f4c3c5ac99760f0ace5500dd25c5a195ff13254ad3c11d5dcd
base_url: https://heibox.uni-heidelberg.de/d/0d5cbcbe16cd46a58021/
threshold: 0.05
threshold: 0.5
consume_from: detector
detector_name: "domainator"
next_detectors: ""
Expand All @@ -254,7 +252,7 @@ pipeline:
use_scaler: false
checksum: 360bd26881beabce7e7581963240915de807c48b5e4a3501a657139f2ecb8a8b
base_url: https://heibox.uni-heidelberg.de/d/0d5cbcbe16cd46a58021/
threshold: 0.05
threshold: 0.5
consume_from: detector
detector_name: "domainator"
next_detectors: ""
Expand Down
22 changes: 3 additions & 19 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,19 @@
services:
zookeeper:
extends:
file: "docker-compose/base/docker-compose.kafka.yml"
service: zookeeper

kafka1:
extends:
file: "docker-compose/base/docker-compose.kafka.yml"
service: kafka1
depends_on:
zookeeper:
condition: service_healthy

kafka2:
extends:
file: "docker-compose/base/docker-compose.kafka.yml"
service: kafka2
depends_on:
zookeeper:
condition: service_healthy


kafka3:
extends:
file: "docker-compose/base/docker-compose.kafka.yml"
service: kafka3
depends_on:
zookeeper:
condition: service_healthy
clickhouse-server:
extends:
file: "docker-compose/base/docker-compose.clickhouse.yml"
Expand Down Expand Up @@ -305,8 +291,6 @@ networks:
volumes:
ch_data:
ch_logs:
kafka-data1:
kafka-data2:
kafka-data3:
zk-data:
zk-txn-logs:
kafka-broker-data1:
kafka-broker-data2:
kafka-broker-data3:
2 changes: 1 addition & 1 deletion docker/docker-compose/base/docker-compose.clickhouse.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
clickhouse-server:
image: clickhouse/clickhouse-server:24.3.12.75-alpine
image: clickhouse/clickhouse-server:26.5-alpine
container_name: clickhouse-server
volumes:
- ../../create_tables:/docker-entrypoint-initdb.d
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose/base/docker-compose.grafana.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
grafana:
image: grafana/grafana:11.2.2-security-01
image: grafana/grafana:13.0.3-slim
container_name: grafana
networks:
- hamstring
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka-exporter:
image: danielqsj/kafka-exporter
image: danielqsj/kafka-exporter:latest
container_name: kafka-exporter
ports:
- "9308:9308"
Expand Down
Loading
Loading