From dd5afbd44c00ab6ec3fda16444c093ff2780e049 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 15:40:46 +0100
Subject: [PATCH 01/17] fix merge conflicts

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-alertmanager.yaml        | 1 -
 .github/workflows/merge-acm-flow.yaml                | 4 ++--
 .github/workflows/merge-acm-grafana.yaml             | 1 -
 .github/workflows/merge-acm-kube-state-metrics.yaml  | 1 -
 .github/workflows/merge-acm-memcached-exporter.yaml  | 1 -
 .github/workflows/merge-acm-node-exporter.yaml       | 1 -
 .github/workflows/merge-acm-prometheus-operator.yaml | 1 -
 .github/workflows/merge-acm-prometheus.yaml          | 1 -
 .github/workflows/merge-acm-thanos.yaml              | 1 -
 9 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/merge-acm-alertmanager.yaml b/.github/workflows/merge-acm-alertmanager.yaml
index d95ae14..ca7b38c 100644
--- a/.github/workflows/merge-acm-alertmanager.yaml
+++ b/.github/workflows/merge-acm-alertmanager.yaml
@@ -20,7 +20,6 @@ jobs:
       upstream: prometheus/alertmanager
       downstream: stolostron/prometheus-alertmanager
       sandbox: rhobs/acm-prometheus-alertmanager
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
         VERSION
diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
index fcb5058..73574aa 100644
--- a/.github/workflows/merge-acm-flow.yaml
+++ b/.github/workflows/merge-acm-flow.yaml
@@ -166,7 +166,7 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-            git status --porcelain | awk '{ if ($1=="DU") print $2 }' | xargs -I {} git rm {}
+          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="UU" || $1=="U") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: git merge --continue
@@ -191,7 +191,7 @@ jobs:
           git diff --cached --exit-code || git commit -s -m "[bot] add VERSION file with ${version_from_tag}"
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ inputs.go-version }}
+          go-version-file: go.mod
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ inputs.node-version }}
diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml
index c502cb1..6a583db 100644
--- a/.github/workflows/merge-acm-grafana.yaml
+++ b/.github/workflows/merge-acm-grafana.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: grafana/grafana
       downstream: stolostron/grafana
       sandbox: rhobs/acm-grafana
-      go-version: "1.25"
       node-version: "22"
       go-mod-tidy: false
       restore-downstream: >-
diff --git a/.github/workflows/merge-acm-kube-state-metrics.yaml b/.github/workflows/merge-acm-kube-state-metrics.yaml
index 0d380c5..fa31ccc 100644
--- a/.github/workflows/merge-acm-kube-state-metrics.yaml
+++ b/.github/workflows/merge-acm-kube-state-metrics.yaml
@@ -20,7 +20,6 @@ jobs:
       upstream: kubernetes/kube-state-metrics
       downstream: stolostron/kube-state-metrics
       sandbox: rhobs/acm-kube-state-metrics
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
       restore-downstream: >-
diff --git a/.github/workflows/merge-acm-memcached-exporter.yaml b/.github/workflows/merge-acm-memcached-exporter.yaml
index 34549f3..964c7b6 100644
--- a/.github/workflows/merge-acm-memcached-exporter.yaml
+++ b/.github/workflows/merge-acm-memcached-exporter.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/memcached_exporter
       downstream: stolostron/memcached_exporter
       sandbox: rhobs/acm-memcached_exporter
-      go-version: "1.25"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-
diff --git a/.github/workflows/merge-acm-node-exporter.yaml b/.github/workflows/merge-acm-node-exporter.yaml
index bbaf041..b66accc 100644
--- a/.github/workflows/merge-acm-node-exporter.yaml
+++ b/.github/workflows/merge-acm-node-exporter.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/node_exporter
       downstream: stolostron/node-exporter
       sandbox: rhobs/acm-node-exporter
-      go-version: "1.25"
       restore-downstream: >-
          OWNERS
       restore-upstream: >-
diff --git a/.github/workflows/merge-acm-prometheus-operator.yaml b/.github/workflows/merge-acm-prometheus-operator.yaml
index d5ea718..a1256eb 100644
--- a/.github/workflows/merge-acm-prometheus-operator.yaml
+++ b/.github/workflows/merge-acm-prometheus-operator.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus-operator/prometheus-operator
       downstream: stolostron/prometheus-operator
       sandbox: rhobs/acm-prometheus-operator
