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

[main](backport #41808) Correct the default filename of events-data #42035

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2024

Change 'event-data' to 'events-data' in the document.

Reference:

logfile = self.beat_name + "-events-data-" + self.today + ".ndjson"

glob := fmt.Sprintf("%s-events-data-%d*.ndjson", filepath.Join(b.tempDir, b.beatName), year)


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

* Update logging.reference.yml.tmpl
* Run `make update` to regenerate the docs

---------

Co-authored-by: Denis Rechkunov <denis.rechkunov@elastic.co>
(cherry picked from commit 9b66bb0)

# Conflicts:
#	x-pack/functionbeat/functionbeat.reference.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 13, 2024
@mergify mergify bot requested review from a team as code owners December 13, 2024 12:47
Copy link
Contributor Author

mergify bot commented Dec 13, 2024

Cherry-pick of 9b66bb0 has failed:

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

You are currently cherry-picking commit 9b66bb016e.
  (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/auditbeat.reference.yml
	modified:   filebeat/filebeat.reference.yml
	modified:   heartbeat/heartbeat.reference.yml
	modified:   libbeat/_meta/config/logging.reference.yml.tmpl
	modified:   libbeat/docs/loggingconfig.asciidoc
	modified:   metricbeat/metricbeat.reference.yml
	modified:   packetbeat/packetbeat.reference.yml
	modified:   winlogbeat/winlogbeat.reference.yml
	modified:   x-pack/auditbeat/auditbeat.reference.yml
	modified:   x-pack/filebeat/filebeat.reference.yml
	modified:   x-pack/heartbeat/heartbeat.reference.yml
	modified:   x-pack/metricbeat/metricbeat.reference.yml
	modified:   x-pack/osquerybeat/osquerybeat.reference.yml
	modified:   x-pack/packetbeat/packetbeat.reference.yml
	modified:   x-pack/winlogbeat/winlogbeat.reference.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/functionbeat/functionbeat.reference.yml

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 leehinman and khushijain21 December 13, 2024 12:47
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 13, 2024
@botelastic
Copy link

botelastic bot commented Dec 13, 2024

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

Copy link
Contributor Author

mergify bot commented Dec 13, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Dec 13, 2024
@rdner rdner added backport-skip Skip notification from the automated backport with mergify and removed backport-8.x Automated backport to the 8.x branch with mergify labels Dec 13, 2024
@rdner rdner enabled auto-merge (squash) December 13, 2024 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport backport-skip Skip notification from the automated backport with mergify 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