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.13](backport #3823) Add a new section on how to collect CloudTrail events using Amazon Data Firehose #3883

Merged
merged 2 commits into from
May 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

This tutorial has reached a pretty stable status and is ready to be reviewed.

Doc preview.

Relates to #3819


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

…ta Firehose (#3823)

* Remove screenshots and adjust text accordingly

* Test the structure

* Add more steps

* Add draft content from public notes

* Fix text and structure 1

* Fix images

* Fix text and structure 2

* Fix text and structure 3

* Fix text and structure 4

* Fix text and structure 5

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Update docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Co-authored-by: Brandon Morelli <[email protected]>

* Fix headings

* Integrate reviewer's feedback

* Remove link

* Update step 1

---------

Co-authored-by: Maurizio Branca <[email protected]>
Co-authored-by: Brandon Morelli <[email protected]>
(cherry picked from commit ec22304)

# Conflicts:
#	docs/en/observability/cloud-monitoring/aws/monitor-aws-agent.asciidoc
@mergify mergify bot requested a review from a team as a code owner May 13, 2024 11:19
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of ec22304 has failed:

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

You are currently cherry-picking commit ec223045.
  (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:
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-cloudtrail-cloudwatch.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-cloudtrail-dashboard.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-cloudtrail-discover.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-cloudtrail-logsexplorer.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-delivery-stream.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-failed-delivery-stream.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-monitor-cloudtrail-logs.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-subscription-filter.png
	new file:   docs/en/observability/cloud-monitoring/aws/images/firehose-verify-events-cloudwatch.png
	modified:   docs/en/observability/cloud-monitoring/aws/monitor-amazon-intro.asciidoc
	new file:   docs/en/observability/cloud-monitoring/aws/monitor-aws-cloudtrail-firehose.asciidoc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/observability/cloud-monitoring/aws/monitor-aws-agent.asciidoc

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

Copy link
Contributor

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@bmorelli25
Copy link
Member

@mergify update

@bmorelli25
Copy link
Member

@mergify rebase

Copy link
Contributor Author

mergify bot commented May 15, 2024

update

☑️ Nothing to do

  • -conflict [📌 update requirement]
  • #commits-behind>0 [📌 update requirement]
  • -closed [📌 update requirement]
  • queue-position=-1 [📌 update requirement]

Copy link
Contributor Author

mergify bot commented May 15, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]
  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

Copy link
Contributor Author

mergify bot commented May 15, 2024

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
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/8.13/pr-3823 upstream/mergify/bp/8.13/pr-3823
git merge upstream/8.13
git push upstream mergify/bp/8.13/pr-3823

@bmorelli25
Copy link
Member

@mergify update

Copy link
Contributor Author

mergify bot commented May 15, 2024

update

☑️ Nothing to do

  • #commits-behind>0 [📌 update requirement]
  • -closed [📌 update requirement]
  • -conflict [📌 update requirement]
  • queue-position=-1 [📌 update requirement]

@bmorelli25
Copy link
Member

@mergify refresh

Copy link
Contributor Author

mergify bot commented May 15, 2024

refresh

✅ Pull request refreshed

@bmorelli25 bmorelli25 enabled auto-merge (squash) May 15, 2024 18:01
@bmorelli25 bmorelli25 removed the conflicts There is a conflict in the backported pull request label May 15, 2024
@bmorelli25 bmorelli25 merged commit 2c4f9d0 into 8.13 May 15, 2024
3 checks passed
@bmorelli25 bmorelli25 deleted the mergify/bp/8.13/pr-3823 branch May 15, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants