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 #33654) Azure Platform Logs: rename identity as identity_name when the value is a string #33957

Merged
merged 4 commits into from
Dec 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 6, 2022

This is an automatic backport of pull request #33654 done by Mergify.
Cherry-pick of ea9b0cb has failed:

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

You are currently cherry-picking commit ea9b0cb3c6.
  (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/azure/platformlogs/_meta/fields.yml
	modified:   x-pack/filebeat/module/azure/platformlogs/ingest/pipeline.yml
	new file:   x-pack/filebeat/module/azure/platformlogs/test/platformlogs-identity-raw.log
	new file:   x-pack/filebeat/module/azure/platformlogs/test/platformlogs-identity-raw.log-expected.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/azure/fields.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

@mergify mergify bot requested a review from a team as a code owner December 6, 2022 10:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 6, 2022
@mergify mergify bot assigned zmoog Dec 6, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 6, 2022
@botelastic
Copy link

botelastic bot commented Dec 6, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 6, 2022

💚 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-12-12T16:27:48.894+0000

  • Duration: 24 min 3 sec

❕ Flaky test report

No test was executed to be analysed.

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

@zmoog zmoog force-pushed the mergify/bp/7.17/pr-33654 branch 2 times, most recently from cbfd5cc to 753eca6 Compare December 6, 2022 23:02
@zmoog
Copy link
Contributor

zmoog commented Dec 7, 2022

/test

@zmoog zmoog force-pushed the mergify/bp/7.17/pr-33654 branch from 6919abe to e9677cf Compare December 7, 2022 10:40
@mergify
Copy link
Contributor Author

mergify bot commented Dec 8, 2022

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 mergify/bp/7.17/pr-33654 upstream/mergify/bp/7.17/pr-33654
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-33654

@mergify
Copy link
Contributor Author

mergify bot commented Dec 12, 2022

This pull request has not been merged yet. Could you please review and merge it @zmoog? 🙏

zmoog and others added 3 commits December 12, 2022 12:48
…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
@zmoog zmoog force-pushed the mergify/bp/7.17/pr-33654 branch from e9677cf to 40df2c1 Compare December 12, 2022 11:50
@sonarqubecloud
Copy link

Please retry analysis of this Pull-Request directly on SonarCloud.

@zmoog
Copy link
Contributor

zmoog commented Dec 12, 2022

/test

@zmoog zmoog merged commit 8edcc0b into 7.17 Dec 12, 2022
@zmoog zmoog deleted the mergify/bp/7.17/pr-33654 branch December 12, 2022 21:12
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