-      go-version: "1.25"
       restore-upstream: >-
         CHANGELOG.md
         Documentation
diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 30d5281..60a3b64 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: prometheus/prometheus
       downstream: stolostron/prometheus
       sandbox: rhobs/acm-prometheus
-      go-version: "1.25"
       restore-downstream: >-
         plugins.yml
         plugins
diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml
index d7c2f85..7ef4ce1 100644
--- a/.github/workflows/merge-acm-thanos.yaml
+++ b/.github/workflows/merge-acm-thanos.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: thanos-io/thanos
       downstream: stolostron/thanos
       sandbox: rhobs/acm-thanos
-      go-version: "1.25"
       restore-downstream: >-
         OWNERS
       restore-upstream: >-

From dafeaedd7a31f52c292a3e047948b5f2bf518858 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 15:43:23 +0100
Subject: [PATCH 02/17] remove go version

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-flow.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
index 73574aa..f6e74f5 100644
--- a/.github/workflows/merge-acm-flow.yaml
+++ b/.github/workflows/merge-acm-flow.yaml
@@ -7,10 +7,6 @@ on:
         default: '22'
         required: false
         type: string
-      go-version:
-        description: go version
-        required: true
-        type: string
       upstream:
         description: Upstream repo path in owner/repo format
         required: true

From 555c081d4417f342dd6bb2aa2d6af2504434035d Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 15:49:36 +0100
Subject: [PATCH 03/17] change default branch name for assets

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-alertmanager.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/merge-acm-alertmanager.yaml b/.github/workflows/merge-acm-alertmanager.yaml
index ca7b38c..a558bf0 100644
--- a/.github/workflows/merge-acm-alertmanager.yaml
+++ b/.github/workflows/merge-acm-alertmanager.yaml
@@ -29,7 +29,7 @@ jobs:
         # Only compress assets if assets actually changed
         # The git diff relies on gits remote naming. The merge-flow checks out
         # $downstream as origin at the time of writing this code.
-        if ! git diff --exit-code origin/master ui/react-app; then
+        if ! git diff --exit-code origin/main ui/react-app; then
           make assets-compress
           find ui/react-app -type f -name '*.gz' -exec git add {} \;
           git add ui/react-app/embed.go

From 0b609772c0d961624752c2cb6cb16163334d429c Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 16:08:01 +0100
Subject: [PATCH 04/17] remove assets compress for alertmanager

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-alertmanager.yaml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.github/workflows/merge-acm-alertmanager.yaml b/.github/workflows/merge-acm-alertmanager.yaml
index a558bf0..e3f427f 100644
--- a/.github/workflows/merge-acm-alertmanager.yaml
+++ b/.github/workflows/merge-acm-alertmanager.yaml
@@ -25,16 +25,6 @@ jobs:
         VERSION
         go.mod
         go.sum
-      assets-cmd: |
-        # Only compress assets if assets actually changed
-        # The git diff relies on gits remote naming. The merge-flow checks out
-        # $downstream as origin at the time of writing this code.
-        if ! git diff --exit-code origin/main ui/react-app; then
-          make assets-compress
-          find ui/react-app -type f -name '*.gz' -exec git add {} \;
-          git add ui/react-app/embed.go
-          git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
-        fi
 
     secrets:
       pr-app-id: ${{ secrets.ACM_APP_ID }}

From 44c4b47dce4887fd2e17721ecd8a82a8f2213c0d Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 16:41:04 +0100
Subject: [PATCH 05/17] dont do go mod tidy for thanos

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-thanos.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml
index 7ef4ce1..ae5cccb 100644
--- a/.github/workflows/merge-acm-thanos.yaml
+++ b/.github/workflows/merge-acm-thanos.yaml
@@ -19,6 +19,7 @@ jobs:
       upstream: thanos-io/thanos
       downstream: stolostron/thanos
       sandbox: rhobs/acm-thanos
+      go-mod-tidy: false
       restore-downstream: >-
         OWNERS
       restore-upstream: >-

From 2ddd09192f2cb663095185aa42f84edbf6a1a68e Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 16:43:41 +0100
Subject: [PATCH 06/17] dont do go mod tidy for prometheus

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-prometheus.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 60a3b64..678ef29 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -19,6 +19,7 @@ jobs:
       upstream: prometheus/prometheus
       downstream: stolostron/prometheus
       sandbox: rhobs/acm-prometheus
+      go-mod-tidy: false
       restore-downstream: >-
         plugins.yml
         plugins

From 66e197d03623ac7ddfd1cb17925b6a42625c3f69 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Wed, 4 Mar 2026 17:00:35 +0100
Subject: [PATCH 07/17] merge conflicts

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-flow.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
index f6e74f5..543a190 100644
--- a/.github/workflows/merge-acm-flow.yaml
+++ b/.github/workflows/merge-acm-flow.yaml
@@ -165,7 +165,9 @@ jobs:
           git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="UU" || $1=="U") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
-        run: git merge --continue
+        run: |
+          git add -A
+          git merge --continue
       - name: Add or update VERSION file
         run: |
           # All tags use the vX.Y.Z format currently.

From ffb05cb2a660e98cb6bb60e51b9e70fa36d70d39 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 10:51:31 +0100
Subject: [PATCH 08/17] fix assets build for prometheus and grafana

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-flow.yaml    | 2 +-
 .github/workflows/merge-acm-grafana.yaml | 4 ++--
 .github/workflows/merge-prometheus.yaml  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
index 543a190..04a040e 100644
--- a/.github/workflows/merge-acm-flow.yaml
+++ b/.github/workflows/merge-acm-flow.yaml
@@ -162,7 +162,7 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="UU" || $1=="U") print $2 }' | xargs -I {} git rm {}
+          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="U") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml
index 6a583db..e580a85 100644
--- a/.github/workflows/merge-acm-grafana.yaml
+++ b/.github/workflows/merge-acm-grafana.yaml
@@ -57,10 +57,10 @@ jobs:
         go run ./pkg/build/wire/cmd/wire/main.go gen -tags oss ./pkg/server
 
         # Commit assets
