From 5d4b481a140ec76b66d195787ccd4ece18356236 Mon Sep 17 00:00:00 2001 From: cybabun1 Date: Sun, 30 Nov 2025 18:21:41 -0700 Subject: [PATCH 1/5] update configs --- docker-compose.yml | 111 +++++++++++++++++++++++++++++++++++----- loki/loki-config.yaml | 49 ++++++++++++++++++ tempo/tempo-config.yaml | 29 +++++++++++ 3 files changed, 177 insertions(+), 12 deletions(-) create mode 100644 loki/loki-config.yaml create mode 100644 tempo/tempo-config.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 2f10aab..12c7f9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,46 +1,129 @@ -version: "3.8" - services: + # ----------------------------- + # Prometheus - Metrics + # ----------------------------- prometheus: image: prom/prometheus:latest container_name: prometheus + ports: + - "9090:9090" volumes: - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro - ./prometheus/alert.rules.yml:/etc/prometheus/alert.rules.yml:ro + - prometheus-data:/prometheus command: - - "--config.file=/etc/prometheus/prometheus.yml" - - "--web.enable-lifecycle" - ports: - - "9090:9090" + - --config.file=/etc/prometheus/prometheus.yml + - --web.enable-lifecycle depends_on: - - alertmanager + alertmanager: + condition: service_healthy restart: unless-stopped + healthcheck: + test: + [ + "CMD-SHELL", + "wget --spider -q http://prometheus:9090/-/ready || exit 1", + ] + interval: 10s + timeout: 5s + retries: 5 + # ----------------------------- + # Alertmanager - Alerts + # ----------------------------- alertmanager: image: prom/alertmanager:latest container_name: alertmanager + ports: + - "9093:9093" volumes: - ./alertmanager/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro + - alertmanager-data:/alertmanager command: - - "--config.file=/etc/alertmanager/alertmanager.yml" - ports: - - "9093:9093" + - --config.file=/etc/alertmanager/alertmanager.yml restart: unless-stopped + healthcheck: + test: + [ + "CMD-SHELL", + "wget --spider -q http://alertmanager:9093/-/ready || exit 1", + ] + interval: 10s + timeout: 5s + retries: 5 + # ----------------------------- + # Grafana - Dashboards / Visualization + # ----------------------------- grafana: image: grafana/grafana:latest container_name: grafana ports: - "3000:3000" environment: - - GF_SECURITY_ADMIN_USER=admin - - GF_SECURITY_ADMIN_PASSWORD=admin + GF_SECURITY_ADMIN_USER: admin + GF_SECURITY_ADMIN_PASSWORD: admin + GF_LOG_LEVEL: info depends_on: - prometheus volumes: - grafana-storage:/var/lib/grafana restart: unless-stopped + healthcheck: + test: + [ + "CMD-SHELL", + "wget --spider -q http://grafana:3000/api/health || exit 1", + ] + interval: 10s + timeout: 5s + retries: 5 + + # ----------------------------- + # Loki - Logs aggregation (commented out) + # ----------------------------- + # loki: + # image: grafana/loki:latest + # container_name: loki + # ports: + # - "3100:3100" + # command: + # - -config.file=/etc/loki/loki-config.yaml + # volumes: + # - ./loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro + # - loki-data:/loki + # restart: unless-stopped + # healthcheck: + # test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] + # interval: 10s + # timeout: 5s + # retries: 5 + + # ----------------------------- + # Tempo - Traces aggregation + # ----------------------------- + tempo: + image: grafana/tempo:2.6.0 + container_name: tempo + ports: + - "3200:3200" # HTTP API + - "4317:4317" # OTLP gRPC + volumes: + - ./tempo/tempo-config.yaml:/etc/tempo/tempo-config.yaml:ro + - ./tempo-data:/tempo-data + command: + - -config.file=/etc/tempo/tempo-config.yaml + restart: unless-stopped + user: "10001:10001" # fixes permission denied on /tempo-data + #healthcheck: + # test: ["CMD-SHELL", "wget --spider -q http://tempo:3200/ready || exit 1"] + # interval: 10s + # timeout: 5s + # retries: 5 + # ----------------------------- + # IRC relay - for alert notifications + # ----------------------------- irc-relay: build: context: ./irc-deamon @@ -54,4 +137,8 @@ services: restart: unless-stopped volumes: + prometheus-data: + alertmanager-data: grafana-storage: + tempo-data: + loki-data: diff --git a/loki/loki-config.yaml b/loki/loki-config.yaml new file mode 100644 index 0000000..2070b28 --- /dev/null +++ b/loki/loki-config.yaml @@ -0,0 +1,49 @@ +auth_enabled: false + +server: + http_listen_port: 3100 + log_level: info + +ingester: + lifecycler: + address: 127.0.0.1 + ring: + kvstore: + store: inmemory + replication_factor: 1 + final_sleep: 0s + chunk_idle_period: 5m + chunk_retain_period: 30s + max_transfer_retries: 0 + +schema_config: + configs: + - from: 2020-10-24 + store: boltdb-shipper + object_store: filesystem + schema: v11 + index: + prefix: index_ + period: 24h + +storage_config: + boltdb_shipper: + active_index_directory: /loki/index + cache_location: /loki/cache + shared_store: filesystem + filesystem: + directory: /loki/chunks + +limits_config: + enforce_metric_name: false + reject_old_samples: true + reject_old_samples_max_age: 168h + # Important for latest Loki image with OTLP ingestion + allow_structured_metadata: false + +chunk_store_config: + max_look_back_period: 0s + +table_manager: + retention_deletes_enabled: false + retention_period: 0s diff --git a/tempo/tempo-config.yaml b/tempo/tempo-config.yaml new file mode 100644 index 0000000..b186a4c --- /dev/null +++ b/tempo/tempo-config.yaml @@ -0,0 +1,29 @@ +# tempo-config.yaml - single-node local dev + +server: + http_listen_port: 3200 + grpc_listen_port: 4317 + +distributor: + receivers: + otlp: + protocols: + grpc: + http: + +ingester: + lifecycler: + ring: + kvstore: + store: inmemory + trace_idle_period: 5m + max_block_duration: 1h + +storage: + trace: + backend: local + local: + path: /tempo-data/traces + +querier: {} +compactor: {} From e78849d6574dfebfc69e90ebe53305775020c2e2 Mon Sep 17 00:00:00 2001 From: cybabun1 Date: Sun, 30 Nov 2025 22:27:06 -0700 Subject: [PATCH 2/5] update permissions for scripts --- docker-compose.yml | 61 +++++++++++++++++++++++------------------ loki/loki-config.yaml | 2 -- tempo/tempo-config.yaml | 6 ++-- 3 files changed, 38 insertions(+), 31 deletions(-) mode change 100644 => 100755 loki/loki-config.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 12c7f9a..f75b1b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,5 @@ +version: "3.9" + services: # ----------------------------- # Prometheus - Metrics @@ -80,24 +82,27 @@ services: retries: 5 # ----------------------------- - # Loki - Logs aggregation (commented out) + # Loki - Logs aggregation # ----------------------------- - # loki: - # image: grafana/loki:latest - # container_name: loki - # ports: - # - "3100:3100" - # command: - # - -config.file=/etc/loki/loki-config.yaml - # volumes: - # - ./loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro - # - loki-data:/loki - # restart: unless-stopped - # healthcheck: - # test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] - # interval: 10s - # timeout: 5s - # retries: 5 + loki: + image: grafana/loki:2.8.2 + container_name: loki + ports: + - "3100:3100" + user: "10001:10001" # ensures proper permissions on volumes + command: + - -config.file=/etc/loki/loki-config.yaml + volumes: + - ./loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro + - loki-index:/loki/index + - loki-cache:/loki/cache + - loki-chunks:/loki/chunks + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] + interval: 10s + timeout: 5s + retries: 5 # ----------------------------- # Tempo - Traces aggregation @@ -108,21 +113,21 @@ services: ports: - "3200:3200" # HTTP API - "4317:4317" # OTLP gRPC + user: "10001:10001" # ensures proper permissions volumes: - ./tempo/tempo-config.yaml:/etc/tempo/tempo-config.yaml:ro - - ./tempo-data:/tempo-data + - tempo-data:/tempo-data command: - -config.file=/etc/tempo/tempo-config.yaml restart: unless-stopped - user: "10001:10001" # fixes permission denied on /tempo-data - #healthcheck: - # test: ["CMD-SHELL", "wget --spider -q http://tempo:3200/ready || exit 1"] - # interval: 10s - # timeout: 5s - # retries: 5 + healthcheck: + test: ["CMD-SHELL", "wget --spider -q http://tempo:3200/ready || exit 1"] + interval: 10s + timeout: 5s + retries: 5 # ----------------------------- - # IRC relay - for alert notifications + # IRC relay - Alert notifications # ----------------------------- irc-relay: build: @@ -135,10 +140,14 @@ services: - ./irc-deamon/config.yml:/etc/alertmanager-irc-relay/config.yml:ro command: ["--config", "/etc/alertmanager-irc-relay/config.yml"] restart: unless-stopped + depends_on: + - alertmanager volumes: prometheus-data: alertmanager-data: grafana-storage: tempo-data: - loki-data: + loki-index: + loki-cache: + loki-chunks: diff --git a/loki/loki-config.yaml b/loki/loki-config.yaml old mode 100644 new mode 100755 index 2070b28..94be8b9 --- a/loki/loki-config.yaml +++ b/loki/loki-config.yaml @@ -38,8 +38,6 @@ limits_config: enforce_metric_name: false reject_old_samples: true reject_old_samples_max_age: 168h - # Important for latest Loki image with OTLP ingestion - allow_structured_metadata: false chunk_store_config: max_look_back_period: 0s diff --git a/tempo/tempo-config.yaml b/tempo/tempo-config.yaml index b186a4c..2701af1 100644 --- a/tempo/tempo-config.yaml +++ b/tempo/tempo-config.yaml @@ -1,4 +1,4 @@ -# tempo-config.yaml - single-node local dev +# Single-node local dev server: http_listen_port: 3200 @@ -8,8 +8,8 @@ distributor: receivers: otlp: protocols: - grpc: - http: + grpc: {} + http: {} ingester: lifecycler: From b2a8851d45c00c710fd1604fecf26d83606fa390 Mon Sep 17 00:00:00 2001 From: cybabun1 Date: Sun, 30 Nov 2025 23:39:52 -0700 Subject: [PATCH 3/5] update configs --- docker-compose.yml | 6 +- docker-compose.yml.bak | 154 ++++++++++++++++++++++++++++++++++ loki-init.sh | 14 ++++ loki/data/index/uploader/name | 1 + loki/loki-config.yaml | 9 +- tempo/tempo-config.yaml | 3 +- 6 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 docker-compose.yml.bak create mode 100755 loki-init.sh create mode 100755 loki/data/index/uploader/name diff --git a/docker-compose.yml b/docker-compose.yml index f75b1b8..1a7cab5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,7 +89,7 @@ services: container_name: loki ports: - "3100:3100" - user: "10001:10001" # ensures proper permissions on volumes + user: "10001:10001" command: - -config.file=/etc/loki/loki-config.yaml volumes: @@ -97,6 +97,7 @@ services: - loki-index:/loki/index - loki-cache:/loki/cache - loki-chunks:/loki/chunks + - loki-wal:/loki/wal restart: unless-stopped healthcheck: test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] @@ -113,7 +114,7 @@ services: ports: - "3200:3200" # HTTP API - "4317:4317" # OTLP gRPC - user: "10001:10001" # ensures proper permissions + user: "10001:10001" volumes: - ./tempo/tempo-config.yaml:/etc/tempo/tempo-config.yaml:ro - tempo-data:/tempo-data @@ -151,3 +152,4 @@ volumes: loki-index: loki-cache: loki-chunks: + loki-wal: diff --git a/docker-compose.yml.bak b/docker-compose.yml.bak new file mode 100644 index 0000000..e1418d1 --- /dev/null +++ b/docker-compose.yml.bak @@ -0,0 +1,154 @@ +version: "3.9" + +services: + # ----------------------------- + # Prometheus - Metrics + # ----------------------------- + prometheus: + image: prom/prometheus:latest + container_name: prometheus + ports: + - "9090:9090" + volumes: + - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro + - ./prometheus/alert.rules.yml:/etc/prometheus/alert.rules.yml:ro + - prometheus-data:/prometheus + command: + - --config.file=/etc/prometheus/prometheus.yml + - --web.enable-lifecycle + depends_on: + alertmanager: + condition: service_healthy + restart: unless-stopped + healthcheck: + test: + [ + "CMD-SHELL", + "wget --spider -q http://prometheus:9090/-/ready || exit 1", + ] + interval: 10s + timeout: 5s + retries: 5 + + # ----------------------------- + # Alertmanager - Alerts + # ----------------------------- + alertmanager: + image: prom/alertmanager:latest + container_name: alertmanager + ports: + - "9093:9093" + volumes: + - ./alertmanager/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro + - alertmanager-data:/alertmanager + command: + - --config.file=/etc/alertmanager/alertmanager.yml + restart: unless-stopped + healthcheck: + test: + [ + "CMD-SHELL", + "wget --spider -q http://alertmanager:9093/-/ready || exit 1", + ] + interval: 10s + timeout: 5s + retries: 5 + + # ----------------------------- + # Grafana - Dashboards / Visualization + # ----------------------------- + grafana: + image: grafana/grafana:latest + container_name: grafana + ports: + - "3000:3000" + environment: + GF_SECURITY_ADMIN_USER: admin + GF_SECURITY_ADMIN_PASSWORD: admin + GF_LOG_LEVEL: info + depends_on: + - prometheus + volumes: + - grafana-storage:/var/lib/grafana + restart: unless-stopped + healthcheck: + test: + [ + "CMD-SHELL", + "wget --spider -q http://grafana:3000/api/health || exit 1", + ] + interval: 10s + timeout: 5s + retries: 5 + + # ----------------------------- + # Loki - Logs aggregation + # ----------------------------- + loki: + image: grafana/loki:2.8.2 + container_name: loki + ports: + - "3100:3100" + user: "10001:10001" # ensures proper permissions on volumes + command: + - -config.file=/etc/loki/loki-config.yaml + volumes: + - ./loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro + - loki-index:/loki/index + - loki-cache:/loki/cache + - loki-chunks:/loki/chunks + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] + interval: 10s + timeout: 5s + retries: 5 + entrypoint: ["/loki-init.sh"] + + # ----------------------------- + # Tempo - Traces aggregation + # ----------------------------- + tempo: + image: grafana/tempo:2.6.0 + container_name: tempo + ports: + - "3200:3200" # HTTP API + - "4317:4317" # OTLP gRPC + user: "10001:10001" # ensures proper permissions + volumes: + - ./tempo/tempo-config.yaml:/etc/tempo/tempo-config.yaml:ro + - tempo-data:/tempo-data + command: + - -config.file=/etc/tempo/tempo-config.yaml + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "wget --spider -q http://tempo:3200/ready || exit 1"] + interval: 10s + timeout: 5s + retries: 5 + + # ----------------------------- + # IRC relay - Alert notifications + # ----------------------------- + irc-relay: + build: + context: ./irc-deamon + dockerfile: Dockerfile.irc + container_name: irc-relay + ports: + - "8010:8010" + volumes: + - ./irc-deamon/config.yml:/etc/alertmanager-irc-relay/config.yml:ro + command: ["--config", "/etc/alertmanager-irc-relay/config.yml"] + restart: unless-stopped + depends_on: + - alertmanager + +volumes: + prometheus-data: + alertmanager-data: + grafana-storage: + tempo-data: + loki-index: + loki-cache: + loki-chunks: diff --git a/loki-init.sh b/loki-init.sh new file mode 100755 index 0000000..d1ddce7 --- /dev/null +++ b/loki-init.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# loki-init.sh +# Ensure all mounted volumes have correct ownership before starting Loki + +LOKI_UID=10001 +LOKI_GID=10001 + +echo "Fixing permissions for Loki volumes..." +# Recursively chown mounted paths +chown -R $LOKI_UID:$LOKI_GID /loki/index /loki/chunks /loki/cache || true + +echo "Starting Loki..." +# Execute original Loki command +exec /usr/bin/loki "$@" diff --git a/loki/data/index/uploader/name b/loki/data/index/uploader/name new file mode 100755 index 0000000..24f57e9 --- /dev/null +++ b/loki/data/index/uploader/name @@ -0,0 +1 @@ +0cb302e1b50b-1764570257388144636 \ No newline at end of file diff --git a/loki/loki-config.yaml b/loki/loki-config.yaml index 94be8b9..cac09a5 100755 --- a/loki/loki-config.yaml +++ b/loki/loki-config.yaml @@ -6,7 +6,8 @@ server: ingester: lifecycler: - address: 127.0.0.1 + # Changed from 127.0.0.1 to 0.0.0.0 for Docker networking + address: 0.0.0.0 ring: kvstore: store: inmemory @@ -33,6 +34,8 @@ storage_config: shared_store: filesystem filesystem: directory: /loki/chunks + wal: + directory: /loki/wal limits_config: enforce_metric_name: false @@ -45,3 +48,7 @@ chunk_store_config: table_manager: retention_deletes_enabled: false retention_period: 0s + +compactor: + working_directory: /loki/compactor + shared_store: filesystem diff --git a/tempo/tempo-config.yaml b/tempo/tempo-config.yaml index 2701af1..4926baa 100644 --- a/tempo/tempo-config.yaml +++ b/tempo/tempo-config.yaml @@ -1,4 +1,4 @@ -# Single-node local dev +# Single-node dev setup server: http_listen_port: 3200 @@ -26,4 +26,5 @@ storage: path: /tempo-data/traces querier: {} + compactor: {} From 7464fede14d9c7574ffa67d2330fb796be75fe13 Mon Sep 17 00:00:00 2001 From: cybabun1 Date: Mon, 1 Dec 2025 00:23:18 -0700 Subject: [PATCH 4/5] commit working revision --- docker-compose.yml | 5 +++-- docker-compose.yml.bak | 8 ++++++-- loki/loki-config.yaml | 7 ++++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1a7cab5..e450efb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,8 +41,7 @@ services: volumes: - ./alertmanager/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro - alertmanager-data:/alertmanager - command: - - --config.file=/etc/alertmanager/alertmanager.yml + command: ["--config.file=/etc/alertmanager/alertmanager.yml"] restart: unless-stopped healthcheck: test: @@ -98,6 +97,7 @@ services: - loki-cache:/loki/cache - loki-chunks:/loki/chunks - loki-wal:/loki/wal + - loki-compactor:/loki/compactor restart: unless-stopped healthcheck: test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] @@ -153,3 +153,4 @@ volumes: loki-cache: loki-chunks: loki-wal: + loki-compactor: diff --git a/docker-compose.yml.bak b/docker-compose.yml.bak index e1418d1..b496e2f 100644 --- a/docker-compose.yml.bak +++ b/docker-compose.yml.bak @@ -89,14 +89,17 @@ services: container_name: loki ports: - "3100:3100" - user: "10001:10001" # ensures proper permissions on volumes + user: "0:0" + #user: "10001:10001" # ensures proper permissions on volumes command: - -config.file=/etc/loki/loki-config.yaml volumes: - ./loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro - loki-index:/loki/index - - loki-cache:/loki/cache + #- loki-cache:/loki/cache - loki-chunks:/loki/chunks + #- ./wal:/wal + - loki-wal:/loki/wal restart: unless-stopped healthcheck: test: ["CMD-SHELL", "wget --spider -q http://loki:3100/ready || exit 1"] @@ -152,3 +155,4 @@ volumes: loki-index: loki-cache: loki-chunks: + loki-wal: diff --git a/loki/loki-config.yaml b/loki/loki-config.yaml index cac09a5..34ab518 100755 --- a/loki/loki-config.yaml +++ b/loki/loki-config.yaml @@ -2,11 +2,14 @@ auth_enabled: false server: http_listen_port: 3100 + grpc_listen_port: 9095 log_level: info ingester: + wal: + enabled: true + dir: /loki/wal # path must exist and be writable by UID 10001 lifecycler: - # Changed from 127.0.0.1 to 0.0.0.0 for Docker networking address: 0.0.0.0 ring: kvstore: @@ -34,8 +37,6 @@ storage_config: shared_store: filesystem filesystem: directory: /loki/chunks - wal: - directory: /loki/wal limits_config: enforce_metric_name: false From e1087f55f0efbe6c1085eedd1486ca29901fedc9 Mon Sep 17 00:00:00 2001 From: cybabun1 Date: Mon, 1 Dec 2025 13:48:31 -0700 Subject: [PATCH 5/5] update configs --- clean.sh | 30 ++++++++++++++++++++++++++++++ docker-compose.yml | 8 +++++--- prometheus/alert.rules.yml | 16 ++++++++-------- prometheus/prometheus.yml | 4 ++++ tempo/tempo-config.yaml | 15 ++++++--------- 5 files changed, 53 insertions(+), 20 deletions(-) create mode 100755 clean.sh diff --git a/clean.sh b/clean.sh new file mode 100755 index 0000000..c2ea6a3 --- /dev/null +++ b/clean.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# Fix script for Tempo port conflict +echo "=== Fixing Tempo port 4317 conflict ===" + +# 1. Stop with force and longer grace period +docker-compose stop -t 30 tempo + +# 2. Kill any remaining tempo processes in containers +for container in $(docker ps -aq --filter "name=tempo"); do + echo "Checking container $container..." + docker exec $container pkill -9 -f "tempo|grpc" 2>/dev/null || true +done + +# 3. Force remove +docker-compose rm -f tempo + +# 4. Clean Docker network +docker network prune -f + +# 5. Remove tempo volume (optional - will lose trace data) +# docker volume rm $(docker volume ls -q | grep tempo) 2>/dev/null || true + +# 6. Start with longer healthcheck timeout +echo "Starting Tempo with extended healthcheck..." +docker-compose up -d tempo + +# 7. Wait and check logs +sleep 5 +echo "=== Checking Tempo logs ===" +docker-compose logs --tail=50 tempo diff --git a/docker-compose.yml b/docker-compose.yml index e450efb..86d60fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -109,11 +109,13 @@ services: # Tempo - Traces aggregation # ----------------------------- tempo: - image: grafana/tempo:2.6.0 + image: grafana/tempo:2.5.0 container_name: tempo ports: - - "3200:3200" # HTTP API - - "4317:4317" # OTLP gRPC + - "3200:3200" # HTTP API/Query + - "4320:4320" # Internal gRPC (server port) + - "4318:4318" # OTLP gRPC receiver (for receiving traces) + - "4319:4319" # OTLP HTTP receiver user: "10001:10001" volumes: - ./tempo/tempo-config.yaml:/etc/tempo/tempo-config.yaml:ro diff --git a/prometheus/alert.rules.yml b/prometheus/alert.rules.yml index e72767e..1bed6c6 100644 --- a/prometheus/alert.rules.yml +++ b/prometheus/alert.rules.yml @@ -42,11 +42,11 @@ groups: description: "{{ $labels.instance }} has been unreachable for 1 minute." # test alert always fires - - alert: TestAlert - expr: vector(1) # always true, will fire immediately - for: 10s - labels: - severity: critical - annotations: - summary: "This is a test alert" - description: "Verifying Alertmanager -> IRC relay pipeline" + #- alert: TestAlert + # expr: vector(1) # always true, will fire immediately + # for: 10s + # labels: + # severity: critical + # annotations: + # summary: "This is a test alert" + # description: "Verifying Alertmanager -> IRC relay pipeline" diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 398ef60..c255f2e 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -23,3 +23,7 @@ scrape_configs: - job_name: "prod-node" static_configs: - targets: ["149.28.239.165:9100"] + + - job_name: "testforums" + static_configs: + - targets: ["144.202.63.236:9100"] diff --git a/tempo/tempo-config.yaml b/tempo/tempo-config.yaml index 4926baa..e216d4d 100644 --- a/tempo/tempo-config.yaml +++ b/tempo/tempo-config.yaml @@ -1,15 +1,16 @@ -# Single-node dev setup - server: http_listen_port: 3200 - grpc_listen_port: 4317 + grpc_listen_port: 4320 + log_level: info distributor: receivers: otlp: protocols: - grpc: {} - http: {} + grpc: + endpoint: "0.0.0.0:4318" # Different port from server + http: + endpoint: "0.0.0.0:4319" ingester: lifecycler: @@ -24,7 +25,3 @@ storage: backend: local local: path: /tempo-data/traces - -querier: {} - -compactor: {}