Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2025

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


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

* 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
@mergify mergify bot added the backport label Oct 10, 2025
@mergify mergify bot requested a review from a team as a code owner October 10, 2025 11:53
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 10, 2025
@mergify mergify bot requested review from blakerouse and pkoutsovasilis and removed request for a team October 10, 2025 11:53
Copy link
Contributor Author

mergify bot commented Oct 10, 2025

Cherry-pick of b74942a has failed:

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

You are currently cherry-picking commit b74942add.
  (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:
	new file:   changelog/fragments/1759335344-fix-troubleshooting-message-url-for-versions-after-9.yaml
	modified:   internal/pkg/agent/cmd/apply_flavor.go
	modified:   internal/pkg/agent/cmd/common.go
	modified:   internal/pkg/agent/cmd/container.go
	modified:   internal/pkg/agent/cmd/diagnostics.go
	modified:   internal/pkg/agent/cmd/inspect.go
	modified:   internal/pkg/agent/cmd/install.go
	modified:   internal/pkg/agent/cmd/logs.go
	modified:   internal/pkg/agent/cmd/privileged.go
	modified:   internal/pkg/agent/cmd/reexec_windows.go
	modified:   internal/pkg/agent/cmd/run.go
	modified:   internal/pkg/agent/cmd/status.go
	modified:   internal/pkg/agent/cmd/uninstall.go
	modified:   internal/pkg/agent/cmd/unprivileged.go
	modified:   internal/pkg/agent/cmd/upgrade.go
	modified:   internal/pkg/agent/cmd/watch.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/pkg/agent/cmd/diagnostics_otel.go
	both modified:   internal/pkg/agent/cmd/enroll.go

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

@github-actions github-actions bot added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Oct 10, 2025
@elasticmachine
Copy link
Collaborator

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bug Something isn't working conflicts There is a conflict in the backported pull request 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.

2 participants