From a4233dae0eb70afe8c0c618298a1b7fc2d6dbdd2 Mon Sep 17 00:00:00 2001
From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.>
Date: Wed, 11 Jun 2025 10:10:45 +0000
Subject: [PATCH 1/4] Add docker registry caching

---
 .github/workflows/observability-docker.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml
index bc32193..1f6a695 100644
--- a/.github/workflows/observability-docker.yml
+++ b/.github/workflows/observability-docker.yml
@@ -66,7 +66,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
+          cache-from: type=registry,ref=${{ matrix. image}}:buildcache
+          cache-to: type=registry,ref=${{ matrix. image}}:buildcache,mode=max
 
 
 

From 66c62b336c335689a9aa13aff4a3314517dc4bf2 Mon Sep 17 00:00:00 2001
From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.>
Date: Wed, 11 Jun 2025 10:11:04 +0000
Subject: [PATCH 2/4] Add docker registry caching

---
 .github/workflows/observability-docker.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml
index 1f6a695..baff157 100644
--- a/.github/workflows/observability-docker.yml
+++ b/.github/workflows/observability-docker.yml
@@ -66,8 +66,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ matrix. image}}:buildcache
-          cache-to: type=registry,ref=${{ matrix. image}}:buildcache,mode=max
+          cache-from: type=registry,ref=${{ matrix.image}}:buildcache
+          cache-to: type=registry,ref=${{ matrix.image}}:buildcache,mode=max
 
 
 

From 16e5f5b68a1e4a57c688898d990ba39d8a48ec48 Mon Sep 17 00:00:00 2001
From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.>
Date: Wed, 11 Jun 2025 10:13:20 +0000
Subject: [PATCH 3/4] Add docker registry caching - add buildx

---
 .github/workflows/observability-docker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml
index baff157..b085023 100644
--- a/.github/workflows/observability-docker.yml
+++ b/.github/workflows/observability-docker.yml
@@ -43,6 +43,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5

From 7e6d1d184e3f4797ff94f06f46354880acbaf2ec Mon Sep 17 00:00:00 2001
From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.>
Date: Wed, 11 Jun 2025 13:22:09 +0000
Subject: [PATCH 4/4] Cleanup observability test

---
 .github/workflows/observability-docker.yml | 3 +--
 observability/build-docker.sh              | 2 +-
 observability/test/health-check.py         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/observability-docker.yml b/.github/workflows/observability-docker.yml
index b085023..573a4ab 100644
--- a/.github/workflows/observability-docker.yml
+++ b/.github/workflows/observability-docker.yml
@@ -72,8 +72,6 @@ jobs:
           cache-from: type=registry,ref=${{ matrix.image}}:buildcache
           cache-to: type=registry,ref=${{ matrix.image}}:buildcache,mode=max
 
-
-
   test-observability-quickstart-scripts:
     runs-on: ubuntu-latest
     name: Test observability Quickstart scripts
@@ -86,6 +84,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: '3.9'
+        cache: pip
         
     - name: Install Python dependencies
       run: pip install -r observability/test/requirements.txt
diff --git a/observability/build-docker.sh b/observability/build-docker.sh
index a8db297..2003050 100644
--- a/observability/build-docker.sh
+++ b/observability/build-docker.sh
@@ -7,4 +7,4 @@ docker build -t cogstacksystems/cogstack-observability-grafana:latest -f grafana
 
 docker build -t cogstacksystems/cogstack-observability-traefik:latest -f traefik/Dockerfile ./traefik
 
-docker build -t cogstacksystems/cogstack-observability-alloy:latest -f grafana-alloy/Dockerfile ./grafana-alloy --debug
\ No newline at end of file
+docker build -t cogstacksystems/cogstack-observability-alloy:latest -f grafana-alloy/Dockerfile ./grafana-alloy
\ No newline at end of file
diff --git a/observability/test/health-check.py b/observability/test/health-check.py
index 7fbc896..d071e8f 100644
--- a/observability/test/health-check.py
+++ b/observability/test/health-check.py
@@ -37,7 +37,7 @@ def main():
     services = [
         (f"http://{localhost_url}/grafana", "Grafana"),
         (f"http://{localhost_url}/prometheus", "Prometheus"),
-      #  (f"http://{localhost_url}/alloy", "Alloy"),
+        (f"http://{localhost_url}/alloy", "Alloy"),
     ]
     
     all_healthy = True