[7.7] Deep merge event fields and metadata maps (#17958) #18231
Conversation
* Deep merge event fields and metadata maps * Add CHANGELOG entry * Use loop to remove keys; extract into function * Relocating CHANGELOG entry * Rewording and moving to bugfix section per review feedback * Adapting other CHANGELOG entry * Fix comparison in test
ycombinator
added
[zube]: In Review
backport
Team:Services
botelastic
bot
added
the
needs_team
|
Pinging @elastic/integrations-services (Team:Services) |
CHANGELOG.next.asciidoc
Outdated
| @@ -79,6 +79,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d | |||
| - Do not rotate log files on startup when interval is configured and rotateonstartup is disabled. {pull}17613[17613] | |||
| - Fix `setup.dashboards.index` setting not working. {pull}17749[17749] | |||
| - Fix Elasticsearch license endpoint URL referenced in error message. {issue}17880[17880] {pull}18030[18030] | |||
| - Fix panic when assigning a key to a `nil` value in an event. {pull}18143[18143] | |||
There was a problem hiding this comment.
Thanks for catching. Fixed in d4d8191.
While fixing this I noticed that there are duplicate entries for the same PR in the CHANGELOG, even in the original PR to master. So I've cleaned those up in this backport. I'll make a separate PR to master to clean up the CHANGELOG there.
There was a problem hiding this comment.
PR to cleanup CHANGELOG in master: #18233
CHANGELOG.next.asciidoc
Outdated
| @@ -192,6 +193,42 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d | |||
| - Add `providers` setting to `add_cloud_metadata` processor. {pull}13812[13812] | |||
| - Ensure that init containers are no longer tailed after they stop {pull}14394[14394] | |||
| - Fingerprint processor adds a new xxhash hashing algorithm {pull}15418[15418] | |||
| - Add document_id setting to decode_json_fields processor. {pull}15859[15859] | |||
There was a problem hiding this comment.
Hey @ycombinator ! Is all this normal however?
There was a problem hiding this comment.
Nope, it's definitely not! 😬 Not sure what happened here, fixing.
There was a problem hiding this comment.
Okay, I think I have this finally in the right state. What you see here should be a backport of https://github.com/elastic/beats/pull/17958/files and https://github.com/elastic/beats/pull/18233/files.
…tic#18231) * Deep merge event fields and metadata maps (elastic#17958) * Deep merge event fields and metadata maps * Add CHANGELOG entry * Use loop to remove keys; extract into function * Relocating CHANGELOG entry * Rewording and moving to bugfix section per review feedback * Adapting other CHANGELOG entry * Fix comparison in test * Fixing up CHANGELOG * Cleaning up CHANGELOG * Fixing up CHANGELOG * Fixing up CHANGELOG
Backports the following commits to 7.7: