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

[7.17](backport #32010) Expand fields in decode_json_fields if target is set #32014

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2022

This is an automatic backport of pull request #32010 done by Mergify.
Cherry-pick of 7b99a8e has failed:

On branch mergify/bp/7.17/pr-32010
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 7b99a8ec45.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/common/jsontransform/expand.go
	both modified:   libbeat/processors/actions/decode_json_fields.go
	both modified:   libbeat/processors/actions/decode_json_fields_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

## What does this PR do?

This PR applies the settings in `expand_keys` to the event even if the target is not empty.

## Why is it important?

Previously, if target was set to anything besides `""`, `expand_keys` did not work. So you could not expand the keys of the parsed JSON if you wanted to put it under a custom field.

(cherry picked from commit 7b99a8e)

# Conflicts:
#	libbeat/common/jsontransform/expand.go
#	libbeat/processors/actions/decode_json_fields.go
#	libbeat/processors/actions/decode_json_fields_test.go
@mergify mergify bot requested a review from a team as a code owner June 21, 2022 15:30
@mergify mergify bot requested review from belimawr and removed request for a team June 21, 2022 15:30
@mergify mergify bot added the backport label Jun 21, 2022
@mergify mergify bot requested a review from faec June 21, 2022 15:30
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 21, 2022
@mergify mergify bot assigned kvch Jun 21, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 21, 2022
@botelastic
Copy link

botelastic bot commented Jun 21, 2022

This pull request doesn't have a Team:<team> label.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant