Skip to content

[9.5](backport #52750) [Automation] Bump Golang version to 1.26.7 - #52824

Merged
ebeahan merged 3 commits into
9.5from
mergify/bp/9.5/pr-52750
Aug 26, 2026
Merged

[9.5](backport #52750) [Automation] Bump Golang version to 1.26.7#52824
ebeahan merged 3 commits into
9.5from
mergify/bp/9.5/pr-52750

Conversation

@mergify

@mergify mergify Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

Bump golang-version to latest version

Update .go-version

1 file(s) updated with "1.26.7": * .go-version

v1.26.7
## Go 1.26.7

- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armel-debian12(-fips)?`    - linux/armv5, linux/armv6
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian9(-fips)?`     - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian10(-fips)?`    - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian11(-fips)?`    - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian12(-fips)?`    - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf(-fips)?`             - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian9(-fips)?`  - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian10(-fips)?` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian11(-fips)?` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian12(-fips)?` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian7(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian9(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian10(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian11(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian12(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-arm64-debian10(-fips)?` - darwin/arm64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-arm64-debian11(-fips)?` - darwin/arm64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-arm64-debian12(-fips)?` - darwin/arm64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian9(-fips)?`  - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian10(-fips)?` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian11(-fips)?` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian12(-fips)?` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin(-fips)?`          - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian7(-fips)?`    - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian9(-fips)?`    - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian10(-fips)?`   - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian11(-fips)?`   - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian12(-fips)?`   - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main(-fips)?`            - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-mips-debian12(-fips)?`   - linux/mips64, linux/mips64el
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-ppc-debian12(-fips)?`    - linux/ppc64, linux/ppc64le
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-s390x-debian12(-fips)?`  - linux/s390x
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-windows-arm64-debian12(-fips)?`   - linux/arm64, windows/arm64

### Changes

- [Automation] Bump Golang version to 1.26.7-1 @[github-actions[bot]](https://github.com/apps/github-actions) (#747)

**Full Changelog**: https://github.com/elastic/golang-crossbuild/compare/v1.26.6...v1.26.7
Update Metricbeat Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/metricbeat/Dockerfile"

Update version.asciidoc

1 file(s) updated with ":go-version: 1.26.7": * libbeat/docs/version.asciidoc

v1.26.7
## Go 1.26.7

- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armel-debian12(-fips)?`    - linux/armv5, linux/armv6
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian9(-fips)?`     - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian10(-fips)?`    - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian11(-fips)?`    - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf-debian12(-fips)?`    - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-armhf(-fips)?`             - linux/armv7
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian9(-fips)?`  - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian10(-fips)?` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian11(-fips)?` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-arm-debian12(-fips)?` - linux/arm64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian7(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian9(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian10(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian11(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base-debian12(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-base(-fips)?`
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-arm64-debian10(-fips)?` - darwin/arm64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-arm64-debian11(-fips)?` - darwin/arm64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-arm64-debian12(-fips)?` - darwin/arm64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian9(-fips)?`  - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian10(-fips)?` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian11(-fips)?` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin-debian12(-fips)?` - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-darwin(-fips)?`          - darwin/amd64 (MacOS 10.11, MacOS 10.14)
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian7(-fips)?`    - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian9(-fips)?`    - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian10(-fips)?`   - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian11(-fips)?`   - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main-debian12(-fips)?`   - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-main(-fips)?`            - linux/i386, linux/amd64, windows/amd64
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-mips-debian12(-fips)?`   - linux/mips64, linux/mips64el
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-ppc-debian12(-fips)?`    - linux/ppc64, linux/ppc64le
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-s390x-debian12(-fips)?`  - linux/s390x
- `docker.elastic.co/beats-dev/golang-crossbuild:1.26.7-windows-arm64-debian12(-fips)?`   - linux/arm64, windows/arm64

### Changes

- [Automation] Bump Golang version to 1.26.7-1 @[github-actions[bot]](https://github.com/apps/github-actions) (#747)

**Full Changelog**: https://github.com/elastic/golang-crossbuild/compare/v1.26.6...v1.26.7
Update go.mod

1 file(s) updated with "go 1.26.7": * go.mod

Update from vsphere Dockerfile

changed lines [2] of file "/tmp/updatecli/github/elastic/beats/metricbeat/module/vsphere/_meta/Dockerfile"

Update Metricbeat debug Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/dev-tools/kubernetes/metricbeat/Dockerfile.debug"

Update Heartbeat Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/heartbeat/Dockerfile"

Update Heartbeat debug Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/dev-tools/kubernetes/heartbeat/Dockerfile.debug"

Update Auditbeat Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/auditbeat/Dockerfile"

Update Filebeat debug Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/dev-tools/kubernetes/filebeat/Dockerfile.debug"

Update Packetbeat Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/packetbeat/Dockerfile"

Update HTTP module Dockerfile

changed lines [1] of file "/tmp/updatecli/github/elastic/beats/metricbeat/module/http/_meta/Dockerfile"

Update stan Dockerfile

changed lines [5] of file "/tmp/updatecli/github/elastic/beats/x-pack/metricbeat/module/stan/_meta/Dockerfile"

GitHub Action workflow link
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!


This is an automatic backport of pull request #52750 done by [Mergify](https://mergify.com).

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update Filebeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update from vsphere Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update go.mod

Made with ❤️️ by updatecli

* chore: Update Heartbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update stan Dockerfile

Made with ❤️️ by updatecli

* chore: Update Auditbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update Metricbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Packetbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update HTTP module Dockerfile

Made with ❤️️ by updatecli

* add changelog fragment

* Fix whitespace in changelog fragment

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ebeahan <eric.beahan@elastic.co>
(cherry picked from commit 657bbbf)

# Conflicts:
#	libbeat/docs/version.asciidoc
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Aug 24, 2026
@mergify

mergify Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 657bbbf has failed:

On branch mergify/bp/9.5/pr-52750
Your branch is up to date with 'origin/9.5'.

You are currently cherry-picking commit 657bbbfcf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .go-version
	modified:   auditbeat/Dockerfile
	new file:   changelog/fragments/1787328794-update-go-to-1.26.7.yaml
	modified:   dev-tools/kubernetes/filebeat/Dockerfile.debug
	modified:   dev-tools/kubernetes/heartbeat/Dockerfile.debug
	modified:   dev-tools/kubernetes/metricbeat/Dockerfile.debug
	modified:   go.mod
	modified:   heartbeat/Dockerfile
	modified:   metricbeat/Dockerfile
	modified:   metricbeat/module/http/_meta/Dockerfile
	modified:   metricbeat/module/vsphere/_meta/Dockerfile
	modified:   packetbeat/Dockerfile
	modified:   x-pack/metricbeat/module/stan/_meta/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/docs/version.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify
mergify Bot requested review from a team as code owners August 24, 2026 22:06
@mergify
mergify Bot requested review from khushijain21 and leehinman and removed request for a team August 24, 2026 22:06
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 24, 2026
@mergify
mergify Bot requested review from lorienhu and swiatekm and removed request for a team August 24, 2026 22:06
@github-actions

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • /test : Run the Buildkite pipeline.

@github-actions github-actions Bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team dependencies Pull requests that update a dependency file labels Aug 24, 2026
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 24, 2026
@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

The check-docs workflow failed in checkRun check because generated Kubernetes manifests changed during CI (check-no-changes), specifically stripping the image tag from Wolfi image references. Update and commit the generated deploy/kubernetes/*-kubernetes.yaml files, then rerun checks.

Remediation

  • Regenerate and commit Kubernetes deployment manifests so make check is clean (no post-generation diff), including:
    • deploy/kubernetes/auditbeat-kubernetes.yaml
    • deploy/kubernetes/filebeat-kubernetes.yaml
    • deploy/kubernetes/heartbeat-kubernetes.yaml
    • deploy/kubernetes/metricbeat-kubernetes.yaml
  • Ensure the Wolfi image lines keep an explicit tag (instead of ending with ...-wolfi:), commit, and rerun the failed GitHub Actions checks.
Investigation details

Root Cause

make check reached check-no-changes and failed because repository-generated files were modified in-place by the check. The diff in logs shows image references in deploy/kubernetes/*-kubernetes.yaml changed from tagged values (for example :9.5.2) to empty tags (...-wolfi:), leaving the working tree dirty.

Evidence

  • Workflow: https://github.com/elastic/beats/actions/runs/32853279854
  • Job/step: check-docscheckRun check (https://github.com/elastic/beats/actions/runs/32853279854/job/97819064408)
  • Key log excerpt:
    • - image: docker.elastic.co/beats/auditbeat-wolfi:9.5.2
    • + image: docker.elastic.co/beats/auditbeat-wolfi:
    • deploy/kubernetes/auditbeat-kubernetes.yaml: needs update
    • deploy/kubernetes/filebeat-kubernetes.yaml: needs update
    • deploy/kubernetes/heartbeat-kubernetes.yaml: needs update
    • deploy/kubernetes/metricbeat-kubernetes.yaml: needs update
    • make[1]: *** [Makefile:119: check-no-changes] Error 1
    • ##[error]Process completed with exit code 2.

Validation

  • Not run locally in this workflow; diagnosis is based on workflow run logs.

Follow-up

Given this differs from the earlier merge-conflict finding on the PR, both issues may need to be resolved depending on which workflow/check is failing at rerun time.


What is this? | From workflow: PR Actions Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

The Buildkite failures are all downstream of an unresolved cherry-pick conflict in libbeat/docs/version.asciidoc on this PR. Resolve that conflict first; it should clear the pre-commit failures and stop generating invalid Kubernetes manifests.

Remediation

  • Resolve libbeat/docs/version.asciidoc conflict markers in this PR (remove <<<<<<<, =======, >>>>>>>) and keep the intended 9.5 backport values plus the Go bump.
  • Re-run make -C deploy/kubernetes all and commit any regenerated deploy/kubernetes/*-kubernetes.yaml changes, then rerun Buildkite.
Investigation details

Root Cause

pre-commit is failing on unresolved merge-conflict markers in libbeat/docs/version.asciidoc, and deploy/kubernetes/Makefile:3 derives BEAT_VERSION from line 1 of that same file:

  • deploy/kubernetes/Makefile:3BEAT_VERSION=$(shell head -n 1 ../../libbeat/docs/version.asciidoc | cut -c 17- )

Because the first line in the PR diff is a conflict marker (<<<<<<< HEAD), BEAT_VERSION becomes empty during generation, producing image refs ending in -wolfi: and invalid YAML used by K8S tests.

Evidence

  • Build: https://buildkite.com/elastic/beats/builds/51840
  • Job/step: Auditbeat: Run pre-commit
    • check for merge conflicts................................................Failed
    • libbeat/docs/version.asciidoc:1: Merge conflict string '<<<<<<<' found
    • libbeat/docs/version.asciidoc:5: Merge conflict string '=======' found
  • Job/step: Checks (deploy-k8s-checks.txt)
    • - image: docker.elastic.co/beats/metricbeat-wolfi:9.5.2
    • + image: docker.elastic.co/beats/metricbeat-wolfi:
    • same pattern for auditbeat/filebeat/heartbeat manifests
  • Job/step: K8S Test/K8S version: v1.36.1
    • error parsing metricbeat-kubernetes.yaml: ... yaml: line 24: mapping values are not allowed in this context
    • equivalent parse failures for auditbeat-kubernetes.yaml and heartbeat-kubernetes.yaml

Verification

  • Not run locally in this workflow; diagnosis is based on the Buildkite logs and PR file diff.

Follow-up

After resolving libbeat/docs/version.asciidoc, regenerate Kubernetes manifests once and rerun CI; if failures remain, they should be independent of this conflict chain.


What is this? | From workflow: PR Buildkite Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

Comment thread libbeat/docs/version.asciidoc Outdated
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Aug 25, 2026
@mergify

mergify Bot commented Aug 26, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@ebeahan
ebeahan merged commit e278a76 into 9.5 Aug 26, 2026
216 checks passed
@ebeahan
ebeahan deleted the mergify/bp/9.5/pr-52750 branch August 26, 2026 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport dependencies Pull requests that update a dependency file Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants