Azure Platform Logs: rename identity as identity_name when the value is a string #33654

zmoog · 2022-11-11T15:53:57Z

What does this PR do?

If the identity field comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object.

Why is it important?

The identity field comes in different flavors: depending on the specific log category, it can be an object or a string.

We can avoid conflicts in a well-known field by renaming it according to its type.

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.
I have added a backport label, if appropriate.

Related issues

Relates [Azure Logs] mapper_parsing_exception while parsing field [identity] integrations#4627

mergify · 2022-11-11T15:54:32Z

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @zmoog? 🙏.
For such, you'll need to label your PR with:

The upcoming major version of the Elastic Stack
The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

elasticmachine · 2022-11-11T16:32:30Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-12-05T18:21:56.368+0000
Duration: 75 min 21 sec

Test stats 🧪

Test	Results
Failed	0
Passed	7134
Skipped	738
Total	7872

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

kaiyan-sheng

need a changelog?

zmoog · 2022-11-17T09:05:57Z

need a changelog?

Yeah, definitely.

mergify · 2022-12-01T19:25:25Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b zmoog/identity-for-platform-logs upstream/zmoog/identity-for-platform-logs
git merge upstream/main
git push upstream zmoog/identity-for-platform-logs

The identity field comes in different flavours, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object.

I am not setting up this test in the right way

Improves readability as it usually is the last element of the processor definition.

sonarqubecloud · 2022-12-05T18:29:05Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

…is a string (#33654) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object. (cherry picked from commit ea9b0cb)

…is a string (#33654) (#33959) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object. (cherry picked from commit ea9b0cb) Co-authored-by: Maurizio Branca <[email protected]>

…is a string (#33654) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object. (cherry picked from commit ea9b0cb) # Conflicts: # x-pack/filebeat/module/azure/fields.go

…ty_name when the value is a string (#33958) * Azure Platform Logs: rename identity as identity_name when the value is a string (#33654) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object. (cherry picked from commit ea9b0cb) * Remove extra changelog entries Co-authored-by: Maurizio Branca <[email protected]>

…is a string (#33654) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object. (cherry picked from commit ea9b0cb) # Conflicts: # x-pack/filebeat/module/azure/fields.go

…ity_name when the value is a string (#33957) * Azure Platform Logs: rename identity as identity_name when the value is a string (#33654) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object. (cherry picked from commit ea9b0cb) # Conflicts: # x-pack/filebeat/module/azure/fields.go * Remove extra entries in changelog * Update fields.go * Remove extra entries in changelog Co-authored-by: Maurizio Branca <[email protected]> Co-authored-by: Maurizio Branca <[email protected]>

…is a string (#33654) * Rename identity as identity_name when is a string The identity field comes in different flavors, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object.

zmoog added bug Team:Cloud-Monitoring Label for the Cloud Monitoring team labels Nov 11, 2022

zmoog self-assigned this Nov 11, 2022

botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Nov 11, 2022

zmoog force-pushed the zmoog/identity-for-platform-logs branch from ebee8fd to ce10c7c Compare November 11, 2022 16:25

zmoog changed the title ~~Rename identity as identity_name when is a string~~ Azure Platform Logs: rename identity as identity_name when the value is a string Nov 11, 2022

zmoog added backport-7.17 Automated backport to the 7.17 branch with mergify backport-v8.5.0 Automated backport with mergify labels Nov 11, 2022

zmoog force-pushed the zmoog/identity-for-platform-logs branch 2 times, most recently from 3e79a47 to 4ff070d Compare November 13, 2022 08:12

zmoog marked this pull request as ready for review November 16, 2022 12:50

zmoog requested a review from a team as a code owner November 16, 2022 12:50

zmoog force-pushed the zmoog/identity-for-platform-logs branch from 57b4acc to 727cc75 Compare November 16, 2022 12:51

kaiyan-sheng approved these changes Nov 16, 2022

View reviewed changes

zmoog added the backport-v8.6.0 Automated backport with mergify label Nov 17, 2022

zmoog force-pushed the zmoog/identity-for-platform-logs branch 2 times, most recently from a427c0d to fc978ce Compare November 17, 2022 09:23

kaiyan-sheng approved these changes Nov 17, 2022

View reviewed changes

zmoog added 7 commits December 5, 2022 19:20

Rename identity as identity_name when is a string

1605c05

The identity field comes in different flavours, depending on the specific log category. If it comes as a string, the pipeline renames it as identity_name to avoid collisions when the value is an object.

Fix expected test result format

009c2bb

Fix expected result (again)

7e1d763

Update test

d02ffae

I am not setting up this test in the right way

Move if as last element of the processor def

1114a89

Improves readability as it usually is the last element of the processor definition.

Fix event.original 🤦‍♂️

caf56c5

Update changelog

fd50989

zmoog force-pushed the zmoog/identity-for-platform-logs branch from fc978ce to fd50989 Compare December 5, 2022 18:21

zmoog merged commit ea9b0cb into elastic:main Dec 6, 2022

zmoog deleted the zmoog/identity-for-platform-logs branch December 6, 2022 10:13

mergify bot mentioned this pull request Dec 6, 2022

[7.17](backport #33654) Azure Platform Logs: rename identity as identity_name when the value is a string #33957

Merged

mergify bot mentioned this pull request Dec 6, 2022

[8.5](backport #33654) Azure Platform Logs: rename identity as identity_name when the value is a string #33958

Merged

mergify bot mentioned this pull request Dec 6, 2022

[8.6](backport #33654) Azure Platform Logs: rename identity as identity_name when the value is a string #33959

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Azure Platform Logs: rename identity as identity_name when the value is a string #33654

Azure Platform Logs: rename identity as identity_name when the value is a string #33654

zmoog commented Nov 11, 2022 •

edited

Loading

mergify bot commented Nov 11, 2022

elasticmachine commented Nov 11, 2022 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

kaiyan-sheng left a comment

zmoog commented Nov 17, 2022

mergify bot commented Dec 1, 2022

sonarqubecloud bot commented Dec 5, 2022

Azure Platform Logs: rename identity as identity_name when the value is a string #33654

Azure Platform Logs: rename identity as identity_name when the value is a string #33654

Conversation

zmoog commented Nov 11, 2022 • edited Loading

What does this PR do?

Why is it important?

Checklist

Related issues

mergify bot commented Nov 11, 2022

elasticmachine commented Nov 11, 2022 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

kaiyan-sheng left a comment

Choose a reason for hiding this comment

zmoog commented Nov 17, 2022

mergify bot commented Dec 1, 2022

sonarqubecloud bot commented Dec 5, 2022

zmoog commented Nov 11, 2022 •

edited

Loading

elasticmachine commented Nov 11, 2022 •

edited by jenkins-beats-ci bot

Loading