Merge pull request #11 from agenixframework/feature/refactor-prometheus-config-structure

Refactor Prometheus config structure and update GitHub workflow for a…

Author: asuruceanu

.github/workflows/publish-nuget-and-containers.yml

@@ -324,6 +324,22 @@ jobs:
           echo "Resolved compose generated at ./artifacts/compose/docker-compose-${{ needs.build.outputs.version }}.yml (and copied as docker-compose.yml)"
           head -n 50 ./artifacts/compose/docker-compose-${{ needs.build.outputs.version }}.yml || true
 
+          echo "Including configuration directories (prometheus, provisioning)"
+          if [ -d "./prometheus" ]; then
+            cp -R ./prometheus ./artifacts/compose/prometheus
+          fi
+          if [ -f "./prometheus.yml" ]; then
+            # Legacy fallback if a single-file layout is used somewhere
+            cp ./prometheus.yml ./artifacts/compose/prometheus.yml
+          fi
+          if [ -d "./provisioning" ]; then
+            cp -R ./provisioning ./artifacts/compose/provisioning
+          fi
+
+          echo "Copying source compose files for reference"
+          cp docker-compose.yml ./artifacts/compose/_source-docker-compose.yml
+          cp docker-compose.images.yml ./artifacts/compose/_source-docker-compose.images.yml
+
       - name: Upload docker-compose artifact
         uses: actions/upload-artifact@v4
         with:

README.md

@@ -131,7 +131,7 @@ HTTP API summary
 Metrics and observability
 
 - Hub and Workers expose Prometheus metrics at `http://<host-port>/metrics` (compose maps hub 5100, workers 5200+).
-- Prometheus is preconfigured to scrape hub and workers (see prometheus.yml).
+- Prometheus is preconfigured to scrape hub and workers (see prometheus/prometheus.yml).
 - Grafana is provisioned; open http://127.0.0.1:3000 and explore dashboards.
 
 Testing (GridTests)

docker-compose.yml

@@ -20,7 +20,7 @@ services:
     ports:
       - "9090:9090"
     volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+      - ./prometheus:/etc/prometheus:ro
     restart: unless-stopped
 
   grafana:

prometheus.yml

@@ -14,3 +14,7 @@ scrape_configs:
   - job_name: 'worker2'
     static_configs:
       - targets: ['worker2:5000']
+
+  - job_name: 'worker3'
+    static_configs:
+      - targets: ['worker3:5000']

prometheus/prometheus.yml

@@ -0,0 +1,19 @@
+global:
+  scrape_interval: 5s
+
+scrape_configs:
+  - job_name: 'hub'
+    static_configs:
+      - targets: ['hub:5000']
+
+  - job_name: 'worker1'
+    static_configs:
+      - targets: ['worker1:5000']
+
+  - job_name: 'worker2'
+    static_configs:
+      - targets: ['worker2:5000']
+
+  - job_name: 'worker3'
+    static_configs:
+      - targets: ['worker3:5000']