From e639ba6704f4f0eb33170e899a36ead34804dfbb Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:27:39 +0100 Subject: [PATCH 1/4] added victoriametrics --- docker-compose.dev.yml | 13 +++++++++++++ docker-compose.prod.yml | 14 ++++++++++++++ docker-compose.staging.yml | 14 ++++++++++++++ packages/prometheus/prometheus.dev.yml | 5 +---- packages/prometheus/prometheus.prod.yml | 3 +++ 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 2b5bf5b0..1741a5c3 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -21,6 +21,18 @@ services: command: - "--config.file=/etc/prometheus/prometheus.yml" + victoriametrics: + image: victoriametrics/victoria-metrics:latest + container_name: victoria-metrics + restart: unless-stopped + ports: + - "8428:8428" # VM Web UI + API + Prometheus-compatible read endpoint + volumes: + - victoria-metrics-data:/storage + command: + - "-storageDataPath=/storage" + - "-retentionPeriod=24" # 24 Monate retention + redis: container_name: redis image: redis/redis-stack:latest @@ -47,5 +59,6 @@ services: volumes: postgres-data: + victoria-metrics-data: redis_data: driver: local diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 9808f0e2..90ee7edd 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -138,6 +138,20 @@ services: - /sys:/sys:ro networks: - core_network + + victoriametrics: + image: victoriametrics/victoria-metrics:latest + container_name: victoria-metrics + restart: unless-stopped + ports: + - "8428:8428" # VM Web UI + API + Prometheus-compatible read endpoint + volumes: + - victoria-metrics-data:/storage + command: + - "-storageDataPath=/storage" + - "-retentionPeriod=24" # 24 Monate retention + networks: + - core_network prometheus: restart: unless-stopped image: prom/prometheus:latest diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 78fc2945..6cae5973 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -132,6 +132,20 @@ services: networks: - core_network restart: unless-stopped + + victoriametrics: + image: victoriametrics/victoria-metrics:latest + container_name: victoria-metrics + restart: unless-stopped + ports: + - "8428:8428" # VM Web UI + API + Prometheus-compatible read endpoint + volumes: + - victoria-metrics-data:/storage + command: + - "-storageDataPath=/storage" + - "-retentionPeriod=24" # 24 Monate retention + networks: + - core_network prometheus: image: prom/prometheus:latest container_name: prometheus diff --git a/packages/prometheus/prometheus.dev.yml b/packages/prometheus/prometheus.dev.yml index 5bae7db3..49b5ce1c 100644 --- a/packages/prometheus/prometheus.dev.yml +++ b/packages/prometheus/prometheus.dev.yml @@ -2,10 +2,7 @@ global: scrape_interval: 40s remote_write: - - url: https://prometheus-prod-36-prod-us-west-0.grafana.net/api/prom/push - basic_auth: - username: 2527367 - password: glc_eyJvIjoiMTMzOTM4MiIsIm4iOiJzdGFjay0xMzAxNTY2LWFsbG95LWxvY2FsLWRldiIsImsiOiI1YkM0SkFvODU3NjJCaTFlQnkwY0xySjEiLCJtIjp7InIiOiJwcm9kLXVzLXdlc3QtMCJ9fQ== + - url: "http://victoriametrics:8428/api/v1/write" scrape_configs: - job_name: core-server diff --git a/packages/prometheus/prometheus.prod.yml b/packages/prometheus/prometheus.prod.yml index 8c0e5880..a01ec226 100644 --- a/packages/prometheus/prometheus.prod.yml +++ b/packages/prometheus/prometheus.prod.yml @@ -1,6 +1,9 @@ global: scrape_interval: 40s +remote_write: + - url: "http://victoriametrics:8428/api/v1/write" + scrape_configs: - job_name: core-server static_configs: From 59357a2ae6da53fd3297a948d0d3891522baa657 Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:31:27 +0100 Subject: [PATCH 2/4] VM volume --- docker-compose.prod.yml | 1 + docker-compose.staging.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 90ee7edd..919707bf 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -249,3 +249,4 @@ volumes: driver: local portainer_data: prometheus_data: + victoria-metrics-data: diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 6cae5973..fb1b1043 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -242,3 +242,4 @@ volumes: driver: local portainer_data: prometheus_data: + victoria-metrics-data: From d6bfcd3061702f00bb3ebe72055f2024e021ae8d Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Sat, 8 Nov 2025 11:45:08 +0100 Subject: [PATCH 3/4] merge prometheus --- packages/prometheus/prometheus.prod.yml | 33 +++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/packages/prometheus/prometheus.prod.yml b/packages/prometheus/prometheus.prod.yml index a01ec226..2df71e8b 100644 --- a/packages/prometheus/prometheus.prod.yml +++ b/packages/prometheus/prometheus.prod.yml @@ -23,10 +23,29 @@ scrape_configs: - job_name: "traefik" static_configs: - targets: ["traefik:8080"] # Traefik dashboard endpoint -# - job_name: "Node Exporter" -# static_configs: -# - targets: -# [ -# "var01.virtualairrescue.com:9100/metrics", -# "var01.virtualairrescue.com:9100/probe?target=https://virtualairrescue.com&module=http_2xx", -# ] + + - job_name: node_exporter + scrape_interval: 15s + static_configs: + - targets: ["node_exporter:9100"] + + - job_name: blackbox + metrics_path: /probe + params: + module: [http_2xx] + scrape_interval: 60s + static_configs: + - targets: + - https://status.virtualairrescue.com + - https://virtualairrescue.com + - https://ops.virtualairrescue.com + - https://nextcloud.virtualairrescue.com + - https://moodle.virtualairrescue.com + + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: blackbox_exporter:9115 From 6081c1e38d90eb2b01798a8a3c39aa99241f0b5d Mon Sep 17 00:00:00 2001 From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com> Date: Sat, 8 Nov 2025 12:03:00 +0100 Subject: [PATCH 4/4] vm network --- docker-compose.prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 919707bf..0e3b13f2 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -152,6 +152,7 @@ services: - "-retentionPeriod=24" # 24 Monate retention networks: - core_network + - traefik prometheus: restart: unless-stopped image: prom/prometheus:latest