Skip to content

After release fixes ii #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maldwg merged 3 commits into from
Jul 6, 2026
Merged

After release fixes ii #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92abee7
Fix timeout issues whe services watingin on startup, improved scustom…
maldwg Jul 6, 2026
702ace6
update configuration and usage documentation
maldwg Jul 6, 2026
3bf0b4b
fix linter
maldwg Jul 6, 2026
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
1 change: 0 additions & 1 deletion docker/.env
View file
Open in desktop

This file was deleted.

Empty file added docker/default_input
View file
Open in desktop
Empty file.
118 changes: 1 addition & 117 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,218 +47,102 @@ services:
extends:
file: "docker-compose/dev/docker-compose.monitoring.yml"
service: monitoring_agent
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
clickhouse-server:
condition: service_healthy
profiles: ["dev", "dev-gpu"]

monitoring_agent:
extends:
file: "docker-compose/prod/docker-compose.monitoring.yml"
service: monitoring_agent
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
clickhouse-server:
condition: service_healthy
profiles: ["prod", "prod-gpu"]

logserver-dev:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: logserver
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev", "dev-gpu"]

logserver:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: logserver
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod", "prod-gpu"]

logcollector-dev:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: logcollector
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev", "dev-gpu"]


logcollector:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: logcollector
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod", "prod-gpu"]

prefilter-dev:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: prefilter
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev", "dev-gpu"]

prefilter:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: prefilter
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod", "prod-gpu"]

inspector-dev:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: inspector
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev", "dev-gpu"]

inspector:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: inspector
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod", "prod-gpu"]


detector-dev:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: detector
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev"]

detector-dev-gpu:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: detector-gpu
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev-gpu"]

detector:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: detector
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod"]

detector-gpu:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: detector-gpu
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod-gpu"]

alerter-dev:
extends:
file: "docker-compose/dev/docker-compose.pipeline.yml"
service: alerter
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["dev", "dev-gpu"]

alerter:
extends:
file: "docker-compose/prod/docker-compose.pipeline.yml"
service: alerter
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
profiles: ["prod", "prod-gpu"]

zeek:
image: ghcr.io/astraos-de/hamstring-zeek:2.0.1
image: "${HAMSTRING_IMAGE_REGISTRY:-ghcr.io/astraos-de}/hamstring-zeek:${HAMSTRING_ZEEK_IMAGE_TAG:-2.0.1}"
cap_add:
- NET_ADMIN
network_mode: host
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose/base/docker-compose.clickhouse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
clickhouse-server:
image: clickhouse/clickhouse-server:26.5-alpine
image: "${CLICKHOUSE_IMAGE_REPOSITORY:-clickhouse/clickhouse-server}:${CLICKHOUSE_IMAGE_TAG:-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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
grafana:
image: grafana/grafana:13.0.3-slim
image: "${GRAFANA_IMAGE_REPOSITORY:-grafana/grafana}:${GRAFANA_IMAGE_TAG:-13.0.3-slim}"
container_name: grafana
networks:
- hamstring
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose/base/docker-compose.kafka-exporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
kafka-exporter:
image: danielqsj/kafka-exporter:latest
image: "${KAFKA_EXPORTER_IMAGE_REPOSITORY:-danielqsj/kafka-exporter}:${KAFKA_EXPORTER_IMAGE_TAG:-latest}"
container_name: kafka-exporter
ports:
- "9308:9308"
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose/base/docker-compose.kafka.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ x-kafka-broker-env: &kafka-broker-env

services:
kafka1:
image: "${KAFKA_IMAGE:-confluentinc/cp-kafka:8.2.2}"
image: "${KAFKA_IMAGE_REPOSITORY:-confluentinc/cp-kafka}:${KAFKA_IMAGE_TAG:-8.2.2}"
container_name: kafka1
restart: "unless-stopped"
networks:
Expand All @@ -37,7 +37,7 @@ services:
- kafka-broker-data1:/var/lib/kafka/data

