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.

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

Cherry-pick #11549 to 7.0: Fix issue 11543 when key 'log' does not exist #11553

Merged
merged 2 commits into from
Mar 30, 2019
Merged

Cherry-pick #11549 to 7.0: Fix issue 11543 when key 'log' does not exist #11553

merged 2 commits into from
Mar 30, 2019

Conversation

alakahakai
Copy link

Cherry-pick of PR #11549 to 7.0 branch. Original message:

Fix issue 11543 when key 'log' does not exist

* Fix panic in add_kubernetes_metadata processor when key `log` does not exist. {issue}11543[11543]

(cherry picked from commit aba44a8)
@@ -42,6 +42,8 @@ https://github.com/elastic/beats/compare/v7.0.0-rc1...master[Check the HEAD diff
*Filebeat*

- Don't apply multiline rules in Logstash json logs. {pull}11346[11346]
- Fix coredns image in docs.asciidoc for docs build. {pull}11460[11460] {pull}11461[11461]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor issue with the cherry-pick. It gave you more than you wanted.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting. How can the script pickup another PR? I will remove it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's caused by git and not the script.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants