Fix troubleshooting message URL for versions after 9.x #10218

straistaru · 2025-09-30T13:17:35Z

What does this PR do?

Ensure the docs URL in the troubleshoot message matches the correct release version.
The docs for 9.0+ don't refer to a specific version anymore: https://www.elastic.co/docs/troubleshoot/ingest/fleet/common-problems, so the URL returned to the user in the error output is invalid.

Checklist

I have read and understood the pull request guidelines of this project.
My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
~~[ ] I have made corresponding changes to the documentation~~
~~[ ] I have made corresponding change to the default configuration files~~
~~[ ] I have added tests that prove my fix is effective or that my feature works~~
I have added an entry in ./changelog/fragments using the changelog tool
~~[ ] I have added an integration test or an E2E test~~

Related issues

Closes Troubleshooting message generates invalid URL in 9.x #10119

mergify · 2025-09-30T13:18:15Z

This pull request does not have a backport label. Could you fix it @straistaru? 🙏
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.

straistaru · 2025-09-30T13:37:22Z

Noticed that release.Version() will try to use the version from the package.version file instead of just a hard-coded value in the agent binary.

Is it a supported scenario for an elastic-agent build above 9.x to read a package.version file with a version different from its build version? Would a user ever be expected to encounter this, or is it considered unsupported?
If it's not, the function can be simplified to a const with the new docs URL, and we wouldn’t backport the fix to pre-9.x branches.

EDIT: Answer below from Paolo.

internal/pkg/agent/cmd/common.go

mergify · 2025-10-02T10:28:37Z

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 gh-issue-10119 upstream/gh-issue-10119
git merge upstream/main
git push upstream gh-issue-10119

elasticmachine · 2025-10-06T06:43:51Z

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

internal/pkg/agent/cmd/run.go

elasticmachine · 2025-10-06T17:35:05Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: 9cd8e1c

Failed CI Steps

x86_64:sudo: fleet

History

💛 Build #28040 was flaky 7937925
💛 Build #27967 was flaky e59d480
💔 Build #27960 failed 7d6a79a
💔 Build #27959 failed eb9ade3
💔 Build #27891 failed 62b4421

cc @straistaru

github-actions · 2025-10-10T11:52:10Z

@Mergifyio backport 9.0 9.1 9.2

mergify · 2025-10-10T11:52:22Z

backport 9.0 9.1 9.2

✅ Backports have been created

#10477 [9.0] (backport #10218) Fix troubleshooting message URL for versions after 9.x has been created for branch 9.0 but encountered conflicts
#10478 [9.1] (backport #10218) Fix troubleshooting message URL for versions after 9.x has been created for branch 9.1 but encountered conflicts
#10479 [9.2] (backport #10218) Fix troubleshooting message URL for versions after 9.x has been created for branch 9.2

* Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment (cherry picked from commit b74942a) # Conflicts: # internal/pkg/agent/cmd/diagnostics_otel.go # internal/pkg/agent/cmd/enroll.go

* Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment (cherry picked from commit b74942a)

* Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment

* Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment (cherry picked from commit b74942a) Co-authored-by: Stefan Traistaru <[email protected]>

…after 9.x (#10478) * Fix troubleshooting message URL for versions after 9.x (#10218) * Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment (cherry picked from commit b74942a) # Conflicts: # internal/pkg/agent/cmd/diagnostics_otel.go # internal/pkg/agent/cmd/enroll.go * Solve conflicts --------- Co-authored-by: Stefan Traistaru <[email protected]>

…after 9.x (#10477) * Fix troubleshooting message URL for versions after 9.x (#10218) * Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment (cherry picked from commit b74942a) # Conflicts: # internal/pkg/agent/cmd/diagnostics_otel.go # internal/pkg/agent/cmd/enroll.go * Solve conflicts * Solve lint issues --------- Co-authored-by: Stefan Traistaru <[email protected]>

* Fix troubleshooting message URL for versions after 9.x * Add changelog fragment * Change troubleshoot message to a const variable * Fix build issue created by the merge * Fix linter issue * Revert linter fix and add nolint comment

Fix troubleshooting message URL for versions after 9.x

b87e639

straistaru linked an issue Sep 30, 2025 that may be closed by this pull request

Troubleshooting message generates invalid URL in 9.x #10119

Closed

mergify bot assigned straistaru Sep 30, 2025

Add changelog fragment

62b4421

pchila reviewed Oct 2, 2025

View reviewed changes

internal/pkg/agent/cmd/common.go Outdated Show resolved Hide resolved

straistaru added backport-active-9 Automated backport with mergify to all the active 9.[0-9]+ branches bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Oct 2, 2025

Change troubleshoot message to a const variable

eb9ade3

straistaru added 3 commits October 2, 2025 13:47

Merge branch 'main' into gh-issue-10119

7d6a79a

Fix build issue created by the merge

e59d480

Fix linter issue

7937925

straistaru marked this pull request as ready for review October 6, 2025 06:43

straistaru requested a review from a team as a code owner October 6, 2025 06:43

straistaru requested review from kaanyalti and michalpristas October 6, 2025 06:43

pchila reviewed Oct 6, 2025

View reviewed changes

internal/pkg/agent/cmd/run.go Outdated Show resolved Hide resolved

Revert linter fix and add nolint comment

9cd8e1c

straistaru requested a review from pchila October 9, 2025 06:14

pchila approved these changes Oct 10, 2025

View reviewed changes

straistaru merged commit b74942a into elastic:main Oct 10, 2025
21 checks passed

mergify bot mentioned this pull request Oct 10, 2025

[9.0] (backport #10218) Fix troubleshooting message URL for versions after 9.x #10477

Merged

4 tasks

mergify bot mentioned this pull request Oct 10, 2025

[9.1] (backport #10218) Fix troubleshooting message URL for versions after 9.x #10478

Merged

4 tasks

mergify bot mentioned this pull request Oct 10, 2025

[9.2] (backport #10218) Fix troubleshooting message URL for versions after 9.x #10479

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix troubleshooting message URL for versions after 9.x #10218

Fix troubleshooting message URL for versions after 9.x #10218

Uh oh!

straistaru commented Sep 30, 2025 •

edited

Loading

Uh oh!

mergify bot commented Sep 30, 2025

Uh oh!

straistaru commented Sep 30, 2025 •

edited

Loading

Uh oh!

Uh oh!

mergify bot commented Oct 2, 2025

Uh oh!

elasticmachine commented Oct 6, 2025

Uh oh!

Uh oh!

elasticmachine commented Oct 6, 2025 •

edited

Loading

Uh oh!

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

mergify bot commented Oct 10, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Fix troubleshooting message URL for versions after 9.x #10218

Fix troubleshooting message URL for versions after 9.x #10218

Uh oh!

Conversation

straistaru commented Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Checklist

Related issues

Uh oh!

mergify bot commented Sep 30, 2025

Uh oh!

straistaru commented Sep 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mergify bot commented Oct 2, 2025

Uh oh!

elasticmachine commented Oct 6, 2025

Uh oh!

Uh oh!

elasticmachine commented Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💛 Build succeeded, but was flaky

Failed CI Steps

History

Uh oh!

Uh oh!

github-actions bot commented Oct 10, 2025

Uh oh!

mergify bot commented Oct 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

straistaru commented Sep 30, 2025 •

edited

Loading

straistaru commented Sep 30, 2025 •

edited

Loading

elasticmachine commented Oct 6, 2025 •

edited

Loading

mergify bot commented Oct 10, 2025 •

edited

Loading