Skip to content

[main] Update to Beats github.com/elastic/beats@0678f4d96212#8471

Merged
cmacknz merged 8 commits into
elastic:mainfrom
cmacknz:cmacknz/updatae-beats-with-meraki-replace
Jun 17, 2025
Merged

[main] Update to Beats github.com/elastic/beats@0678f4d96212#8471
cmacknz merged 8 commits into
elastic:mainfrom
cmacknz:cmacknz/updatae-beats-with-meraki-replace

Conversation

@cmacknz
Copy link
Copy Markdown
Member

@cmacknz cmacknz commented Jun 12, 2025

Update to Beats to elastic/beats@0678f4d on main.

Manual update because the auto update in https://github.com/elastic/elastic-agent/actions/runs/15598520733/job/43934049583#step:5:968 fails due to a missing replace statement to remove a problematic LGPL dependency.

@cmacknz cmacknz self-assigned this Jun 12, 2025
@cmacknz cmacknz requested a review from a team as a code owner June 12, 2025 15:01
@cmacknz cmacknz added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Jun 12, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 12, 2025

This pull request does not have a backport label. Could you fix it @cmacknz? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

cmacknz added 3 commits June 12, 2025 13:09
Downgrade github.com/godror/godror to v0.33.2 to match Beats.
@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 12, 2025

2025-06-12 17:34:34 UTC | /usr/local/go/pkg/tool/linux_arm64/link: running gcc failed: exit status 1
/usr/bin/gcc -s -Wl,-z,relro -pie -Wl,-z,now -Wl,-z,nocopyreloc -fuse-ld=gold -Wl,--build-id=0xee5395581ef98b935ea709af599bac9aa3bac678 -o $WORK/b001/exe/a.out -rdynamic -Wl,--compress-debug-sections=zlib /tmp/go-link-732555023/go.o /tmp/go-link-732555023/000000.o /tmp/go-link-732555023/000001.o /tmp/go-link-732555023/000002.o /tmp/go-link-732555023/000003.o /tmp/go-link-732555023/000004.o /tmp/go-link-732555023/000005.o /tmp/go-link-732555023/000006.o /tmp/go-link-732555023/000007.o /tmp/go-link-732555023/000008.o /tmp/go-link-732555023/000009.o /tmp/go-link-732555023/000010.o /tmp/go-link-732555023/000011.o /tmp/go-link-732555023/000012.o /tmp/go-link-732555023/000013.o /tmp/go-link-732555023/000014.o /tmp/go-link-732555023/000015.o /tmp/go-link-732555023/000016.o /tmp/go-link-732555023/000017.o /tmp/go-link-732555023/000018.o /tmp/go-link-732555023/000019.o /tmp/go-link-732555023/000020.o /tmp/go-link-732555023/000021.o /tmp/go-link-732555023/000022.o /tmp/go-link-732555023/000023.o /tmp/go-link-732555023/000024.o /tmp/go-link-732555023/000025.o /tmp/go-link-732555023/000026.o /tmp/go-link-732555023/000027.o /tmp/go-link-732555023/000028.o /tmp/go-link-732555023/000029.o /tmp/go-link-732555023/000030.o /tmp/go-link-732555023/000031.o /tmp/go-link-732555023/000032.o /tmp/go-link-732555023/000033.o /tmp/go-link-732555023/000034.o /tmp/go-link-732555023/000035.o /tmp/go-link-732555023/000036.o /tmp/go-link-732555023/000037.o /tmp/go-link-732555023/000038.o /tmp/go-link-732555023/000039.o /tmp/go-link-732555023/000040.o /tmp/go-link-732555023/000041.o /tmp/go-link-732555023/000042.o /tmp/go-link-732555023/000043.o /tmp/go-link-732555023/000044.o /tmp/go-link-732555023/000045.o /tmp/go-link-732555023/000046.o /tmp/go-link-732555023/000047.o /tmp/go-link-732555023/000048.o /tmp/go-link-732555023/000049.o /tmp/go-link-732555023/000050.o /tmp/go-link-732555023/000051.o /tmp/go-link-732555023/000052.o /tmp/go-link-732555023/000053.o /tmp/go-link-732555023/000054.o /tmp/go-link-732555023/000055.o /tmp/go-link-732555023/000056.o /tmp/go-link-732555023/000057.o /tmp/go-link-732555023/000058.o /tmp/go-link-732555023/000059.o /tmp/go-link-732555023/000060.o /tmp/go-link-732555023/000061.o /tmp/go-link-732555023/000062.o /tmp/go-link-732555023/000063.o /tmp/go-link-732555023/000064.o /tmp/go-link-732555023/000065.o /tmp/go-link-732555023/000066.o /tmp/go-link-732555023/000067.o /tmp/go-link-732555023/000068.o /tmp/go-link-732555023/000069.o /tmp/go-link-732555023/000070.o /tmp/go-link-732555023/000071.o /tmp/go-link-732555023/000072.o /tmp/go-link-732555023/000073.o /tmp/go-link-732555023/000074.o /tmp/go-link-732555023/000075.o /tmp/go-link-732555023/000076.o /tmp/go-link-732555023/000077.o /tmp/go-link-732555023/000078.o /tmp/go-link-732555023/000079.o /tmp/go-link-732555023/000080.o /tmp/go-link-732555023/000081.o /tmp/go-link-732555023/000082.o /tmp/go-link-732555023/000083.o /tmp/go-link-732555023/000084.o /tmp/go-link-732555023/000085.o /tmp/go-link-732555023/000086.o /tmp/go-link-732555023/000087.o /tmp/go-link-732555023/000088.o /tmp/go-link-732555023/000089.o -O2 -g -lresolv -O2 -g -lpthread -Wl,-wrap,pthread_create -O2 -g -lpthread -O2 -g -O2 -g -O2 -g -ldl -O2 -g -ldl -lpthread -O2 -g -O2 -g
/usr/bin/ld.gold: internal error in maybe_apply_stub, at ../../gold/aarch64.cc:5407
 collect2: error: ld returned 1 exit status

Arg I thought we resolved this problem, at least we did in Beats. Time to go look up how we prevented it.

@pickypg pickypg added backport-9.0 Automated backport to the 9.0 branch backport-8.19 Automated backport to the 8.19 branch labels Jun 13, 2025
@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 13, 2025

elastic/beats#41270 was the Beats issue where this happened with agentbeat originally.

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 13, 2025

So this was resolved by switching to Debian 11 in #5847

However in #6972 we pinned arm64 to debian 9 for some reason which could be the problem as it is re-introducing a GCC compiler bug.

case platform == "linux/arm64":
tagSuffix = "base-arm-debian9"


Image is up to date for docker.elastic.co/beats-dev/golang-crossbuild:1.24.4-base-arm-debian9
  | 2025-06-12 17:40:59 UTC | Status: Downloaded newer image for docker.elastic.co/beats-dev/golang-crossbuild:1.24.4-base-arm-debian9
  | 2025-06-12 17:41:13 UTC | >> Building using: cmd='build/mage-linux-arm64 buildGoDaemon', env=[GOARCH=arm64, GOARM=, GOOS=linux, GOTOOLCHAIN=local, PLATFORM_ID=linux-arm64]

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 13, 2025

It is not clear from #6972 why we switched to Debian 9 so I am going to go to 11 to see what happens, the open a PR in agent and Beats to bring us back to Debian 11 for linux/arm separately so the change isn't buried in this PR.

@pkoutsovasilis
Copy link
Copy Markdown
Contributor

pkoutsovasilis commented Jun 13, 2025

Hey @cmacknz below is the change from #6972

image

this was pointing at plain the plain arm target before which AFAICT derives from debian9

https://github.com/elastic/golang-crossbuild/blob/main/go/Makefile.common#L6

so did this ever downgrade from debian 11 to 9 indeed, elastic-agent?!

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 13, 2025

this was pointing at plain the plain arm target before which AFAICT derives from debian9

https://github.com/elastic/golang-crossbuild/blob/main/go/Makefile.common#L6

so did this ever downgrade from debian 11 to 9 indeed, elastic-agent?!

Ah so it is maybe just that we never upgraded it, and now we should. Thanks it was not obvious that plain arm was debian9.

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 13, 2025

linux/arm build fix split into #8497

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 13, 2025

Also needs #8498 to fix the false positive merge conflict being detected in the notice file in the precommit check.

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 16, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b cmacknz/updatae-beats-with-meraki-replace upstream/cmacknz/updatae-beats-with-meraki-replace
git merge upstream/main
git push upstream cmacknz/updatae-beats-with-meraki-replace

@swiatekm
Copy link
Copy Markdown
Member

Are we sure we want to backport this to 9.0? I think we'd want just the replaces there?

@elastic-sonarqube
Copy link
Copy Markdown

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@cmacknz cmacknz removed backport-9.0 Automated backport to the 9.0 branch backport-8.19 Automated backport to the 8.19 branch labels Jun 16, 2025
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jun 16, 2025

This pull request does not have a backport label. Could you fix it @cmacknz? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Jun 16, 2025

Are we sure we want to backport this to 9.0? I think we'd want just the replaces there?

This needs to be a new PR in 8.19 was my original plan, I will take a look at 9.0 as well. It can't be straight backported as the beats commit will need to change at minimum.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 16, 2025

@cmacknz cmacknz merged commit c1be040 into elastic:main Jun 17, 2025
21 checks passed
@cmacknz cmacknz deleted the cmacknz/updatae-beats-with-meraki-replace branch June 17, 2025 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants