From 3b0b3749d62cef07275b67a07bc38208e95b1936 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 31 Aug 2021 13:28:37 -0500 Subject: meta-facebook: move rsyslog redfish config from tiogapass The rsyslog configuration previously done in tiogapass is necessary for Redfish event logs. Move this to be used by all machines. Signed-off-by: Patrick Williams Change-Id: Ib2315287b17ee68ba18a24c9f67f7446ead9b65a --- .../rsyslog/rsyslog/rotate-event-logs.service | 9 ---- .../rsyslog/rsyslog/rotate-event-logs.timer | 8 ---- .../recipes-extended/rsyslog/rsyslog/rsyslog.conf | 51 ---------------------- .../rsyslog/rsyslog/rsyslog.logrotate | 12 ----- .../recipes-extended/rsyslog/rsyslog_%.bbappend | 17 -------- .../rsyslog/rsyslog/rotate-event-logs.service | 9 ++++ .../rsyslog/rsyslog/rotate-event-logs.timer | 8 ++++ .../recipes-extended/rsyslog/rsyslog/rsyslog.conf | 51 ++++++++++++++++++++++ .../rsyslog/rsyslog/rsyslog.logrotate | 12 +++++ .../recipes-extended/rsyslog/rsyslog_%.bbappend | 17 ++++++++ 10 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service delete mode 100644 meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer delete mode 100644 meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.conf delete mode 100644 meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate delete mode 100644 meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend create mode 100644 meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service create mode 100644 meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer create mode 100644 meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf create mode 100644 meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate create mode 100644 meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend (limited to 'meta-facebook') diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service deleted file mode 100644 index fdeefd417b..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Rotates the event logs - -[Service] -Type=oneshot -ExecStart=/usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog - -[Install] -WantedBy=multi-user.target diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer deleted file mode 100644 index 148f8e4ae5..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run rotate-event-logs.service every minute - -[Timer] -OnCalendar=*-*-* *:*:00 - -[Install] -WantedBy=timers.target diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.conf deleted file mode 100644 index 5a85aadb59..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ /dev/null @@ -1,51 +0,0 @@ -# if you experience problems, check -# http://www.rsyslog.com/troubleshoot for assistance - -# rsyslog v3: load input modules -# If you do not load inputs, nothing happens! -# You may need to set the module load path if modules are not found. -# -# Ported from debian's sysklogd.conf - -# Journal-style logging -# Limit to no more than 2000 entries in one minute and enable the -# journal workaround to avoid duplicate entries -module(load="imjournal" StateFile="/var/log/state" - RateLimit.Interval="60" - RateLimit.Burst="2000") - -# Template for Redfish messages -# " ," -template(name="IPMISELTemplate" type="list") { - property(name="timereported" dateFormat="rfc3339") - constant(value=" ") - property(name="$!IPMISEL_MESSAGE_ID") - constant(value=", ") - property(name="$!IPMISEL_MESSAGE_ARGS") - constant(value="\n") -} - -# Template for Redfish messages -# " ," -template(name="RedfishTemplate" type="list") { - property(name="timereported" dateFormat="rfc3339") - constant(value=" ") - property(name="$!REDFISH_MESSAGE_ID") - constant(value=",") - property(name="$!REDFISH_MESSAGE_ARGS") - constant(value="\n") -} - -# If the journal entry has a IPMI SEL MESSAGE_ID, save as IPMI SEL -if ($!IPMISEL_MESSAGE_ID != "") then { - action(type="omfile" file="/var/log/ipmi_sel" template="IPMISELTemplate") -} - -# If the journal entry has a Redfish MessageId, save as a Redfish event -if ($!REDFISH_MESSAGE_ID != "") then { - action(type="omfile" file="/var/log/redfish" template="RedfishTemplate") -} -# -# Include all config files in /etc/rsyslog.d/ -# -$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate deleted file mode 100644 index 9eddafa137..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ /dev/null @@ -1,12 +0,0 @@ -# /etc/logrotate.d/rsyslog - Ported from Debian - -# Keep up to four 64k files for ipmi_sel (256k total) -/var/log/ipmi_sel -{ - rotate 3 - size 64k - missingok - postrotate - systemctl reload rsyslog 2> /dev/null || true - endscript -} diff --git a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend deleted file mode 100644 index 104d13b4a3..0000000000 --- a/meta-facebook/meta-tiogapass/recipes-extended/rsyslog/rsyslog_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://rsyslog.conf \ - file://rsyslog.logrotate \ - file://rotate-event-logs.service \ - file://rotate-event-logs.timer \ -" - -PACKAGECONFIG:append = " imjournal" - -do_install:append() { - install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} - rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf -} - -SYSTEMD_SERVICE:${PN} += " rotate-event-logs.service rotate-event-logs.timer" diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service new file mode 100644 index 0000000000..fdeefd417b --- /dev/null +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service @@ -0,0 +1,9 @@ +[Unit] +Description=Rotates the event logs + +[Service] +Type=oneshot +ExecStart=/usr/sbin/logrotate /etc/logrotate.d/logrotate.rsyslog + +[Install] +WantedBy=multi-user.target diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer new file mode 100644 index 0000000000..148f8e4ae5 --- /dev/null +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Run rotate-event-logs.service every minute + +[Timer] +OnCalendar=*-*-* *:*:00 + +[Install] +WantedBy=timers.target diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf new file mode 100644 index 0000000000..5a85aadb59 --- /dev/null +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.conf @@ -0,0 +1,51 @@ +# if you experience problems, check +# http://www.rsyslog.com/troubleshoot for assistance + +# rsyslog v3: load input modules +# If you do not load inputs, nothing happens! +# You may need to set the module load path if modules are not found. +# +# Ported from debian's sysklogd.conf + +# Journal-style logging +# Limit to no more than 2000 entries in one minute and enable the +# journal workaround to avoid duplicate entries +module(load="imjournal" StateFile="/var/log/state" + RateLimit.Interval="60" + RateLimit.Burst="2000") + +# Template for Redfish messages +# " ," +template(name="IPMISELTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + property(name="$!IPMISEL_MESSAGE_ID") + constant(value=", ") + property(name="$!IPMISEL_MESSAGE_ARGS") + constant(value="\n") +} + +# Template for Redfish messages +# " ," +template(name="RedfishTemplate" type="list") { + property(name="timereported" dateFormat="rfc3339") + constant(value=" ") + property(name="$!REDFISH_MESSAGE_ID") + constant(value=",") + property(name="$!REDFISH_MESSAGE_ARGS") + constant(value="\n") +} + +# If the journal entry has a IPMI SEL MESSAGE_ID, save as IPMI SEL +if ($!IPMISEL_MESSAGE_ID != "") then { + action(type="omfile" file="/var/log/ipmi_sel" template="IPMISELTemplate") +} + +# If the journal entry has a Redfish MessageId, save as a Redfish event +if ($!REDFISH_MESSAGE_ID != "") then { + action(type="omfile" file="/var/log/redfish" template="RedfishTemplate") +} +# +# Include all config files in /etc/rsyslog.d/ +# +$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate new file mode 100644 index 0000000000..9eddafa137 --- /dev/null +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -0,0 +1,12 @@ +# /etc/logrotate.d/rsyslog - Ported from Debian + +# Keep up to four 64k files for ipmi_sel (256k total) +/var/log/ipmi_sel +{ + rotate 3 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} diff --git a/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend new file mode 100644 index 0000000000..104d13b4a3 --- /dev/null +++ b/meta-facebook/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -0,0 +1,17 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://rsyslog.conf \ + file://rsyslog.logrotate \ + file://rotate-event-logs.service \ + file://rotate-event-logs.timer \ +" + +PACKAGECONFIG:append = " imjournal" + +do_install:append() { + install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/rotate-event-logs.timer ${D}${systemd_system_unitdir} + rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf +} + +SYSTEMD_SERVICE:${PN} += " rotate-event-logs.service rotate-event-logs.timer" -- cgit v1.2.3