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

Fix issue where autodiscover hints default configuration was not being copied. #16987

Merged
merged 3 commits into from
Mar 13, 2020
+49 −2
Merged

Fix issue where autodiscover hints default configuration was not being copied. #16987

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5209c27
Fix issue where autodiscover hints default configuration was not bein…
blakerouse Mar 12, 2020
7e94084
Add changelog.
blakerouse Mar 12, 2020
d67288d
Add test and update comment.
blakerouse Mar 13, 2020
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 CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Adding the var definitions in azure manifest files, fix for errors when executing command setup. {issue}16270[16270] {pull}16468[16468]
- Fix merging of fileset inputs to replace paths and append processors. {pull}16450{16450}
- Add queue_url definition in manifest file for aws module. {pull}16640{16640}
- Fix issue where autodiscover hints default configuration was not being copied. {pull}16987[16987]

*Heartbeat*

Expand Down
7 changes: 6 additions & 1 deletion filebeat/autodiscover/builder/hints/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ func (c *config) Unpack(from *common.Config) error {
}
} else {
// full config provided, discard default
c.DefaultConfig = config
//
// must be a clone of the default config or the config will be
blakerouse marked this conversation as resolved.
Show resolved Hide resolved
// updated across different hints and causes bad unexpected behaviour;
// (https://github.com/elastic/beats/issues/16540) provides more context
// on why this is required here
c.DefaultConfig = common.MustNewConfigFrom(config)
}
}

Expand Down