From 85a0307e55a883900b0ad357e481b7a8f404c1ee Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 13 Feb 2025 06:51:49 -0500 Subject: [PATCH 1/2] Possible new monitoring stack. --- .../workflows/pr-cloudflare-docker-deploy.yml | 2 +- docker-compose.yml | 73 ++++++++++++++++++- vector_vector.yaml.j2 | 31 ++++++++ 3 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 vector_vector.yaml.j2 diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 93020a59..b5b3c310 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -308,7 +308,7 @@ jobs: uses: keatonLiu/docker-compose-remote-action@v1.2 with: docker_compose_file: docker-compose.yml - docker_args: -d --remove-orphans --pull missing --parallel -1 ${{ steps.regenerate-readme-modified-services.outputs.modified_services }} + docker_args: -d --remove-orphans --pull missing --parallel -1 ssh_user: gitea-deploy ssh_host: 192.168.1.254 ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} diff --git a/docker-compose.yml b/docker-compose.yml index d13a317f..0513c0f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3372,6 +3372,30 @@ services: type: bind bind: create_host_path: true + netalertx: + container_name: netalertx + environment: + TZ: ${TZ} + PORT: 20211 + image: jokobsk/netalertx:latest + network_mode: host + labels: + homepage.group: Infrastructure/App Performance Monitoring + homepage.name: NetAlertX + homepage.href: http://192.168.1.254:20211 + homepage.icon: netalertx.svg + homepage.description: Network Monitoring + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/netalertx/config:/app/config + - ${DOCKER_VOLUME_CONFIG}/netalertx/db:/app/db + # (optional) useful for debugging if you have issues setting up the container + # - ${DOCKER_VOLUME_CONFIG}/netalertx/logs:/app/log + # (API: OPTION 1) use for performance + - type: tmpfs + target: /app/api + # (API: OPTION 2) use when debugging issues + # - ${DOCKER_VOLUME_CONFIG}/netalertx/api:/app/api netbird-dashboard: container_name: netbird-dashboard environment: @@ -3661,6 +3685,40 @@ services: type: bind bind: create_host_path: true + parseable: + command: [ "parseable", "s3-store" ] + depends_on: + - minio + environment: + P_STAGING_DIR: /staging + P_ADDR: 0.0.0.0:8000 + P_USERNAME: admin + P_PASSWORD: ${PARSEABLE_PASSWORD} + P_S3_URL: http://minio:9000 + P_S3_BUCKET: parseable + P_S3_ACCESS_KEY: ${PARSEABLE_S3_ACCESS_KEY} + P_S3_SECRET_KEY: ${PARSEABLE_S3_SECRET_KEY} + P_S3_REGION: us-east-fh-pln + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/liveness" ] + interval: 15s + timeout: 20s + retries: 5 + image: containers.parseable.com/parseable/parseable:latest + labels: + homepage.group: Infrastructure/App Performance Monitoring + homepage.name: Parseable + homepage.href: https://logs.${MY_TLD} + homepage.icon: parseable.svg + homepage.description: Backups for PostgreSQL + swag: enable + swag_proto: http + swag_port: 8000 + swag_url: logs.${MY_TLD} + volumes: + - /parseable/staging:/staging + ports: + - 14453:8000 pgbackweb: container_name: pgbackweb depends_on: @@ -3824,17 +3882,18 @@ services: swag: enable swag_auth: authelia swag_proto: http - swag_port: 9000 + swag_port: 8080 swag_url: portall.${MY_TLD} swag.uptime-kuma.enabled: true swag.uptime-kuma.monitor.url: https://portall.${MY_TLD} homepage.group: System Administration homepage.name: Portall - homepage.href: https://portainer.${MY_TLD} + homepage.href: https://portall.${MY_TLD} homepage.icon: sh-portall.png homepage.description: Management for container ports ports: - 8000:8080 + restart: unless-stopped volumes: - ${DOCKER_VOLUME_CONFIG}/portall:/app/instance postal-smtp: @@ -6284,6 +6343,16 @@ services: volumes: - ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/config/:/vault/config - ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/logs/:/vault/logs + vector: + image: timberio/vector:0.44.0-alpine + container_name: vector + environment: + DOCKER_HOST: tcp://dockerproxy:2375 + ports: + - 60157:8686 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/vector/vector.yaml:/etc/vector/vector.yaml:ro wallabag: container_name: wallabag depends_on: diff --git a/vector_vector.yaml.j2 b/vector_vector.yaml.j2 new file mode 100644 index 00000000..fe197ee3 --- /dev/null +++ b/vector_vector.yaml.j2 @@ -0,0 +1,31 @@ + sources: + rinoa_docker_logs: + type: docker_logs + exclude_containers: + - zammad-init + + sinks: + parseable: + type: http + method: post + batch: + max_bytes: 10485760 + max_events: 1000 + timeout_secs: 10 + compression: gzip + inputs: + - rinoa_docker_logs + encoding: + codec: json + uri: http://parseable:8000/api/v1/ingest' + auth: + strategy: basic + user: admin + password: {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['PARSEABLE_PASSWORD'] }} + request: + headers: + X-P-Stream: vectordemo + healthcheck: + enabled: true + path: 'http://parseable:8000/api/v1/liveness' + port: 80 From 84d4bd9d15e12b8a28a64c382f6d9f1e96941826 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Thu, 13 Feb 2025 12:17:11 +0000 Subject: [PATCH 2/2] chore: Update README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 64a9979f..d26080a9 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ | multi-scrobbler | foxxmd/multi-scrobbler | | n8n | docker.n8n.io/n8nio/n8n | | navidrome | deluan/navidrome:latest | +| netalertx | jokobsk/netalertx:latest | | netbird-dashboard | netbirdio/dashboard:latest | | netbird-signal | netbirdio/signal:latest | | netbird-relay | netbirdio/relay:latest | @@ -92,6 +93,7 @@ | ombi | lscr.io/linuxserver/ombi:latest | | open-webui | ghcr.io/open-webui/open-webui:main | | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest | +| parseable | containers.parseable.com/parseable/parseable:latest | | pgbackweb | eduardolat/pgbackweb:latest | | pgbackweb-db | postgres:16-alpine | | plantuml-server | plantuml/plantuml-server:jetty | @@ -134,6 +136,7 @@ | unmanic | josh5/unmanic:latest | | uptimekuma | louislam/uptime-kuma:latest | | vault | hashicorp/vault:latest | +| vector | timberio/vector:0.44.0-alpine | | wallabag | wallabag/wallabag | | wallos | bellamy/wallos:latest | | watchtower | ghcr.io/containrrr/watchtower:latest |