-        git add pkg/server/wire_gen.go ./public/build ./public/app/plugins/datasource/*/dist/*
+        git add pkg/server/wire_gen.go ./public/build ./public/app/plugins/
         git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
       downstream-version-expression: |
-        sed -n -E 's/^.*\"version\": *\"([0-9]+\.[0-9]+\.[0-9]+)\".*$/v\1/p' https://raw.githubusercontent.com/stolostron/grafana/release-2.12/package.json
+        sed -n -E 's/^.*\"version\": *\"([0-9]+\.[0-9]+\.[0-9]+)\".*$/v\1/p' https://raw.githubusercontent.com/stolostron/grafana/release-2.17/package.json
     secrets:
       pr-app-id: ${{ secrets.ACM_APP_ID }}
       pr-app-private-key: ${{ secrets.ACM_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/merge-prometheus.yaml b/.github/workflows/merge-prometheus.yaml
index a45a3f3..e6af09d 100644
--- a/.github/workflows/merge-prometheus.yaml
+++ b/.github/workflows/merge-prometheus.yaml
@@ -35,7 +35,7 @@ jobs:
         if ! git diff --exit-code origin/main web/ui; then
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
-          git add web/ui/embed.go
+          git add web/ui/
           git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
         fi
 

From 7d795dd378c1f337a79c1f3b01cd70254edcf74a Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 10:56:43 +0100
Subject: [PATCH 09/17] add correct prometheus file

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-prometheus.yaml | 2 +-
 .github/workflows/merge-prometheus.yaml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 678ef29..69b347b 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -36,7 +36,7 @@ jobs:
         if ! git diff --exit-code origin/main web/ui; then
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
-          git add web/ui/embed.go
+          git add web/ui/
           git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
         fi
 
diff --git a/.github/workflows/merge-prometheus.yaml b/.github/workflows/merge-prometheus.yaml
index e6af09d..a45a3f3 100644
--- a/.github/workflows/merge-prometheus.yaml
+++ b/.github/workflows/merge-prometheus.yaml
@@ -35,7 +35,7 @@ jobs:
         if ! git diff --exit-code origin/main web/ui; then
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
-          git add web/ui/
+          git add web/ui/embed.go
           git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
         fi
 

From 584eda1e3de3a62b56633101896835f07468fae4 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 11:07:14 +0100
Subject: [PATCH 10/17] add correct prometheus file

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-grafana.yaml    | 2 +-
 .github/workflows/merge-acm-prometheus.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml
index e580a85..2ad8827 100644
--- a/.github/workflows/merge-acm-grafana.yaml
+++ b/.github/workflows/merge-acm-grafana.yaml
@@ -57,7 +57,7 @@ jobs:
         go run ./pkg/build/wire/cmd/wire/main.go gen -tags oss ./pkg/server
 
         # Commit assets
-        git add pkg/server/wire_gen.go ./public/build ./public/app/plugins/
+        git add pkg/server/wire_gen.go ./public/build ./public/app/plugins
         git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
       downstream-version-expression: |
         sed -n -E 's/^.*\"version\": *\"([0-9]+\.[0-9]+\.[0-9]+)\".*$/v\1/p' https://raw.githubusercontent.com/stolostron/grafana/release-2.17/package.json
diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 69b347b..988035e 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -36,7 +36,7 @@ jobs:
         if ! git diff --exit-code origin/main web/ui; then
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
-          git add web/ui/
+          git add web/ui
           git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
         fi
 

From cfbf83866f5f43367e16954a8cc99f482b5a29fd Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 11:20:56 +0100
Subject: [PATCH 11/17] add correct prometheus file

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-prometheus.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 988035e..f7c3938 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -34,6 +34,7 @@ jobs:
         # The git diff relies on gits remote naming. The merge-flow checks out
         # $downstream as origin at the time of writing this code.
         if ! git diff --exit-code origin/main web/ui; then
+          rm -rf web/ui/static
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
           git add web/ui

From a3c3352ce5a0e5af0123579e841ff7c26889df29 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 11:32:31 +0100
Subject: [PATCH 12/17] make git diff output less noisy

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-grafana.yaml    | 2 +-
 .github/workflows/merge-acm-prometheus.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml
index 2ad8827..d80cf92 100644
--- a/.github/workflows/merge-acm-grafana.yaml
+++ b/.github/workflows/merge-acm-grafana.yaml
@@ -58,7 +58,7 @@ jobs:
 
         # Commit assets
         git add pkg/server/wire_gen.go ./public/build ./public/app/plugins
-        git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
+        git diff --cached --exit-code --name-only || git commit -s -m "[bot] assets: generate"
       downstream-version-expression: |
         sed -n -E 's/^.*\"version\": *\"([0-9]+\.[0-9]+\.[0-9]+)\".*$/v\1/p' https://raw.githubusercontent.com/stolostron/grafana/release-2.17/package.json
     secrets:
diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index f7c3938..3fc1e29 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -33,12 +33,12 @@ jobs:
         # Only compress assets if assets actually changed
         # The git diff relies on gits remote naming. The merge-flow checks out
         # $downstream as origin at the time of writing this code.
-        if ! git diff --exit-code origin/main web/ui; then
+        if ! git diff --exit-code --name-only  origin/main web/ui; then
           rm -rf web/ui/static
           make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
           git add web/ui
-          git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"
+          git diff --cached --exit-code --name-only || git commit -s -m "[bot] assets: generate"
         fi
 
     secrets:

From 2f6cfd9995e71eef4b455da7a29a7962f319ebf8 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 11:36:15 +0100
Subject: [PATCH 13/17] make git diff output less noisy

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-prometheus.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 3fc1e29..0937faa 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -25,6 +25,7 @@ jobs:
         plugins
       restore-upstream: >-
         CHANGELOG.md
+        Makefile
         VERSION
         go.mod
         go.sum

From fca738183bac3f170eb336d437e873b81c917501 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 13:48:49 +0100
Subject: [PATCH 14/17] make workflow logs less noisy

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/acm-konflux-update-pr.yaml  | 85 -------------------
 .github/workflows/merge-acm-alertmanager.yaml |  2 +-
 .github/workflows/merge-acm-flow.yaml         | 11 +--
 .github/workflows/merge-acm-grafana.yaml      |  2 +-
 .../merge-acm-kube-state-metrics.yaml         |  2 +-
 .../merge-acm-memcached-exporter.yaml         |  2 +-
 .../workflows/merge-acm-node-exporter.yaml    |  2 +-
 .../merge-acm-prometheus-operator.yaml        |  2 +-
 .github/workflows/merge-acm-prometheus.yaml   |  5 +-
 .github/workflows/merge-acm-thanos.yaml       |  2 +-
 10 files changed, 14 insertions(+), 101 deletions(-)
 delete mode 100644 .github/workflows/acm-konflux-update-pr.yaml

diff --git a/.github/workflows/acm-konflux-update-pr.yaml b/.github/workflows/acm-konflux-update-pr.yaml
deleted file mode 100644
index 3892bac..0000000
--- a/.github/workflows/acm-konflux-update-pr.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: Check Konflux PRs in Downstream Repos
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 */14 * *' # every 14 days (biweekly)
-  pull_request:
-    paths:
-      - '.github/workflows/acm-konflux-update-pr.yaml'
-  push:
-    paths:
-      - '.github/workflows/acm-konflux-update-pr.yaml'
-
-jobs:
-  check-konflux-prs:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        repo:
-          - stolostron/thanos
-          - stolostron/node-exporter
-          - stolostron/kube-state-metrics
-          - stolostron/prometheus
-          - stolostron/prometheus-alertmanager
-          - stolostron/prometheus-operator
-          - stolostron/grafana
-          - stolostron/kube-rbac-proxy
-          - stolostron/multicluster-observability-operator
-          - stolostron/observatorium
-          - stolostron/observatorium-operator
-          - stolostron/thanos-receive-controller
-          - stolostron/kube-thanos
-
-    steps:
-      - name: Checkout upstream
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ matrix.repo }}
-          fetch-depth: 0
-      - name: Find github org name from repo name
-        id: org
-        run: |
-          echo "downstream=$(dirname ${{ matrix.repo }})" >> $GITHUB_OUTPUT
-      - name: Get auth token to list pull request for ${{ matrix.repo }}
-        if: github.event_name != 'pull_request'
-        id: pr
-        uses: getsentry/action-github-app-token@v3
-        with:
-          app_id: ${{ secrets.ACM_APP_ID }}
-          private_key: ${{ secrets.ACM_APP_PRIVATE_KEY }}
-          scope: ${{ steps.org.outputs.downstream }}
-      - name: List PRs and check for Konflux
-        id: check-prs
-        if: github.event_name != 'pull_request'
-        run: |
-          PR_LIST=$(gh pr list --repo ${{ matrix.repo }} --state open --json title)
-          KONFLUX_PR=$(echo "$PR_LIST" | jq '.[] | select(.title | ascii_downcase | contains("konflux"))')
-          if [ -n "$KONFLUX_PR" ]; then
-            echo "konflux_pr_exists=1" >> $GITHUB_OUTPUT
-          else
-            echo "konflux_pr_exists=0" >> $GITHUB_OUTPUT
-          fi
-        env:
-          GH_TOKEN: ${{ steps.pr.outputs.token }}
-      - name: Compose Slack message
-        id: slack-message
-        run: |
-          if [ "${{ steps.check-prs.outputs.konflux_pr_exists }}" == "1" ]; then
-            echo "message=Unmerged Konflux PRs are present in https://github.com/${{ matrix.repo }}" >> $GITHUB_OUTPUT
-          fi
-      - name: Send Slack notification
-        uses: 8398a7/action-slack@v3
-        if : ${{ steps.check-prs.outputs.konflux_pr_exists == '1' }}
-        with:
-          status: custom
-          fields: workflow
-          custom_payload: |
-            {
-              attachments: [{
-                color: 'danger',
-                text: "${{ steps.slack-message.outputs.message }}",
-              }]
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.ACM_SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/merge-acm-alertmanager.yaml b/.github/workflows/merge-acm-alertmanager.yaml
index e3f427f..51b465e 100644
--- a/.github/workflows/merge-acm-alertmanager.yaml
+++ b/.github/workflows/merge-acm-alertmanager.yaml
@@ -3,7 +3,7 @@ name: ACM Alertmanager merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
       - '.github/workflows/merge-acm-flow.yaml'
diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
index 04a040e..50eebfa 100644
--- a/.github/workflows/merge-acm-flow.yaml
+++ b/.github/workflows/merge-acm-flow.yaml
@@ -133,12 +133,12 @@ jobs:
           repository: ${{ inputs.downstream }}
           fetch-depth: 0
           ref: ${{ inputs.downstream-branch }}
-      - name: Fetch all upstream tags
+      - name: Fetch upstream tag
         run: |
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
           git config --global core.editor "/bin/true"
-          git fetch https://github.com/${{ inputs.upstream }} --tags
+          git fetch https://github.com/${{ inputs.upstream }} tag ${{ steps.upstream.outputs.release }}
       - name: Merge with upstream ${{ steps.upstream.outputs.release }} tag
         id: merge
         run: |
@@ -162,7 +162,7 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" || $1=="U") print $2 }' | xargs -I {} git rm {}
+          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" ||  $1=="U") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
@@ -240,11 +240,6 @@ jobs:
             go mod tidy
             go mod vendor
             ${{ inputs.assets-cmd }}
-            if [ -f scripts/rh-manifest.sh ]; then
-              bash scripts/rh-manifest.sh
-              git add rh-manifest.txt
-              git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
-            fi
             ```
           author: 'github-actions[bot]<github-actions[bot]@users.noreply.github.com>'
           committer: 'github-actions[bot]<github-actions[bot]@users.noreply.github.com>'
diff --git a/.github/workflows/merge-acm-grafana.yaml b/.github/workflows/merge-acm-grafana.yaml
index d80cf92..99f0d79 100644
--- a/.github/workflows/merge-acm-grafana.yaml
+++ b/.github/workflows/merge-acm-grafana.yaml
@@ -3,7 +3,7 @@ name: ACM Grafana merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
diff --git a/.github/workflows/merge-acm-kube-state-metrics.yaml b/.github/workflows/merge-acm-kube-state-metrics.yaml
index fa31ccc..1598cca 100644
--- a/.github/workflows/merge-acm-kube-state-metrics.yaml
+++ b/.github/workflows/merge-acm-kube-state-metrics.yaml
@@ -3,7 +3,7 @@ name: ACM kube-state-metrics merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
diff --git a/.github/workflows/merge-acm-memcached-exporter.yaml b/.github/workflows/merge-acm-memcached-exporter.yaml
index 964c7b6..b10ac2b 100644
--- a/.github/workflows/merge-acm-memcached-exporter.yaml
+++ b/.github/workflows/merge-acm-memcached-exporter.yaml
@@ -3,7 +3,7 @@ name: ACM Memcached exporter merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
diff --git a/.github/workflows/merge-acm-node-exporter.yaml b/.github/workflows/merge-acm-node-exporter.yaml
index b66accc..38f6b6e 100644
--- a/.github/workflows/merge-acm-node-exporter.yaml
+++ b/.github/workflows/merge-acm-node-exporter.yaml
@@ -3,7 +3,7 @@ name: ACM Node exporter merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
diff --git a/.github/workflows/merge-acm-prometheus-operator.yaml b/.github/workflows/merge-acm-prometheus-operator.yaml
index a1256eb..20a117a 100644
--- a/.github/workflows/merge-acm-prometheus-operator.yaml
+++ b/.github/workflows/merge-acm-prometheus-operator.yaml
@@ -3,7 +3,7 @@ name: ACM Prometheus Operator merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 0937faa..36f3b61 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -3,7 +3,7 @@ name: ACM Prometheus merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'
@@ -31,6 +31,9 @@ jobs:
         go.sum
         .golangci.yml
       assets-cmd: |
+        # Force upstream Makefile in case of conflicts
+        git checkout --theirs Makefile || true
+        git add Makefile || true
         # Only compress assets if assets actually changed
         # The git diff relies on gits remote naming. The merge-flow checks out
         # $downstream as origin at the time of writing this code.
diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml
index ae5cccb..ebc5028 100644
--- a/.github/workflows/merge-acm-thanos.yaml
+++ b/.github/workflows/merge-acm-thanos.yaml
@@ -3,7 +3,7 @@ name: ACM Thanos merger
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 * * 1' #@weekly
+    - cron: '0 0 1,15 * *' #@biweekly
   pull_request:
     paths:
     - '.github/workflows/merge-acm-flow.yaml'

From e9217e470c2d9319c06a0333893e060ae854a8c9 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 15:23:22 +0100
Subject: [PATCH 15/17] debug prometheus

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-prometheus.yaml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index 36f3b61..c84b752 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -31,9 +31,16 @@ jobs:
         go.sum
         .golangci.yml
       assets-cmd: |
-        # Force upstream Makefile in case of conflicts
-        git checkout --theirs Makefile || true
-        git add Makefile || true
+        # Debug: Check Makefile state
+        echo "=== Makefile lines 120-130 ==="
+        sed -n '120,130p' Makefile || echo "Failed to read Makefile"
+        echo "=== Test make syntax ==="
+        if ! make -n assets-compress >/dev/null 2>&1; then
+          echo "ERROR: Makefile has syntax errors!"
+          echo "=== Lines with 'else' ==="
+          grep -n 'else' Makefile || echo "No 'else' found"
+        fi
+
         # Only compress assets if assets actually changed
         # The git diff relies on gits remote naming. The merge-flow checks out
         # $downstream as origin at the time of writing this code.

From b4e1d93f9f349b8ae037f406c5fd199e1ea8caff Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 15:31:28 +0100
Subject: [PATCH 16/17] debug prometheus

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-prometheus.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/merge-acm-prometheus.yaml b/.github/workflows/merge-acm-prometheus.yaml
index c84b752..e8d0f5a 100644
--- a/.github/workflows/merge-acm-prometheus.yaml
+++ b/.github/workflows/merge-acm-prometheus.yaml
@@ -31,22 +31,10 @@ jobs:
         go.sum
         .golangci.yml
       assets-cmd: |
-        # Debug: Check Makefile state
-        echo "=== Makefile lines 120-130 ==="
-        sed -n '120,130p' Makefile || echo "Failed to read Makefile"
-        echo "=== Test make syntax ==="
-        if ! make -n assets-compress >/dev/null 2>&1; then
-          echo "ERROR: Makefile has syntax errors!"
-          echo "=== Lines with 'else' ==="
-          grep -n 'else' Makefile || echo "No 'else' found"
-        fi
-
         # Only compress assets if assets actually changed
         # The git diff relies on gits remote naming. The merge-flow checks out
         # $downstream as origin at the time of writing this code.
         if ! git diff --exit-code --name-only  origin/main web/ui; then
-          rm -rf web/ui/static
-          make assets-compress
           find web/ui/static -type f -name '*.gz' -exec git add {} \;
           git add web/ui
           git diff --cached --exit-code --name-only || git commit -s -m "[bot] assets: generate"

From 5705aead18a8add6ef77961218493978bdbe0993 Mon Sep 17 00:00:00 2001
From: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Date: Thu, 5 Mar 2026 16:35:15 +0100
Subject: [PATCH 17/17] fix thanos go mod

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
---
 .github/workflows/merge-acm-flow.yaml   | 4 ++--
 .github/workflows/merge-acm-thanos.yaml | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge-acm-flow.yaml b/.github/workflows/merge-acm-flow.yaml
index 50eebfa..91320e9 100644
--- a/.github/workflows/merge-acm-flow.yaml
+++ b/.github/workflows/merge-acm-flow.yaml
@@ -138,7 +138,7 @@ jobs:
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
           git config --global core.editor "/bin/true"
-          git fetch https://github.com/${{ inputs.upstream }} tag ${{ steps.upstream.outputs.release }}
+          git fetch --no-tags https://github.com/${{ inputs.upstream }} tag ${{ steps.upstream.outputs.release }}
       - name: Merge with upstream ${{ steps.upstream.outputs.release }} tag
         id: merge
         run: |
@@ -162,7 +162,7 @@ jobs:
       - name: Resolve conflict due to deleted downstream files
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
-          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU" ||  $1=="U") print $2 }' | xargs -I {} git rm {}
+          git status --porcelain | awk '{ if ($1=="UD" || $1=="DU") print $2 }' | xargs -I {} git rm {}
       - name: Continue after merge conflict
         if: ${{ steps.merge.outputs.MERGE_CONFLICT == 'true' }}
         run: |
diff --git a/.github/workflows/merge-acm-thanos.yaml b/.github/workflows/merge-acm-thanos.yaml
index ebc5028..32ce2d6 100644
--- a/.github/workflows/merge-acm-thanos.yaml
+++ b/.github/workflows/merge-acm-thanos.yaml
@@ -19,7 +19,6 @@ jobs:
       upstream: thanos-io/thanos
       downstream: stolostron/thanos
       sandbox: rhobs/acm-thanos
-      go-mod-tidy: false
       restore-downstream: >-
         OWNERS
       restore-upstream: >-