Skip to content

[Azure] Fix azure.activitylogs.identity with a a concrete value#31170

Merged
kaiyan-sheng merged 3 commits intoelastic:mainfrom
kaiyan-sheng:azure_activity_logs
Apr 6, 2022
Merged

[Azure] Fix azure.activitylogs.identity with a a concrete value#31170
kaiyan-sheng merged 3 commits intoelastic:mainfrom
kaiyan-sheng:azure_activity_logs

Conversation

@kaiyan-sheng
Copy link
Copy Markdown
Contributor

@kaiyan-sheng kaiyan-sheng commented Apr 5, 2022 •
edited
Loading

What does this PR do?

This PR fixed azure.activitylogs.identity field with a a concrete value and tested it with a new format sample activity log.
Error log without this fix:

(status=400): {"type":"mapper_parsing_exception","reason":"object mapping for [azure.activitylogs.identity] tried to parse field [identity] as object, but found a concrete value"}, dropping event!

Also with the new format, this PR added azure.activitylogs.identity_name , azure.activitylogs.tenant_id, azure.activitylogs.level and azure.activitylogs.operation_version fields.

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.

Related issues

@kaiyan-sheng kaiyan-sheng requested review from a team as code owners April 5, 2022 22:08
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 5, 2022
@kaiyan-sheng kaiyan-sheng self-assigned this Apr 5, 2022
@kaiyan-sheng kaiyan-sheng added the Team:Cloud-Monitoring Label for the Cloud Monitoring team label Apr 5, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 5, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 5, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 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: 2022-04-05T22:10:43.752+0000

  • Duration: 73 min 29 sec

Test stats 🧪

Test Results
Failed 0
Passed 6193
Skipped 728
Total 6921

💚 Flaky test report

Tests succeeded.

🤖 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!)

@cmacknz cmacknz removed the request for review from a team April 6, 2022 13:02
sayden
sayden approved these changes Apr 6, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@sayden sayden left a comment

Choose a reason for hiding this comment

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

LGTM

@kaiyan-sheng kaiyan-sheng added backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify backport-7.17 Automated backport to the 7.17 branch with mergify labels Apr 6, 2022
@kaiyan-sheng kaiyan-sheng merged commit 0978b3c into elastic:main Apr 6, 2022
@kaiyan-sheng kaiyan-sheng deleted the azure_activity_logs branch April 6, 2022 14:55
mergify bot pushed a commit that referenced this pull request Apr 6, 2022
[Azure] Fix azure.activitylogs.identity with a a concrete value (#31170)
1cd8dc1 
(cherry picked from commit 0978b3c)

# Conflicts:
#	x-pack/filebeat/module/azure/fields.go
This was referenced Apr 6, 2022
Merged
Merged
mergify bot pushed a commit that referenced this pull request Apr 6, 2022
[Azure] Fix azure.activitylogs.identity with a a concrete value (#31170)
c526356 
(cherry picked from commit 0978b3c)
mergify bot pushed a commit that referenced this pull request Apr 6, 2022
[Azure] Fix azure.activitylogs.identity with a a concrete value (#31170)
221a1b3 
(cherry picked from commit 0978b3c)
@mergify mergify bot mentioned this pull request Apr 6, 2022
Merged
kaiyan-sheng pushed a commit that referenced this pull request Apr 6, 2022
@mergify
[Azure] Fix azure.activitylogs.identity with a a concrete value (#31170…
82754b4 
…) (#31188)

(cherry picked from commit 0978b3c)

Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
kaiyan-sheng pushed a commit that referenced this pull request Apr 6, 2022
@mergify
[7.17](backport #31170) [Azure] Fix azure.activitylogs.identity with …
41318fc 
…a a concrete value (#31187)
rdner pushed a commit that referenced this pull request Apr 7, 2022
@mergify
[8.2](backport #31170) [Azure] Fix azure.activitylogs.identity with a…
5d9514c 
… a concrete value (#31189)

[Azure] Fix azure.activitylogs.identity with a a concrete value (#31170)
(cherry picked from commit 0978b3c)

Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
@mahpatil mahpatil mentioned this pull request Apr 7, 2022
Closed
kush-elastic pushed a commit to kush-elastic/beats that referenced this pull request May 2, 2022
@kush-elastic
[Azure] Fix azure.activitylogs.identity with a a concrete value (elas…
49a9d5d 
…tic#31170)
chrisberkhout pushed a commit that referenced this pull request Jun 1, 2023
@chrisberkhout
[Azure] Fix azure.activitylogs.identity with a a concrete value (#31170)
85ddcb0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@sayden sayden sayden approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@kaiyan-sheng kaiyan-sheng

Labels

backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.1.0 Automated backport with mergify backport-v8.2.0 Automated backport with mergify Team:Cloud-Monitoring Label for the Cloud Monitoring team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Event Hub: mapper_parsing_exception in activitylogs and signinlogs

3 participants

@kaiyan-sheng @elasticmachine @sayden