kafka2:
image: "${KAFKA_IMAGE:-confluentinc/cp-kafka:8.2.2}"
image: "${KAFKA_IMAGE_REPOSITORY:-confluentinc/cp-kafka}:${KAFKA_IMAGE_TAG:-8.2.2}"
container_name: kafka2
restart: "unless-stopped"
networks:
Expand All @@ -59,7 +59,7 @@ services:
- kafka-broker-data2:/var/lib/kafka/data

kafka3:
image: "${KAFKA_IMAGE:-confluentinc/cp-kafka:8.2.2}"
image: "${KAFKA_IMAGE_REPOSITORY:-confluentinc/cp-kafka}:${KAFKA_IMAGE_TAG:-8.2.2}"
container_name: kafka3
restart: "unless-stopped"
networks:
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose/base/docker-compose.prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
prometheus:
image: prom/prometheus
image: "${PROMETHEUS_IMAGE_REPOSITORY:-prom/prometheus}:${PROMETHEUS_IMAGE_TAG:-latest}"
container_name: prometheus
ports:
- "9088:9090"
Expand Down
12 changes: 1 addition & 11 deletions docker/docker-compose/dev/docker-compose.monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,10 @@ services:
restart: "unless-stopped"
volumes:
- ../../../config.yaml:/app/config.yaml
depends_on:
kafka1:
condition: service_healthy
kafka2:
condition: service_healthy
kafka3:
condition: service_healthy
clickhouse-server:
condition: service_healthy
grafana:
condition: service_healthy
networks:
- hamstring
environment:
- GROUP_ID=monitoring_agent
- HAMSTRING_WAIT_FOR=kafka,clickhouse
- CLICKHOUSE_USER=${CLICKHOUSE_USER:-default}
- CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD:-hamstring}
10 changes: 8 additions & 2 deletions docker/docker-compose/dev/docker-compose.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ services:
context: ../../..
dockerfile: docker/dockerfiles/Dockerfile.logserver
volumes:
- "${MOUNT_PATH:?MOUNT_PATH not set}:/opt/file.txt"
- ../../../config.yaml:/app/config.yaml
environment:
- GROUP_ID=log_storage
- HAMSTRING_WAIT_FOR=kafka
deploy:
mode: "replicated"
replicas: 1
Expand All @@ -28,6 +28,7 @@ services:
hamstring:
environment:
- GROUP_ID=log_collection
- HAMSTRING_WAIT_FOR=kafka
prefilter:
build:
context: ../../..
Expand All @@ -42,6 +43,7 @@ services:
replicas: 1
environment:
- GROUP_ID=log_filtering
- HAMSTRING_WAIT_FOR=kafka
inspector:
build:
context: ../../..
Expand All @@ -65,6 +67,7 @@ services:
environment:
- GROUP_ID=data_inspection
- NUMBER_OF_INSTANCES=1
- HAMSTRING_WAIT_FOR=kafka
detector:
build:
context: ../../..
Expand All @@ -79,6 +82,7 @@ services:
replicas: 1
environment:
- GROUP_ID=data_analysis
- HAMSTRING_WAIT_FOR=kafka

detector-gpu:
build:
Expand All @@ -100,6 +104,7 @@ services:
capabilities: [gpu]
environment:
- GROUP_ID=data_analysis
- HAMSTRING_WAIT_FOR=kafka
- NVIDIA_VISIBLE_DEVICES=all
- NVIDIA_DRIVER_CAPABILITIES=compute,utility

Expand All @@ -110,11 +115,12 @@ services:
restart: "unless-stopped"
volumes:
- ../../../config.yaml:/app/config.yaml
- ../../../logs:/opt/logs
- "${ALERTER_LOGS_PATH:-../../../logs}:/opt/logs"
networks:
hamstring:
deploy:
mode: "replicated"
replicas: 1
environment:
- GROUP_ID=data_alerting
- HAMSTRING_WAIT_FOR=kafka
Loading
Loading