ffdc: Fix config to enhance messaging.
- Fix config to enhance messaging when command exit code is not zero.
- Add ipmitool option '-I lanplus' to all ipmitool command.
Test:
- Regresstion tested.
Signed-off-by: Peter D Phan <peterp@us.ibm.com>
Change-Id: Iafd10f4b8ac9c23db77e7ca1026eb885cb5e1f6e
diff --git a/ffdc/ffdc_config.yaml b/ffdc/ffdc_config.yaml
index 93ffae2..8471733 100644
--- a/ffdc/ffdc_config.yaml
+++ b/ffdc/ffdc_config.yaml
@@ -18,25 +18,25 @@
GENERAL:
COMMANDS:
- 'rm -rf /tmp/OPENBMC_general.txt'
- - 'echo "++++++++++ cat /etc/os-release ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - 'cat /etc/os-release >> /tmp/OPENBMC_general.txt 2>&1'
- - 'echo -e "\n++++++++++ cat /etc/timestamp ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - 'cat /etc/timestamp >> /tmp/OPENBMC_general.txt 2>&1'
- - 'echo -e "\n++++++++++ uname -a ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
+ - 'echo "++++++++++ cat /etc/os-release ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - 'cat /etc/os-release >> /tmp/OPENBMC_general.txt'
+ - 'echo -e "\n++++++++++ cat /etc/timestamp ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - 'cat /etc/timestamp >> /tmp/OPENBMC_general.txt'
+ - 'echo -e "\n++++++++++ uname -a ++++++++++" >> /tmp/OPENBMC_general.txt'
- 'uname -a >> /tmp/OPENBMC_general.txt'
- - 'echo -e "\n++++++++++ cat /etc/timestamp ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - 'cat /etc/timestamp >> /tmp/OPENBMC_general.txt 2>&1'
- - 'echo -e "\n++++++++++ uptime;cat /proc/uptime ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - 'uptime >> /tmp/OPENBMC_general.txt 2>&1'
- - 'cat /proc/uptime >> /tmp/OPENBMC_general.txt 2>&1'
- - 'echo -e "\n++++++++++ df -hT ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - 'df -hT >> /tmp/OPENBMC_general.txt 2>&1'
- - 'echo -e "\n++++++++++ date;/sbin/hwclock --show ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - 'date >> /tmp/OPENBMC_general.txt 2>&1'
- - '/sbin/hwclock --show >> /tmp/OPENBMC_general.txt 2>&1'
- - '/usr/bin/timedatectl >> /tmp/OPENBMC_general.txt 2>&1'
- - 'echo -e "\n++++++++++ /usr/bin/obmcutil state ++++++++++" >> /tmp/OPENBMC_general.txt 2>&1'
- - '/usr/bin/obmcutil state >> /tmp/OPENBMC_general.txt 2>&1'
+ - 'echo -e "\n++++++++++ cat /etc/timestamp ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - 'cat /etc/timestamp >> /tmp/OPENBMC_general.txt'
+ - 'echo -e "\n++++++++++ uptime;cat /proc/uptime ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - 'uptime >> /tmp/OPENBMC_general.txt'
+ - 'cat /proc/uptime >> /tmp/OPENBMC_general.txt'
+ - 'echo -e "\n++++++++++ df -hT ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - 'df -hT >> /tmp/OPENBMC_general.txt'
+ - 'echo -e "\n++++++++++ date;/sbin/hwclock --show ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - 'date >> /tmp/OPENBMC_general.txt'
+ - '/sbin/hwclock --show >> /tmp/OPENBMC_general.txt'
+ - '/usr/bin/timedatectl >> /tmp/OPENBMC_general.txt'
+ - 'echo -e "\n++++++++++ /usr/bin/obmcutil state ++++++++++" >> /tmp/OPENBMC_general.txt'
+ - '/usr/bin/obmcutil state >> /tmp/OPENBMC_general.txt'
FILES:
- '/tmp/OPENBMC_general.txt'
PROTOCOL:
@@ -44,22 +44,22 @@
OPENBMC_LOGS:
COMMANDS:
- - 'cat /sys/class/watchdog/watchdog1/bootstatus >/tmp/BMC_flash_side.txt 2>&1'
- - 'grep -r . /sys/class/hwmon/* >/tmp/BMC_hwmon.txt 2>&1'
- - 'top -n 1 -b >/tmp/BMC_proc_list.txt 2>&1'
- - 'ls -Al /proc/*/fd/ >/tmp/BMC_proc_fd_active_list.txt 2>&1'
- - 'journalctl --no-pager >/tmp/BMC_journalctl_nopager.txt 2>&1'
- - 'journalctl -o json-pretty >/tmp/BMC_journalctl_pretty.json 2>&1'
- - 'dmesg >/tmp/BMC_dmesg.txt 2>&1'
- - 'cat /proc/cpuinfo >/tmp/BMC_procinfo.txt 2>&1'
- - 'cat /proc/meminfo >/tmp/BMC_meminfo.txt 2>&1'
- - 'systemctl status --all >/tmp/BMC_systemd.txt 2>&1'
- - 'systemctl list-units --failed >/tmp/BMC_failed_service.txt 2>&1'
- - 'systemctl list-jobs >/tmp/BMC_list_service.txt 2>&1'
- - 'cat /var/log/obmc-console.log >/tmp/BMC_obmc_console.txt 2>&1'
- - 'cat /var/log/obmc-console1.log >/tmp/BMC_obmc_console1.txt 2>&1'
- - 'peltool -l >/tmp/PEL_logs_list.json 2>&1'
- - 'peltool -a >/tmp/PEL_logs_display.json 2>&1'
+ - 'cat /sys/class/watchdog/watchdog1/bootstatus >/tmp/BMC_flash_side.txt'
+ - 'grep -r . /sys/class/hwmon/* >/tmp/BMC_hwmon.txt'
+ - 'top -n 1 -b >/tmp/BMC_proc_list.txt'
+ - 'ls -Al /proc/*/fd/ >/tmp/BMC_proc_fd_active_list.txt'
+ - 'journalctl --no-pager >/tmp/BMC_journalctl_nopager.txt'
+ - 'journalctl -o json-pretty >/tmp/BMC_journalctl_pretty.json'
+ - 'dmesg >/tmp/BMC_dmesg.txt'
+ - 'cat /proc/cpuinfo >/tmp/BMC_procinfo.txt'
+ - 'cat /proc/meminfo >/tmp/BMC_meminfo.txt'
+ - 'systemctl status --all >/tmp/BMC_systemd.txt'
+ - 'systemctl list-units --failed >/tmp/BMC_failed_service.txt'
+ - 'systemctl list-jobs >/tmp/BMC_list_service.txt'
+ - 'cat /var/log/obmc-console.log >/tmp/BMC_obmc_console.txt'
+ - 'cat /var/log/obmc-console1.log >/tmp/BMC_obmc_console1.txt'
+ - 'peltool -l >/tmp/PEL_logs_list.json'
+ - 'peltool -a >/tmp/PEL_logs_display.json'
FILES:
- '/tmp/BMC_flash_side.txt'
- '/tmp/BMC_hwmon.txt'
@@ -135,18 +135,18 @@
LINUX:
LINUX_LOGS:
COMMANDS:
- - 'cat /sys/firmware/opal/msglog >/tmp/OS_msglog.txt 2>&1'
- - 'ppc64_cpu --frequency >/tmp/OS_cpufrequency.txt 2>&1'
- - 'dmesg >/tmp/OS_dmesg.txt 2>&1'
- - 'cat /var/log/opal-prd* >/tmp/OS_opal_prd.txt 2>&1'
- - 'cat /var/log/boot.log >/tmp/OS_boot.txt 2>&1'
- - 'cat /proc/cpuinfo >/tmp/OS_procinfo.txt 2>&1'
- - 'cat /proc/meminfo >/tmp/OS_meminfo.txt 2>&1'
- - 'netstat -a >/tmp/OS_netstat.txt 2>&1'
- - 'lspci >/tmp/OS_lspci.txt 2>&1'
- - 'lscpu >/tmp/OS_lscpu.txt 2>&1'
- - 'lscfg >/tmp/OS_lscfg.txt 2>&1'
- - 'journalctl --no-pager -b > /tmp/OS_journalctl_nopager.txt 2>&1'
+ - 'cat /sys/firmware/opal/msglog >/tmp/OS_msglog.txt'
+ - 'ppc64_cpu --frequency >/tmp/OS_cpufrequency.txt'
+ - 'dmesg >/tmp/OS_dmesg.txt'
+ - 'cat /var/log/opal-prd* >/tmp/OS_opal_prd.txt'
+ - 'cat /var/log/boot.log >/tmp/OS_boot.txt'
+ - 'cat /proc/cpuinfo >/tmp/OS_procinfo.txt'
+ - 'cat /proc/meminfo >/tmp/OS_meminfo.txt'
+ - 'netstat -a >/tmp/OS_netstat.txt'
+ - 'lspci >/tmp/OS_lspci.txt'
+ - 'lscpu >/tmp/OS_lscpu.txt'
+ - 'lscfg >/tmp/OS_lscfg.txt'
+ - 'journalctl --no-pager -b > /tmp/OS_journalctl_nopager.txt '
FILES:
- '/tmp/OS_msglog.txt'
- '/tmp/OS_cpufrequency.txt'
@@ -167,11 +167,11 @@
UBUNTU:
UBUNTU_LOGS:
COMMANDS:
- - '{ lsusb -t ; lsusb -v ; } >/tmp/OS_isub.txt 2>&1'
- - 'tail -n 50000 /var/log/kern.log >/tmp/OS_kern.txt 2>&1'
- - '{ cat /var/log/auth.log; cat /var/log/auth.log.1 ; } >/tmp/OS_authlog.txt 2>&1'
- - 'tail -n 200000 /var/log/syslog >/tmp/OS_syslog.txt 2>&1'
- - '{ uname -a; dpkg -s opal-prd; dpkg -s ipmitool ; } >/tmp/OS_info.txt 2>&1'
+ - '{ lsusb -t ; lsusb -v ; } >/tmp/OS_isub.txt'
+ - 'tail -n 50000 /var/log/kern.log >/tmp/OS_kern.txt'
+ - '{ cat /var/log/auth.log; cat /var/log/auth.log.1 ; } >/tmp/OS_authlog.txt'
+ - 'tail -n 200000 /var/log/syslog >/tmp/OS_syslog.txt'
+ - '{ uname -a; dpkg -s opal-prd; dpkg -s ipmitool ; } >/tmp/OS_info.txt'
- 'rm -rf /tmp/sosreport*FFDC*'
- {'sosreport --batch --tmp-dir /tmp --ticket-number FFDC >/tmp/OS_sosreport.txt': 1200}
FILES:
@@ -189,10 +189,10 @@
RHEL:
RHEL_LOGS:
COMMANDS:
- - '{ cat /etc/os-release; uname -a; rpm -qa ; } >/tmp/OS_info.txt 2>&1'
- - 'tail -n 200000 /var/log/messages >/tmp/OS_syslog.txt 2>&1'
+ - '{ cat /etc/os-release; uname -a; rpm -qa ; } >/tmp/OS_info.txt'
+ - 'tail -n 200000 /var/log/messages >/tmp/OS_syslog.txt'
- 'rm -rf /tmp/sosreport*FFDC*'
- - {'sosreport --batch --tmp-dir /tmp --label FFDC >/tmp/OS_sosreport.txt 2>&1': 1200}
+ - {'sosreport --batch --tmp-dir /tmp --label FFDC >/tmp/OS_sosreport.txt': 1200}
FILES:
- '/tmp/OS_info.txt'
- '/tmp/OS_syslog.txt'
@@ -205,10 +205,10 @@
SLES:
SLES_LOGS:
COMMANDS:
- - '{ cat /etc/os-release; uname -a; rpm -qa ; } >/tmp/OS_info.txt 2>&1'
- - 'tail -n 200000 /var/log/messages >/tmp/OS_syslog.txt 2>&1'
+ - '{ cat /etc/os-release; uname -a; rpm -qa ; } >/tmp/OS_info.txt'
+ - 'tail -n 200000 /var/log/messages >/tmp/OS_syslog.txt'
- 'rm -rf /tmp/scc*.txz.md5'
- - {'supportconfig >/tmp/OS_supportconfig.txt 2>&1': 1200}
+ - {'supportconfig >/tmp/OS_supportconfig.txt': 1200}
- 'cp /var/log/scc*.txz.md5 /tmp/'
FILES:
- '/tmp/OS_info.txt'
@@ -222,8 +222,8 @@
AIX:
AIX_LOGS:
COMMANDS:
- - 'errpt >/tmp/OS_errpt.txt 2>&1 ; errclear 0;'
- - 'bindprocessor -q >/tmp/OS_processors.txt 2>&1'
+ - 'errpt >/tmp/OS_errpt.txt ; errclear 0;'
+ - 'bindprocessor -q >/tmp/OS_processors.txt'
FILES:
- '/tmp/OS_errpt.txt'
- '/tmp/OS_processors.txt'