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

[8.15](backport #40359) x-pack/filebeat/input/entityanalytics/provider/internal/okta: relax profile shape #40439

Merged
merged 2 commits into from
Aug 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 6, 2024

Proposed commit message

The deserialisation of profile data was into a struct, preventing custom profile fields from being collected. So replace these types with a generic container.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #40359 done by [Mergify](https://mergify.com).

…rofile shape (#40359)

The deserialisation of profile data was into a struct, preventing custom
profile fields from being collected. So replace these types with a
generic container.

(cherry picked from commit 99c1138)

# Conflicts:
#	x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta_test.go
@mergify mergify bot requested a review from a team as a code owner August 6, 2024 02:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 6, 2024
@mergify mergify bot assigned efd6 Aug 6, 2024
Copy link
Contributor Author

mergify bot commented Aug 6, 2024

Cherry-pick of 99c1138 has failed:

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

You are currently cherry-picking commit 99c11386c3.
  (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:   x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta.go
	modified:   x-pack/filebeat/input/entityanalytics/provider/okta/statestore_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/input/entityanalytics/provider/okta/internal/okta/okta_test.go

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 6, 2024
@botelastic
Copy link

botelastic bot commented Aug 6, 2024

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

@efd6 efd6 merged commit 07c6c94 into 8.15 Aug 6, 2024
17 of 19 checks passed
@efd6 efd6 deleted the mergify/bp/8.15/pr-40359 branch August 6, 2024 04:08
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