diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-01-07 21:40:08 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-01-07 21:43:56 +0300 |
commit | 820013481a115100d5f8f22dc01aac8cc0363a23 (patch) | |
tree | 99cd46b66d5b9b97d38265d553f4fb60fee0d6a2 /meta-openbmc-mods/meta-common/recipes-extended | |
parent | 965a056096e5e043748da8766fa50cb7afedb608 (diff) | |
download | openbmc-820013481a115100d5f8f22dc01aac8cc0363a23.tar.xz |
Update to internal 2020-01-07
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-extended')
6 files changed, 0 insertions, 143 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.service deleted file mode 100644 index fdeefd417..000000000 --- a/meta-openbmc-mods/meta-common/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-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rotate-event-logs.timer deleted file mode 100644 index 148f8e4ae..000000000 --- a/meta-openbmc-mods/meta-common/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-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf deleted file mode 100644 index 14bcc0781..000000000 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog-override.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecReload=/bin/kill -HUP $MAINPID diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf deleted file mode 100644 index 46a287eef..000000000 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.conf +++ /dev/null @@ -1,79 +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 IPMI SEL messages -# "<timestamp> <ID>,<Type>,<EventData>,[<Generator ID>,<Path>,<Direction>]" -template(name="IPMISELTemplate" type="list") { - property(name="timereported" dateFormat="rfc3339") - constant(value=" ") - property(name="$!IPMI_SEL_RECORD_ID") - constant(value=",") - property(name="$!IPMI_SEL_RECORD_TYPE") - constant(value=",") - property(name="$!IPMI_SEL_DATA") - constant(value=",") - property(name="$!IPMI_SEL_GENERATOR_ID") - constant(value=",") - property(name="$!IPMI_SEL_SENSOR_PATH") - constant(value=",") - property(name="$!IPMI_SEL_EVENT_DIR") - constant(value="\n") -} - -# Template for Redfish messages -# "<timestamp> <MessageId>,<MessageArgs>" -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") -} - -# Template for Application Crashes -# "<timestamp> <MessageId>,<MessageArgs>" -template(name="CrashTemplate" type="list") { - property(name="timereported" dateFormat="rfc3339") - constant(value=" ") - constant(value="OpenBMC.0.1.ServiceFailure") - constant(value=",") - property(name="$!UNIT") - constant(value="\n") -} - - -# If the journal entry has the IPMI SEL MESSAGE_ID, save as IPMI SEL -# The MESSAGE_ID string is generated using journalctl and must match the -# MESSAGE_ID used in IPMI to correctly find the SEL entries. -if ($!MESSAGE_ID == "b370836ccf2f4850ac5bee185b77893a") 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") -} - -# If the journal entry has a Exit Code, save as a Redfish event -if ($!EXIT_STATUS != "" and $!EXIT_STATUS != "0") then { - action(type="omfile" file="/var/log/redfish" template="CrashTemplate") -} - -# -# Include all config files in /etc/rsyslog.d/ -# -$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate deleted file mode 100644 index a6ba28d86..000000000 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ /dev/null @@ -1,22 +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 -} -# Keep up to four 64k files for redfish (256k total) -/var/log/redfish -{ - rotate 3 - size 64k - missingok - postrotate - systemctl reload rsyslog 2> /dev/null || true - endscript -} diff --git a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend deleted file mode 100644 index ef670451e..000000000 --- a/meta-openbmc-mods/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://rsyslog.conf \ - file://rsyslog.logrotate \ - file://rotate-event-logs.service \ - file://rotate-event-logs.timer \ - file://rsyslog-override.conf \ -" - -FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" - -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} - install -d ${D}${systemd_system_unitdir}/rsyslog.service.d - install -m 0644 ${WORKDIR}/rsyslog-override.conf \ - ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf - rm -f ${D}${sysconfdir}/rsyslog.d/imjournal.conf -} - -SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service rotate-event-logs.timer" |