Merge pull request #140 from trails-cool/fix/deploy-annotations-curl-dashboards

Fix deploy annotations: wget→curl + dashboard queries

.github/workflows/cd-apps.yml

@@ -114,9 +114,9 @@ jobs:
             # Annotate deploy in Grafana
             GRAFANA_TOKEN=$(grep GRAFANA_SERVICE_TOKEN .env | cut -d= -f2- 2>/dev/null)
             if [ -n "$GRAFANA_TOKEN" ]; then
-              docker compose exec -T grafana wget -q -O /dev/null \
-                --header="Authorization: Bearer $GRAFANA_TOKEN" \
-                --header="Content-Type: application/json" \
-                --post-data='{"text":"Deploy '${{ github.sha }}'","tags":["deploy","apps"]}' \
+              docker compose exec -T grafana curl -sf -X POST \
+                -H "Authorization: Bearer $GRAFANA_TOKEN" \
+                -H "Content-Type: application/json" \
+                -d '{"text":"Deploy ${{ github.sha }}","tags":["deploy","apps"]}' \
                 http://localhost:3000/api/annotations || true
             fi

.github/workflows/cd-brouter.yml

@@ -68,9 +68,9 @@ jobs:
             # Annotate deploy in Grafana
             GRAFANA_TOKEN=$(grep GRAFANA_SERVICE_TOKEN .env | cut -d= -f2- 2>/dev/null)
             if [ -n "$GRAFANA_TOKEN" ]; then
-              docker compose exec -T grafana wget -q -O /dev/null \
-                --header="Authorization: Bearer $GRAFANA_TOKEN" \
-                --header="Content-Type: application/json" \
-                --post-data='{"text":"Deploy brouter ${{ github.sha }}","tags":["deploy","brouter"]}' \
+              docker compose exec -T grafana curl -sf -X POST \
+                -H "Authorization: Bearer $GRAFANA_TOKEN" \
+                -H "Content-Type: application/json" \
+                -d '{"text":"Deploy brouter ${{ github.sha }}","tags":["deploy","brouter"]}' \
                 http://localhost:3000/api/annotations || true
             fi

.github/workflows/cd-infra.yml

@@ -89,9 +89,9 @@ jobs:
             # Annotate deploy in Grafana
             GRAFANA_TOKEN=$(grep GRAFANA_SERVICE_TOKEN .env | cut -d= -f2-)
             if [ -n "$GRAFANA_TOKEN" ]; then
-              docker compose exec -T grafana wget -q -O /dev/null \
-                --header="Authorization: Bearer $GRAFANA_TOKEN" \
-                --header="Content-Type: application/json" \
-                --post-data='{"text":"Deploy infra ${{ github.sha }}","tags":["deploy","infra"]}' \
+              docker compose exec -T grafana curl -sf -X POST \
+                -H "Authorization: Bearer $GRAFANA_TOKEN" \
+                -H "Content-Type: application/json" \
+                -d '{"text":"Deploy infra ${{ github.sha }}","tags":["deploy","infra"]}' \
                 http://localhost:3000/api/annotations || true
             fi

infrastructure/grafana/dashboards/business.json

@@ -1,6 +1,17 @@
 {
   "title": "Business Metrics",
   "uid": "trails-business",
+  "annotations": {
+    "list": [
+      {
+        "name": "Deploys",
+        "enable": true,
+        "datasource": { "type": "grafana", "uid": "-- Grafana --" },
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "tags": ["deploy"]
+      }
+    ]
+  },
   "timezone": "browser",
   "refresh": "5m",
   "panels": [

infrastructure/grafana/dashboards/infrastructure.json

@@ -2,6 +2,17 @@
   "dashboard": {
     "title": "Infrastructure",
     "uid": "trails-infra",
+    "annotations": {
+      "list": [
+        {
+          "name": "Deploys",
+          "enable": true,
+          "datasource": { "type": "grafana", "uid": "-- Grafana --" },
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "tags": ["deploy"]
+        }
+      ]
+    },
     "timezone": "browser",
     "refresh": "30s",
     "panels": [

infrastructure/grafana/dashboards/overview.json

@@ -2,6 +2,17 @@
   "dashboard": {
     "title": "trails.cool Overview",
     "uid": "trails-overview",
+    "annotations": {
+      "list": [
+        {
+          "name": "Deploys",
+          "enable": true,
+          "datasource": { "type": "grafana", "uid": "-- Grafana --" },
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "tags": ["deploy"]
+        }
+      ]
+    },
     "timezone": "browser",
     "refresh": "30s",
     "panels": [

infrastructure/grafana/dashboards/planner.json

@@ -2,6 +2,17 @@
   "dashboard": {
     "title": "Planner",
     "uid": "trails-planner",
+    "annotations": {
+      "list": [
+        {
+          "name": "Deploys",
+          "enable": true,
+          "datasource": { "type": "grafana", "uid": "-- Grafana --" },
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "tags": ["deploy"]
+        }
+      ]
+    },
     "timezone": "browser",
     "refresh": "30s",
     "panels": [

infrastructure/grafana/dashboards/service-health.json

@@ -2,6 +2,17 @@
   "dashboard": {
     "title": "Service Health",
     "uid": "trails-service-health",
+    "annotations": {
+      "list": [
+        {
+          "name": "Deploys",
+          "enable": true,
+          "datasource": { "type": "grafana", "uid": "-- Grafana --" },
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "tags": ["deploy"]
+        }
+      ]
+    },
     "timezone": "browser",
     "refresh": "30s",
     "panels": [