Skip to content

[8.7](backport #34621) x-pack/filebeat/module/okta: fill okta.request.ip_chain.* as a flattened object#34657

Merged
efd6 merged 2 commits into8.7from
mergify/bp/8.7/pr-34621
Feb 23, 2023
Merged

[8.7](backport #34621) x-pack/filebeat/module/okta: fill okta.request.ip_chain.* as a flattened object#34657
efd6 merged 2 commits into8.7from
mergify/bp/8.7/pr-34621

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2023

This is an automatic backport of pull request #34621 done by Mergify.
Cherry-pick of 1f1868d has failed:

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

You are currently cherry-picking commit 1f1868d6b1.
  (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
	modified:   filebeat/docs/fields.asciidoc
	modified:   x-pack/filebeat/module/okta/system/_meta/fields.yml
	modified:   x-pack/filebeat/module/okta/system/ingest/pipeline.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/okta/fields.go
	both modified:   x-pack/filebeat/module/okta/system/test/okta-system-test.json.log-expected.json

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

…ned object (#34621)

Added to reflect addition in okta integration: elastic/integrations#3326

(cherry picked from commit 1f1868d)

# Conflicts:
#	x-pack/filebeat/module/okta/fields.go
#	x-pack/filebeat/module/okta/system/test/okta-system-test.json.log-expected.json
@mergify mergify bot requested a review from a team as a code owner February 23, 2023 20:11
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 23, 2023
@mergify mergify bot assigned efd6 Feb 23, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 23, 2023
@botelastic
Copy link

botelastic bot commented Feb 23, 2023

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Feb 23, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-02-23T20:37:13.172+0000

  • Duration: 73 min 30 sec

Test stats 🧪

Test Results
Failed 0
Passed 7555
Skipped 746
Total 8301

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 merged commit 2bc3489 into 8.7 Feb 23, 2023
@efd6 efd6 deleted the mergify/bp/8.7/pr-34621 branch February 23, 2023 21:51
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.

2 participants