Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Elastic Agent] Don't log when upgrade capability doesn't apply #25386

Merged
merged 3 commits into from
Apr 28, 2021
Merged

[Elastic Agent] Don't log when upgrade capability doesn't apply #25386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73b8cb3
Fix #25302.
blakerouse Apr 28, 2021
926901e
Add changelog entry.
blakerouse Apr 28, 2021
1e35245
Merge branch 'master' into fix-capabilities
blakerouse Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions x-pack/elastic-agent/CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
- Passing in policy id to container command works {pull}25352[25352]
- Reduce log level for listener cleanup to debug {pull}25274[25274]
- Delay the restart of application when a status report of failure is given {pull}25339[25339]
- Don't log when upgrade capability doesn't apply {pull}25386[25386]

==== New features

Expand Down
1 change: 0 additions & 1 deletion x-pack/elastic-agent/pkg/capabilities/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ type multiUpgradeCapability struct {
func (c *multiUpgradeCapability) Apply(in interface{}) (interface{}, error) {
upgradeMap := upgradeObject(in)
if upgradeMap == nil {
c.log.Warnf("expecting map config object but got nil for capability 'multi-upgrade'")
// not an upgrade we don't alter origin
return in, nil
}
Expand Down