From 653fc808713d4bc40a7b03c6790dfe033266363d Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:03:52 +0000 Subject: [PATCH] [main](backport #41808) Correct the default filename of events-data (#42035) * Correct the default filename of events-data (#41808) * Update logging.reference.yml.tmpl * Run `make update` to regenerate the docs --------- Co-authored-by: Denis Rechkunov (cherry picked from commit 9b66bb016e6895e33207844e4130848e32a1a63a) # Conflicts: # x-pack/functionbeat/functionbeat.reference.yml * Delete x-pack/functionbeat/functionbeat.reference.yml --------- Co-authored-by: Agent Fitz ;-) Co-authored-by: Denis --- auditbeat/auditbeat.reference.yml | 2 +- filebeat/filebeat.reference.yml | 2 +- heartbeat/heartbeat.reference.yml | 2 +- libbeat/_meta/config/logging.reference.yml.tmpl | 2 +- libbeat/docs/loggingconfig.asciidoc | 2 +- metricbeat/metricbeat.reference.yml | 2 +- packetbeat/packetbeat.reference.yml | 2 +- winlogbeat/winlogbeat.reference.yml | 2 +- x-pack/auditbeat/auditbeat.reference.yml | 2 +- x-pack/filebeat/filebeat.reference.yml | 2 +- x-pack/heartbeat/heartbeat.reference.yml | 2 +- x-pack/metricbeat/metricbeat.reference.yml | 2 +- x-pack/osquerybeat/osquerybeat.reference.yml | 2 +- x-pack/packetbeat/packetbeat.reference.yml | 2 +- x-pack/winlogbeat/winlogbeat.reference.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/auditbeat/auditbeat.reference.yml b/auditbeat/auditbeat.reference.yml index 8f684d78d03..9d4919eb24f 100644 --- a/auditbeat/auditbeat.reference.yml +++ b/auditbeat/auditbeat.reference.yml @@ -1573,7 +1573,7 @@ logging.files: #path: /var/log/auditbeat # The name of the files where the logs are written to. - #name: auditbeat-event-data + #name: auditbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index b10864bdff8..ba828e72de2 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -2728,7 +2728,7 @@ logging.files: #path: /var/log/filebeat # The name of the files where the logs are written to. - #name: filebeat-event-data + #name: filebeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/heartbeat/heartbeat.reference.yml b/heartbeat/heartbeat.reference.yml index 3632ce12bbd..80272414cbf 100644 --- a/heartbeat/heartbeat.reference.yml +++ b/heartbeat/heartbeat.reference.yml @@ -1660,7 +1660,7 @@ logging.files: #path: /var/log/heartbeat # The name of the files where the logs are written to. - #name: heartbeat-event-data + #name: heartbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/libbeat/_meta/config/logging.reference.yml.tmpl b/libbeat/_meta/config/logging.reference.yml.tmpl index e0921d0ff82..612b6d5aa2d 100644 --- a/libbeat/_meta/config/logging.reference.yml.tmpl +++ b/libbeat/_meta/config/logging.reference.yml.tmpl @@ -92,7 +92,7 @@ logging.files: #path: /var/log/{{.BeatName}} # The name of the files where the logs are written to. - #name: {{.BeatName}}-event-data + #name: {{.BeatName}}-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/libbeat/docs/loggingconfig.asciidoc b/libbeat/docs/loggingconfig.asciidoc index c9bb5344046..dd3a7081171 100644 --- a/libbeat/docs/loggingconfig.asciidoc +++ b/libbeat/docs/loggingconfig.asciidoc @@ -320,7 +320,7 @@ the <> section for details. [float] ==== `logging.event_data.files.name` -The name of the file that logs are written to. The default is '{beatname_lc}'-event-data. +The name of the file that logs are written to. The default is '{beatname_lc}'-events-data. [float] ==== `logging.event_data.files.rotateeverybytes` diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 7c36aa15743..767d947670e 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -2497,7 +2497,7 @@ logging.files: #path: /var/log/metricbeat # The name of the files where the logs are written to. - #name: metricbeat-event-data + #name: metricbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/packetbeat/packetbeat.reference.yml b/packetbeat/packetbeat.reference.yml index 7041e79ea74..1bbcb7c3325 100644 --- a/packetbeat/packetbeat.reference.yml +++ b/packetbeat/packetbeat.reference.yml @@ -2039,7 +2039,7 @@ logging.files: #path: /var/log/packetbeat # The name of the files where the logs are written to. - #name: packetbeat-event-data + #name: packetbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/winlogbeat/winlogbeat.reference.yml b/winlogbeat/winlogbeat.reference.yml index 47a61d36faf..4082b1964e3 100644 --- a/winlogbeat/winlogbeat.reference.yml +++ b/winlogbeat/winlogbeat.reference.yml @@ -1450,7 +1450,7 @@ logging.files: #path: /var/log/winlogbeat # The name of the files where the logs are written to. - #name: winlogbeat-event-data + #name: winlogbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index 191c993d6d7..dd3655c8f72 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -1637,7 +1637,7 @@ logging.files: #path: /var/log/auditbeat # The name of the files where the logs are written to. - #name: auditbeat-event-data + #name: auditbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index eeb3770e8fe..953ac8c8bb8 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -4657,7 +4657,7 @@ logging.files: #path: /var/log/filebeat # The name of the files where the logs are written to. - #name: filebeat-event-data + #name: filebeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/heartbeat/heartbeat.reference.yml b/x-pack/heartbeat/heartbeat.reference.yml index 3632ce12bbd..80272414cbf 100644 --- a/x-pack/heartbeat/heartbeat.reference.yml +++ b/x-pack/heartbeat/heartbeat.reference.yml @@ -1660,7 +1660,7 @@ logging.files: #path: /var/log/heartbeat # The name of the files where the logs are written to. - #name: heartbeat-event-data + #name: heartbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index dd246a62941..3cfc78380b2 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -3128,7 +3128,7 @@ logging.files: #path: /var/log/metricbeat # The name of the files where the logs are written to. - #name: metricbeat-event-data + #name: metricbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/osquerybeat/osquerybeat.reference.yml b/x-pack/osquerybeat/osquerybeat.reference.yml index 7e8ccd5e842..16c879aabc5 100644 --- a/x-pack/osquerybeat/osquerybeat.reference.yml +++ b/x-pack/osquerybeat/osquerybeat.reference.yml @@ -1007,7 +1007,7 @@ logging.files: #path: /var/log/osquerybeat # The name of the files where the logs are written to. - #name: osquerybeat-event-data + #name: osquerybeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/packetbeat/packetbeat.reference.yml b/x-pack/packetbeat/packetbeat.reference.yml index 7041e79ea74..1bbcb7c3325 100644 --- a/x-pack/packetbeat/packetbeat.reference.yml +++ b/x-pack/packetbeat/packetbeat.reference.yml @@ -2039,7 +2039,7 @@ logging.files: #path: /var/log/packetbeat # The name of the files where the logs are written to. - #name: packetbeat-event-data + #name: packetbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated. diff --git a/x-pack/winlogbeat/winlogbeat.reference.yml b/x-pack/winlogbeat/winlogbeat.reference.yml index 96e912ea41c..7fedac68804 100644 --- a/x-pack/winlogbeat/winlogbeat.reference.yml +++ b/x-pack/winlogbeat/winlogbeat.reference.yml @@ -1452,7 +1452,7 @@ logging.files: #path: /var/log/winlogbeat # The name of the files where the logs are written to. - #name: winlogbeat-event-data + #name: winlogbeat-events-data # Configure log file size limit. If the limit is reached, log file will be # automatically rotated.