From fac3b534af5171aae251dd69bfbb1a24c3d4ba5a Mon Sep 17 00:00:00 2001
From: Victor Martinez <victormartinezrubio@gmail.com>
Date: Mon, 21 Jul 2025 13:20:36 +0200
Subject: [PATCH 1/2] deps: use the latest updatecli version and use
 oblt-actions (#9082)

(cherry picked from commit 58886e60cd88e35fa5c25706c642630b891db3c5)

# Conflicts:
#	.github/workflows/bump-golang.yml
#	.github/workflows/updatecli-compose.yml
---
 .github/workflows/bump-beats-version.yml |  1 +
 .github/workflows/bump-golang.yml        | 34 ++++++++----------------
 .github/workflows/bump-otel-version.yml  |  1 +
 .github/workflows/bump-vm-images.yml     |  1 +
 .github/workflows/updatecli-compose.yml  | 12 ++++++++-
 .updatecli-version                       |  1 +
 6 files changed, 26 insertions(+), 24 deletions(-)
 create mode 100644 .updatecli-version

diff --git a/.github/workflows/bump-beats-version.yml b/.github/workflows/bump-beats-version.yml
index 5fb4a12177a..0c0607bf660 100644
--- a/.github/workflows/bump-beats-version.yml
+++ b/.github/workflows/bump-beats-version.yml
@@ -56,6 +56,7 @@ jobs:
       uses: elastic/oblt-actions/updatecli/run@v1
       with:
         command: apply --config .ci/updatecli/update-beats.yml --values .ci/updatecli/values.d/scm.yml
+        version-file: .updatecli-version
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BRANCH_NAME: ${{ matrix.branch }}
diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml
index 873471cf810..eebd577932b 100644
--- a/.github/workflows/bump-golang.yml
+++ b/.github/workflows/bump-golang.yml
@@ -21,32 +21,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@1536e372d5f433385f11b5b133b23a9833c510ce # 2.86.0
-
-      - name: Run Updatecli in Apply mode
-        run: updatecli apply --config .ci/updatecli/updatecli-bump-golang.yml --values .ci/updatecli/values.d/scm.yml
+      - uses: elastic/oblt-actions/updatecli/run@v1
+        with:
+          command: apply --config .ci/updatecli/updatecli-bump-golang.yml --values .ci/updatecli/values.d/scm.yml
+          version-file: .updatecli-version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - if: ${{ failure()  }}
+<<<<<<< HEAD
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
+=======
+        uses: elastic/oblt-actions/slack/send@v1
+>>>>>>> 58886e60c (deps: use the latest updatecli version and use oblt-actions (#9082))
         with:
-          method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_TOKEN }}
-          payload: |
-            {
-              "channel": "#ingest-notifications",
-              "text": "${{ env.SLACK_MESSAGE }}",
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "${{ env.SLACK_MESSAGE }}"
-                  }
-                }
-              ]
-            }
-        env:
-          SLACK_MESSAGE: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@agent-team` please look what's going on <${{ env.JOB_URL }}|here>"
+          bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
+          channel-id: "#ingest-notifications"
+          message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@agent-team` please look what's going on <${{ env.JOB_URL }}|here>"
diff --git a/.github/workflows/bump-otel-version.yml b/.github/workflows/bump-otel-version.yml
index 6ea2dad7ae1..12aee4a9fda 100644
--- a/.github/workflows/bump-otel-version.yml
+++ b/.github/workflows/bump-otel-version.yml
@@ -39,6 +39,7 @@ jobs:
       uses: elastic/oblt-actions/updatecli/run@v1
       with:
         command: apply --config .ci/updatecli/update-otel.yml --values .ci/updatecli/values.d/scm.yml
+        version-file: .updatecli-version
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         BRANCH_NAME: ${{ matrix.branch }}
diff --git a/.github/workflows/bump-vm-images.yml b/.github/workflows/bump-vm-images.yml
index b6641b5cc8e..0b12d6b6d2e 100644
--- a/.github/workflows/bump-vm-images.yml
+++ b/.github/workflows/bump-vm-images.yml
@@ -52,6 +52,7 @@ jobs:
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
           command: apply --config .ci/updatecli/updatecli-bump-vm-images.yml --values .ci/updatecli/values.d/scm.yml
+          version-file: .updatecli-version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH_NAME: ${{ matrix.branch }}
diff --git a/.github/workflows/updatecli-compose.yml b/.github/workflows/updatecli-compose.yml
index 7f4367144cc..0c5fd741cd8 100644
--- a/.github/workflows/updatecli-compose.yml
+++ b/.github/workflows/updatecli-compose.yml
@@ -28,16 +28,19 @@ jobs:
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
           command: --experimental compose diff
+          version-file: .updatecli-version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
           command: --experimental compose apply
+          version-file: .updatecli-version
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - if: ${{ failure()  }}
+<<<<<<< HEAD
         uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
           method: chat.postMessage
@@ -56,5 +59,12 @@ jobs:
                 }
               ]
             }
+=======
+        uses: elastic/oblt-actions/slack/send@v1
+>>>>>>> 58886e60c (deps: use the latest updatecli version and use oblt-actions (#9082))
         env:
-          SLACK_MESSAGE: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@agent-team` please look what's going on <${{ env.JOB_URL }}|here>"
+          JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+        with:
+          bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
+          channel-id: "#ingest-notifications"
+          message: ":traffic_cone: updatecli failed for `${{ github.repository }}@${{ github.ref_name }}`, `@agent-team` please look what's going on <${{ env.JOB_URL }}|here>"
diff --git a/.updatecli-version b/.updatecli-version
new file mode 100644
index 00000000000..5c5d5571187
--- /dev/null
+++ b/.updatecli-version
@@ -0,0 +1 @@
+v0.104.0
\ No newline at end of file

From e033ecb5e06fe35e5986f3f6a5535bf95ed7ef2b Mon Sep 17 00:00:00 2001
From: Victor Martinez <VictorMartinezRubio@gmail.com>
Date: Mon, 21 Jul 2025 13:27:24 +0200
Subject: [PATCH 2/2] merge

---
 .github/workflows/bump-golang.yml       |  4 ----
 .github/workflows/updatecli-compose.yml | 21 ---------------------
 2 files changed, 25 deletions(-)

diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml
index eebd577932b..452cb73dd13 100644
--- a/.github/workflows/bump-golang.yml
+++ b/.github/workflows/bump-golang.yml
@@ -29,11 +29,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - if: ${{ failure()  }}
-<<<<<<< HEAD
-        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
-=======
         uses: elastic/oblt-actions/slack/send@v1
->>>>>>> 58886e60c (deps: use the latest updatecli version and use oblt-actions (#9082))
         with:
           bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
           channel-id: "#ingest-notifications"
diff --git a/.github/workflows/updatecli-compose.yml b/.github/workflows/updatecli-compose.yml
index 0c5fd741cd8..624075d7a92 100644
--- a/.github/workflows/updatecli-compose.yml
+++ b/.github/workflows/updatecli-compose.yml
@@ -40,28 +40,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - if: ${{ failure()  }}
-<<<<<<< HEAD
-        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
-        with:
-          method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_TOKEN }}
-          payload: |
-            {
-              "channel": "#ingest-notifications",
-              "text": "${{ env.SLACK_MESSAGE }}",
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": "${{ env.SLACK_MESSAGE }}"
-                  }
-                }
-              ]
-            }
-=======
         uses: elastic/oblt-actions/slack/send@v1
->>>>>>> 58886e60c (deps: use the latest updatecli version and use oblt-actions (#9082))
         env:
           JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         with: