Revert "[agentbeat] Fix agentbeat capabilities" #40510
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 36cef2f.
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
cmacknz
approved these changes
Aug 13, 2024
mauri870
reviewed
Aug 13, 2024
x-pack/agentbeat/main.go
Outdated
| @@ -70,12 +70,8 @@ func prepareCommand(rootCmd *cmd.BeatsRootCmd) *cobra.Command { | |||
| // filename, as all the beats set this in the initialization. | |||
| err := cfgfile.ChangeDefaultCfgfileFlag(rootCmd.Use) | |||
| if err != nil { | |||
| panic(fmt.Errorf("failed to set default config file path: %w", err)) | |||
| panic(fmt.Errorf("failed to set default config file path: %v", err)) | |||
There was a problem hiding this comment.
Even though I believe nothing will ever try to recover from this panic, I believe it's good to make the linter happy.
mauri870
approved these changes
Aug 14, 2024
|
@blakerouse I think we should backport this revert PR, because my original PR was also backported. |
blakerouse
added a commit
that referenced
this pull request
Aug 21, 2024
…s" (#40575) * Revert "[agentbeat] Fix agentbeat capabilities" (#40510) * Revert "[agentbeat] Fix agentbeat capabilities (#40466)" This reverts commit 36cef2f. * Update main.go (cherry picked from commit f6b8701) * Update CHANGELOG.next.asciidoc --------- Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #40466 as the change in this PR elastic/elastic-agent#5290 removes the need for the agentbeat itself to promote its own capabilites.