✨ Update Prometheus configuration and enhance monitoring capabilities. Refactor docker-compose.dev.yml to dynamically generate target configurations for the CAATSM receiver. Modify Makefile and Taskfile to allow setting the monitoring address via environment variables. Update observability settings in config.dev.toml and Prometheus scrape configurations to improve integration with the monitoring stack. Enhance CLI options for monitoring address and disable monitoring features as needed.

configs/config.dev.toml

@@ -77,7 +77,7 @@ close = "10s"
 ack_wait = "5s"
 
 [postgres]
-url = "postgres://user:password@localhost:5432/aviation?sslmode=disable"
+url = "postgres://caatsm:caatsm@localhost:5432/aviation?sslmode=disable"
 max_conns = 10
 min_conns = 2
 

configs/otel-collector.dev.yaml

@@ -9,12 +9,12 @@ receivers:
 exporters:
   logging:
     loglevel: info
-  otlp/jaeger:
-    endpoint: jaeger:4317
+  otlphttp/jaeger:
+    endpoint: http://jaeger:4318
     tls:
       insecure: true
   prometheus:
-    endpoint: "0.0.0.0:8888"
+    endpoint: "0.0.0.0:8889"
     const_labels:
       source: "otel-collector"
 
@@ -22,7 +22,7 @@ service:
   pipelines:
     traces:
       receivers: [otlp]
-      exporters: [logging, otlp/jaeger]
+      exporters: [logging, otlphttp/jaeger]
     metrics:
       receivers: [otlp]
       exporters: [logging, prometheus]

configs/prometheus.dev.yml

@@ -6,14 +6,19 @@ scrape_configs:
   - job_name: "otel-collector"
     static_configs:
       - targets:
-          - "otel-collector:8888"
+          - "otel-collector:8889"
   - job_name: "nats-exporter"
     static_configs:
       - targets:
           - "nats-exporter:7777"
 
   - job_name: "caatsm-receiver"
-    static_configs:
-      - targets:
-        - 172.23.189.12:2112
+    file_sd_configs:
+      # CAATSM_MONITORING_ADDR is set via environment variable in docker-compose
+      # Default: host.docker.internal:2112 (for Docker Desktop on Mac/Windows)
+      # Can be overridden: e.g., 10.16.66.236:2112 or 172.17.0.1:2112
+      # Target file is dynamically generated in docker-compose entrypoint
+      - files:
+          - "/etc/prometheus/targets/caatsm-receiver.json"
+        refresh_interval: 5s
 

configs/prometheus/targets/caatsm-receiver.json

@@ -0,0 +1 @@
+[{"labels":{"job":"caatsm-receiver","instance":"10.16.66.236:2112"},"targets":["10.16.66.236:2112"]}]