Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2025

Contributes to elastic/docs-content#1734, elastic/docs-content#1801

Replaces placeholder URLs with those reserved by the Internet Engineering Task Force (IETF) in RFC 2606 and RFC 6761 (e.g. example.com, example.net, example.org, example.edu, .example).


This is an automatic backport of pull request #46303 done by Mergify.

(cherry picked from commit 51c3ca9)

# Conflicts:
#	winlogbeat/include/fields.go
#	x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
#	x-pack/filebeat/docs/inputs/input-streaming.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 29, 2025
@mergify mergify bot requested a review from a team as a code owner August 29, 2025 14:36
@mergify mergify bot added the backport label Aug 29, 2025
@mergify mergify bot requested review from a team as code owners August 29, 2025 14:36
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Aug 29, 2025
@mergify mergify bot requested review from a team as code owners August 29, 2025 14:36
@mergify
Copy link
Contributor Author

mergify bot commented Aug 29, 2025

Cherry-pick of 51c3ca9 has failed:

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

You are currently cherry-picking commit 51c3ca9bc.
  (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:   auditbeat/docs/fields.asciidoc
	modified:   auditbeat/include/fields.go
	modified:   filebeat/docs/fields.asciidoc
	modified:   filebeat/include/fields.go
	modified:   heartbeat/docs/fields.asciidoc
	modified:   heartbeat/docs/monitors/monitor-http.asciidoc
	modified:   heartbeat/include/fields.go
	modified:   libbeat/_meta/fields.ecs.yml
	modified:   libbeat/docs/shared-ssl-logstash-config.asciidoc
	modified:   metricbeat/docs/fields.asciidoc
	modified:   metricbeat/include/fields/fields.go
	modified:   packetbeat/docs/fields.asciidoc
	modified:   packetbeat/include/fields.go
	modified:   winlogbeat/docs/fields.asciidoc
	modified:   x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
	modified:   x-pack/filebeat/processors/decode_cef/_meta/fields.yml
	modified:   x-pack/filebeat/processors/decode_cef/fields.go
	modified:   x-pack/heartbeat/include/fields.go
	modified:   x-pack/osquerybeat/docs/fields.asciidoc
	modified:   x-pack/osquerybeat/include/fields.go
	modified:   x-pack/winlogbeat/module/sysmon/ingest/sysmon.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   winlogbeat/include/fields.go
	both modified:   x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
	both modified:   x-pack/filebeat/docs/inputs/input-streaming.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

@mergify mergify bot requested review from mauri870 and rdner and removed request for a team August 29, 2025 14:36
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 29, 2025
@botelastic
Copy link

botelastic bot commented Aug 29, 2025

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

@mergify mergify bot deleted the mergify/bp/8.16/pr-46303 branch August 29, 2025 19:44
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