start prometheus service first

grafana · Mar 8, 2024 · 27b4f8a · 27b4f8a
1 parent ccce54e
commit 27b4f8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -47,17 +47,17 @@ jobs:
         run: |
           docker compose -f docker-compose-debug.yaml pull
           docker compose -f docker-compose-debug.yaml up -d
-      - name: Wait for grafana to start
+      - name: Wait for prometheus to start
         uses: nev7n/wait_for_response@v1
         with:
-          url: 'http://localhost:3099/'
+          url: 'http://localhost:9090/-/ready'
           responseCode: 200
           timeout: 20000
           interval: 500
-      - name: Wait for prometheus to start
+      - name: Wait for grafana to start
         uses: nev7n/wait_for_response@v1
         with:
-          url: 'http://localhost:9090/-/ready'
+          url: 'http://localhost:3099/'
           responseCode: 200
           timeout: 20000
           interval: 500
@@ -66,7 +66,7 @@ jobs:
         with:
           url: 'http://localhost:3099/api/datasources/uid/prometheus-amazon/health'
           responseCode: 200
-          timeout: 100000
+          timeout: 20000
           interval: 500
       - name: Install Playwright Browsers
         run: yarn playwright install --with-deps

diff --git a/docker-compose-debug.yaml b/docker-compose-debug.yaml
@@ -26,5 +26,8 @@ services:
     volumes:
       - ./provisioning/datasources:/etc/grafana/provisioning/datasources
       - ./dist:/var/lib/grafana/plugins/prometheus-amazon
+    depends_on:
+      prometheus:
+        condition: service_started
 volumes:
   prom_data: