Skip to content

Commit

Permalink
[Elastic Agent] Don't log when upgrade capability doesn't apply (#25386)
Browse files Browse the repository at this point in the history
* Fix #25302.

* Add changelog entry.

(cherry picked from commit 5a5fa15)
  • Loading branch information
blakerouse authored and mergify-bot committed Apr 28, 2021
1 parent 86c4631 commit 917b331
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 2 additions & 0 deletions x-pack/elastic-agent/CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
- Remove FLEET_SERVER_POLICY_NAME env variable as it was not used {pull}25149[25149]
- 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
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

0 comments on commit 917b331

Please sign in to comment.