Hello community, here is the log from the commit of package supportutils for openSUSE:Factory checked in at 2018-02-05 10:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supportutils (Old) and /work/SRC/openSUSE:Factory/.supportutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supportutils" Mon Feb 5 10:52:26 2018 rev:7 rq:572117 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/supportutils/supportutils.changes 2018-01-30 15:44:30.610306626 +0100 +++ /work/SRC/openSUSE:Factory/.supportutils.new/supportutils.changes 2018-02-05 10:53:22.275296127 +0100 @@ -1,0 +2,31 @@ +Fri Feb 2 20:40:39 UTC 2018 - [email protected] + +- Accounts for firewalld now (bsc#1079137) +- Added dmesg taint seach +- Removed mii-tool from networking +- Updated HA to use chrony +- Added kdumptool calibrate to crash.txt +- Removed SLES_VER case for sles8,9 and 10 + +------------------------------------------------------------------- +Thu Feb 1 22:29:11 UTC 2018 - [email protected] + +- Added tuned feature OPTION_TUNED tuned.txt (bsc#1071545) +- Fixed udev service +- Fixed no disk device with sfdisk (bsc#1078638) + +------------------------------------------------------------------- +Tue Jan 30 16:56:36 UTC 2018 - [email protected] + +- Removed OPTION_SAM from man pages and resource file +- Validated missing commands +- Updated apparmor with systemctl service +- Replaced deprecated networking commands (bsc#1078318) + +------------------------------------------------------------------- +Mon Jan 29 23:06:21 UTC 2018 - [email protected] + +- Removed sam_info since suse_sam is no longer available +- Assigned SLE15 to SLES_VER selections (bsc#1078168) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supportutils-3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/supportconfig new/supportutils-3.1/bin/supportconfig --- old/supportutils-3.1/bin/supportconfig 2018-01-29 23:45:44.588258134 +0100 +++ new/supportutils-3.1/bin/supportconfig 2018-02-02 21:41:42.642907578 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -SVER='3.1-4.5' -SDATE='2018 01 29' +SVER='3.1-4.7' +SDATE='2018 02 02' ############################################################################## # supportconfig - Gathers system troubleshooting information for SUSE Support @@ -155,44 +155,78 @@ log_cmd $BASIC_ENVF 'oes-SPident -vv' fi cat $LOG/$RPM_DIST_FILE >> $LOG/$BASIC_ENVF - if rpm_verify $BASIC_ENVF SuSEfirewall2 - then - log_write $BASIC_ENVF "#==[ Firewall Services ]============================#" - log_write $BASIC_ENVF "# Service state" - if (( SLES_VER >= 120 )); then - wait_trace_on "systemctl status SuSEfirewall2.service" - log_write $BASIC_ENVF "$(systemctl status SuSEfirewall2.service)" + case $SLES_VER in + 15*) + if rpm_verify $BASIC_ENVF firewalld + then + log_write $BASIC_ENVF "#==[ Firewall Services ]============================#" + log_write $BASIC_ENVF "# Service state" + wait_trace_on "systemctl status firewalld.service" + log_write $BASIC_ENVF "$(systemctl status firewalld.service)" wait_trace_off - wait_trace_on "systemctl status SuSEfirewall2_init.service" - log_write $BASIC_ENVF "$(systemctl status SuSEfirewall2_init.service)" + wait_trace_on "systemctl status firewalld.service" + log_write $BASIC_ENVF "$(systemctl status firewalld.service)" wait_trace_off - else - for i in $(rpm -ql SuSEfirewall2 | grep init.d) - do - FSRV=$(basename $i) - wait_trace_on "chkconfig $FSRV --list" - log_write $BASIC_ENVF "$(chkconfig $FSRV --list)" - wait_trace_off - done + IPBIN="/usr/sbin/iptables" + if [[ -x $IPBIN ]]; then + TOTAL_FIREWALL_RULES=0 + for TABLE in filter nat mangle raw security + do + if grep iptable_$TABLE /proc/modules &>/dev/null + then + wait_trace_on "$IPBIN -t $TABLE -nL | sed -e '/^$/d' -e '/^Chain/d' -e '/^target/d' | wc -l" + FIREWALL_RULES=$($IPBIN -t $TABLE -nL | sed -e '/^$/d' -e '/^Chain/d' -e '/^target/d' | wc -l) + TOTAL_FIREWALL_RULES=$(( TOTAL_FIREWALL_RULES + FIREWALL_RULES )) + wait_trace_off + fi + done + log_write $BASIC_ENVF + log_write $BASIC_ENVF "$TOTAL_FIREWALL_RULES Active Firewall Rules" + log_write $BASIC_ENVF + fi fi - IPBIN="/usr/sbin/iptables" - if [ -x $IPBIN ]; then - TOTAL_FIREWALL_RULES=0 - for TABLE in filter nat mangle raw - do - if grep iptable_$TABLE /proc/modules &>/dev/null - then - wait_trace_on "$IPBIN -t $TABLE -nL | sed -e '/^$/d' -e '/^Chain/d' -e '/^target/d' | wc -l" - FIREWALL_RULES=$($IPBIN -t $TABLE -nL | sed -e '/^$/d' -e '/^Chain/d' -e '/^target/d' | wc -l) - TOTAL_FIREWALL_RULES=$(( TOTAL_FIREWALL_RULES + FIREWALL_RULES )) + ;; + 11*|12*) + if rpm_verify $BASIC_ENVF SuSEfirewall2 + then + log_write $BASIC_ENVF "#==[ Firewall Services ]============================#" + log_write $BASIC_ENVF "# Service state" + if (( SLES_VER >= 120 )); then + wait_trace_on "systemctl status SuSEfirewall2.service" + log_write $BASIC_ENVF "$(systemctl status SuSEfirewall2.service)" + wait_trace_off + wait_trace_on "systemctl status SuSEfirewall2_init.service" + log_write $BASIC_ENVF "$(systemctl status SuSEfirewall2_init.service)" + wait_trace_off + else + for i in $(rpm -ql SuSEfirewall2 | grep init.d) + do + FSRV=$(basename $i) + wait_trace_on "chkconfig $FSRV --list" + log_write $BASIC_ENVF "$(chkconfig $FSRV --list)" wait_trace_off - fi - done - log_write $BASIC_ENVF - log_write $BASIC_ENVF "$TOTAL_FIREWALL_RULES Active Firewall Rules" - log_write $BASIC_ENVF + done + fi + IPBIN="/usr/sbin/iptables" + if [[ -x $IPBIN ]]; then + TOTAL_FIREWALL_RULES=0 + for TABLE in filter nat mangle raw + do + if grep iptable_$TABLE /proc/modules &>/dev/null + then + wait_trace_on "$IPBIN -t $TABLE -nL | sed -e '/^$/d' -e '/^Chain/d' -e '/^target/d' | wc -l" + FIREWALL_RULES=$($IPBIN -t $TABLE -nL | sed -e '/^$/d' -e '/^Chain/d' -e '/^target/d' | wc -l) + TOTAL_FIREWALL_RULES=$(( TOTAL_FIREWALL_RULES + FIREWALL_RULES )) + wait_trace_off + fi + done + log_write $BASIC_ENVF + log_write $BASIC_ENVF "$TOTAL_FIREWALL_RULES Active Firewall Rules" + log_write $BASIC_ENVF + fi fi - fi + ;; + esac fi echolog Done } @@ -231,16 +265,7 @@ test $((TAINT & 32)) -ne 0 && TAINT_STRING="${TAINT_STRING}B" || TAINT_STRING="${TAINT_STRING} " case $SLES_VER in - 100) - test $((TAINT & 64)) -ne 0 && TAINT_STRING="${TAINT_STRING}U" || TAINT_STRING="${TAINT_STRING} " - test $((TAINT & 128)) -ne 0 && TAINT_STRING="${TAINT_STRING}X" || TAINT_STRING="${TAINT_STRING} " - ;; - 10*) - test $((TAINT & 64)) -ne 0 && TAINT_STRING="${TAINT_STRING}U" || TAINT_STRING="${TAINT_STRING} " - test $((TAINT & 128)) -ne 0 && TAINT_STRING="${TAINT_STRING}N" || TAINT_STRING="${TAINT_STRING} " - test $((TAINT & 256)) -ne 0 && TAINT_STRING="${TAINT_STRING}X" || TAINT_STRING="${TAINT_STRING} " - ;; - 110|111) + 111) test $((TAINT & 64)) -ne 0 && TAINT_STRING="${TAINT_STRING}U" || TAINT_STRING="${TAINT_STRING} " test $((TAINT & 128)) -ne 0 && TAINT_STRING="${TAINT_STRING}D" || TAINT_STRING="${TAINT_STRING} " test $((TAINT & 256)) -ne 0 && TAINT_STRING="${TAINT_STRING}A" || TAINT_STRING="${TAINT_STRING} " @@ -292,16 +317,7 @@ test $((TAINT & 32)) -ne 0 && log_write $OF " TAINT: (B) System has hit bad_page" case $SLES_VER in - 100) - test $((TAINT & 64)) -ne 0 && log_write $OF " TAINT: (U) Unsupported modules loaded" - test $((TAINT & 128)) -ne 0 && log_write $OF " TAINT: (X) Modules with external support loaded" - ;; - 10*) - test $((TAINT & 64)) -ne 0 && log_write $OF " TAINT: (U) Userspace-defined problems" - test $((TAINT & 128)) -ne 0 && log_write $OF " TAINT: (N) Unsupported modules loaded" - test $((TAINT & 256)) -ne 0 && log_write $OF " TAINT: (X) Modules with external support loaded" - ;; - 110|111) + 111) test $((TAINT & 64)) -ne 0 && log_write $OF " TAINT: (U) Userspace-defined problems" test $((TAINT & 128)) -ne 0 && log_write $OF " TAINT: (D) Imminent kernel function termination" test $((TAINT & 256)) -ne 0 && log_write $OF " TAINT: (A) ACPI table overridden" @@ -349,25 +365,28 @@ do LIST_MODULE=0 modinfo -l $MODULE &>/dev/null - if [ $? -gt 0 ]; then + MOD_ERR=$? + if (( MOD_ERR )); then log_write $OF "$(printf "%-25s %-25s %-25s" module=$MODULE ERROR "Module info unavailable")" else wait_trace_on "modinfo -l $MODULE" LIC=$(modinfo -l $MODULE | head -1) SUP=$(modinfo -F supported $MODULE | head -1) - test -z "$LIC" && LIC=None - test -z "$SUP" && SUP=no + [[ -z $LIC ]] && LIC=None + [[ -z $SUP ]] && SUP=no GPLTEST=$(echo $LIC | grep GPL) - test -z "$GPLTEST" && ((LIST_MODULE++)) - test "$SUP" != "yes" && ((LIST_MODULE++)) - test $LIST_MODULE -gt 0 && log_write $OF "$(printf "%-25s %-25s %-25s" "module=$MODULE" "license=$LIC" "supported=$SUP")" + [[ -z $GPLTEST ]] && ((LIST_MODULE++)) + [[ "$SUP" != "yes" ]] && ((LIST_MODULE++)) + (( LIST_MODULE > 0 )) && log_write $OF "$(printf "%-25s %-25s %-25s" "module=$MODULE" "license=$LIC" "supported=$SUP")" LIST_MODULES_ANY=$((LIST_MODULES_ANY + LIST_MODULE)) wait_trace_off fi done - if [ $LIST_MODULES_ANY -eq 0 ]; then + if [[ $LIST_MODULES_ANY -eq 0 ]]; then log_write $OF "Module List Unknown" + log_write $OF fi + log_cmd $OF "dmesg -T | grep taint" else log_write $OF "Kernel Status -- Not Tainted" fi @@ -424,6 +443,7 @@ log_write $AARTMP "$(systemctl status apparmor.service)" else log_write $AARTMP "$(chkconfig -l boot.apparmor)" + log_write $AARTMP "$(/etc/init.d/boot.apparmor status)" fi APP_AUDIT_LOG="/var/log/audit/audit.log" test -f $APP_AUDIT_LOG && AAREJECT=$(egrep 'REJECTING|DENIED' $APP_AUDIT_LOG | wc -l) || AAREJECT=0 @@ -1388,9 +1408,7 @@ log_cmd $OF 'dmsetup table' log_cmd $OF 'dmsetup info' case $SLES_VER in - 80|90) log_cmd $OF "udevinfo -d" ;; - 10*) log_cmd $OF "udevinfo -e" ;; - 11*|12*) log_cmd $OF "udevadm info -e" ;; + 11*|12*|15*) log_cmd $OF "udevadm info -e" ;; esac test -d /proc/scsi && SCSI_DIRS=$(find /proc/scsi/ -type d) || SCSI_DIRS="" for SDIR in $SCSI_DIRS @@ -1647,7 +1665,7 @@ printlog "Networking..." test $OPTION_NET -eq 0 && { echolog Excluded; return 1; } NAMESPACES=$(ip netns list) - if [ -n "${NAMESPACES}" ] ; then + if [[ -n "${NAMESPACES}" ]] ; then net_info_namespace "network.txt" ip netns list | while read NAMESPACE rest; do net_info_namespace "network-${NAMESPACE}.txt" "${NAMESPACE}" @@ -1661,16 +1679,17 @@ net_info_namespace() { OF=$1 addHeaderFile $OF - if [ -z "${2}" ] ; then + if [[ -z "${2}" ]] ; then NS="" else NS="ip netns exec $2 " log_write $OF "#==[ Network namespace ${2} ]======================#" fi - if [ -z "${NS}" ] ; then + if [[ -z "${NS}" ]] ; then rpm_verify $OF sysconfig if (( SLES_VER >= 120 )) ; then rpm_verify $OF wicked + rpm_verify $OF iproute2 log_cmd $OF "systemctl status network.service" log_cmd $OF "systemctl status nscd.service" log_cmd $OF "wicked ifstatus --verbose all" @@ -1680,12 +1699,11 @@ check_service $OF nscd fi fi - log_cmd $OF "${NS}ifconfig -a" log_cmd $OF "${NS}ip addr" log_cmd $OF "${NS}ip route" log_cmd $OF "${NS}ip -s link" if [ -z "${NS}" ] ; then - if [ $MIN_OPTION_AUTOMOD -ne 0 ]; then + if [[ $MIN_OPTION_AUTOMOD -ne 0 ]]; then log_cmd $OF 'hwinfo --netcard' fi conf_files $OF /proc/sys/net/ipv4/ip_forward /etc/HOSTNAME @@ -1714,7 +1732,7 @@ IPADDR=$(${NS}ip route list | awk '$1 == "default" {print $3}') ping_addr $OF 'Default Route' $IPADDR "${NS}" - if [ -z "${NS}" ] ; then + if [[ -z "${NS}" ]] ; then test -e /etc/resolv.conf && IPADDRS=$(grep ^nameserver /etc/resolv.conf | cut -d' ' -f2) || IPADDRS="" for IPADDR in $IPADDRS do @@ -1735,31 +1753,30 @@ log_cmd $OF "${NS}tc -s -d class show dev ${NIC}" log_cmd $OF "${NS}tc -s -d filter show dev ${NIC}" done - log_cmd $OF "${NS}netstat -as" - log_cmd $OF "${NS}netstat -nlp" - log_cmd $OF "${NS}netstat -nr" - log_cmd $OF "${NS}netstat -i" - log_cmd $OF "${NS}arp -v" + log_cmd $OF "${NS}ss -nlp" + log_cmd $OF "${NS}ip route list" + log_cmd $OF "${NS}ip -stats link" + log_cmd $OF "${NS}ip -stats neighbor" log_cmd $OF "${NS}ip ntable show" - if [ $MIN_OPTION_AUTOMOD -eq 0 ]; then - log_write $OF "#==[ Warning ]======================================#" - log_write $OF "# Autoloading kernel modules disabled. Don't use -k." - log_write $OF "# Excluding IPsec command: xfrm" - log_write $OF - else + if [[ $MIN_OPTION_AUTOMOD -eq 0 ]]; then + log_write $OF "#==[ Warning ]======================================#" + log_write $OF "# Autoloading kernel modules disabled. Don't use -k." + log_write $OF "# Excluding IPsec command: xfrm" + log_write $OF + else log_cmd $OF "${NS}ip xfrm state list" log_cmd $OF "${NS}ip xfrm policy list" fi log_cmd $OF "${NS}ip maddr show" log_cmd $OF "${NS}ip mroute show" - if [ $MIN_OPTION_AUTOMOD -eq 0 ]; then + if [[ $MIN_OPTION_AUTOMOD -eq 0 ]]; then log_write $OF "#==[ Warning ]======================================#" log_write $OF "# Autoloading kernel modules disabled. Don't use -k." log_write $OF "# Excluding Bridge command: brctl" log_write $OF else - if [ -x /sbin/brctl ]; then + if [[ -x /sbin/brctl ]]; then log_cmd $OF "${NS}brctl show" for BRIDGE in `${NS}brctl show | sed 1d | awk '{print$1}'` do @@ -1767,19 +1784,29 @@ done fi fi - NICS=$(IFS="@: ";${NS}ip -o l | while read number nic dummy ; do echo $nic ; done) - for NIC in ${NICS} - do - log_cmd $OF "${NS}ethtool ${NIC}" - log_cmd $OF "${NS}ethtool -k ${NIC}" - log_cmd $OF "${NS}ethtool -i ${NIC}" - log_cmd $OF "${NS}ethtool -S ${NIC}" - log_cmd $OF "${NS}mii-tool -v ${NIC}" - done - if [ -z "${NS}" ] ; then + ETHTOOL_BIN=$(which ethtool 2>/dev/null) + if [[ -n $ETHTOOL_BIN ]]; then + NICS=$(IFS="@: ";${NS}ip -o l | while read number nic dummy ; do echo $nic ; done) + for NIC in ${NICS} + do + log_cmd $OF "${NS}${ETHTOOL_BIN} ${NIC}" + log_cmd $OF "${NS}${ETHTOOL_BIN} -k ${NIC}" + log_cmd $OF "${NS}${ETHTOOL_BIN} -i ${NIC}" + log_cmd $OF "${NS}${ETHTOOL_BIN} -S ${NIC}" + done + fi + if [[ -z "${NS}" ]] ; then log_cmd $OF "nscd -g" conf_files $OF /etc/hosts /etc/host.conf /etc/resolv.conf /etc/nsswitch.conf /etc/nscd.conf /etc/hosts.allow /etc/hosts.deny - conf_files $OF /etc/sysconfig/SuSEfirewall2 /etc/sysconfig/personal-firewall + case $SLES_VER in + 15*) + FILES="/etc/sysconfig/firewalld" + ;; + 11*|12*) + FILES="/etc/sysconfig/SuSEfirewall2 /etc/sysconfig/personal-firewall" + ;; + esac + conf_files $OF $FILES fi for TABLE in filter nat mangle raw do @@ -1805,7 +1832,7 @@ log_write $OF fi done - if [ -z "${NS}" ] ; then + if [[ -z "${NS}" ]] ; then test -d /etc/sysconfig/network && FILES=$(find -L /etc/sysconfig/network/ -maxdepth 1 -type f) || FILES="" conf_files $OF /etc/sysconfig/proxy $FILES sed -i -e 's/.*_PASSWORD[[:space:]]*=.*/*REMOVED BY SUPPORTCONFIG*/g' $LOG/$OF @@ -1920,7 +1947,13 @@ FILES=$(find /proc/driver/cciss/ -maxdepth 1 -type f 2>/dev/null) conf_files $OF $FILES fi - log_cmd $OF 'sfdisk -d' + DISKS=$(sfdisk -l 2>/dev/null | grep -i 'disk /' | awk '{print $2}' | sed -e 's/://g') + if [[ -n $DISKS ]]; then + for DISK in $DISKS + do + log_cmd $OF "sfdisk -d $DISK" + done + fi fi echolog Done } @@ -1972,15 +2005,7 @@ OF=fs-iscsi.txt addHeaderFile $OF case $SLES_VER in - 80|90) - if rpm_verify $OF linux-iscsi - then - log_cmd $OF 'iscsi-ls -l' - conf_files $OF /etc/iscsi.conf /etc/initiatorname.iscsi - log_cmd $OF 'sfdisk -l' - fi - ;; - 10*|11*|12*) + 11*|12*|15*) log_write $OF "#___________________________________________________________#" log_write $OF "#____[ iSCSI Target Information ]___________________________#" log_write $OF @@ -2146,39 +2171,6 @@ CONFFILE=/etc/ntp.conf addHeaderFile $OF case $SLES_VER in - 8*|9*|10*) - if rpm_verify $OF xntp - then - case $SLES_VER in - 80|90) check_service $OF xntpd ;; - 10*) check_service $OF ntp ;; - esac - log_cmd $OF 'ntpq -p' - conf_files $OF $CONFFILE - IPADDRS=$(egrep "^peer |^server " $CONFFILE | awk '{print $2}' | sort | uniq) - for IPADDR in $IPADDRS - do - ping_addr $OF 'NTP Server' $IPADDR - done - if [ -f $CONFFILE ]; then - log_write $OF "#___________________________________________________________#" - log_write $OF "#____[ Files Included in $CONFFILE ]____________________#" - log_write $OF - for KEYNAME in driftfile - do - FILES=$(grep ^${KEYNAME} $CONFFILE | awk '{print $2}') - conf_files $OF $FILES - done - KEYNAME=logfile - FILES=$(grep ^${KEYNAME} $CONFFILE | awk '{print $2}') - [ -z "$FILES" ] && FILES=/var/log/ntp - test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES - fi - echolog Done - else - echolog Skipped - fi - ;; 11*|12*) if rpm_verify $OF ntp then @@ -2281,15 +2273,14 @@ then UDEV_CONF=/etc/udev/udev.conf if (( SLES_VER >= 120 )); then - log_cmd $OF 'systemctl status udev.service' + log_cmd $OF 'systemctl status systemd-udevd.service' + log_cmd $OF 'systemctl status systemd-udev-trigger.service' else log_cmd $OF 'chkconfig boot.udev' fi conf_files $OF $UDEV_CONF case $SLES_VER in - 80|90) log_cmd $OF "udevinfo -d" ;; - 10*) log_cmd $OF "udevinfo -e" ;; - 11*|12*) log_cmd $OF "udevadm info -e" ;; + 11*|12*|15*) log_cmd $OF "udevadm info -e" ;; esac if [[ -f $UDEV_CONF ]]; then . $UDEV_CONF @@ -2320,6 +2311,7 @@ rpm_verify $OF kexec-tools log_cmd $OF "uname -r" log_cmd $OF "systemctl status kdump.service" + log_cmd $OF "kdumptool calibrate" log_cmd $OF "kdumptool dump_config" conf_files $OF /proc/cmdline if rpm -q kdump &>/dev/null; then @@ -2606,7 +2598,6 @@ rpm_verify $OF subdomain-utils rpm_verify $OF subdomain-profiles test -f $AARPTMP && cat $AARPTMP >> $LOG/$OF - check_service $OF boot.subdomain log_cmd $OF 'unconfined' else ((SKIP++)) @@ -2617,7 +2608,11 @@ rpm_verify $OF apparmor-utils rpm_verify $OF apparmor-profiles test -f $AARPTMP && cat $AARPTMP >> $LOG/$OF - log_cmd $OF "/etc/init.d/boot.apparmor status" + if [[ -x /etc/init.d/boot.apparmor ]]; then + log_cmd $OF "/etc/init.d/boot.apparmor status" + else + log_cmd $OF "systemctl status apparmor.service" + fi log_cmd $OF 'unconfined' log_files $OF 0 /var/log/audit/audit.log test -d /etc/apparmor && FILES=$(find -L /etc/apparmor/ | grep conf) || FILES="" @@ -2635,25 +2630,16 @@ test $OPTION_HA -eq 0 && { echolog Excluded; return 1; } OF=ha.txt addHeaderFile $OF - if (( SLES_VER >= 110 )); then + case $SLES_VER in + 12*) if rpm_verify $OF pacemaker then log_cmd $OF "rpm -qa | egrep 'ais|resource-agents|cluster-glue|corosync|csync2|pacemaker|heartbeat'" - if (( SLES_VER >= 120 )) - then - log_cmd $OF "systemctl status pacemaker.service" - CONF_FILES="/etc/corosync/corosync.conf /etc/sysconfig/ctdb /etc/sysconfig/sbd" - else - rpm_verify $OF openais - check_service $OF openais - CONF_FILES="/etc/ais/openais.conf /etc/corosync/corosync.conf /etc/ais/amf.conf /etc/sysconfig/ctdb /etc/sysconfig/sbd" - fi - if (( $SLES_VER >= 111 )); then - (( SLES_VER < 120 )) && log_cmd $OF 'chkconfig -l csync2' - if [ -s /etc/xinetd.d/csync2 ]; then - TMPORT=$(grep -i port /etc/xinetd.d/csync2 | awk '{print $3}') - log_cmd $OF "netstat -nlp | grep $TMPORT" - fi + log_cmd $OF "systemctl status pacemaker.service" + CONF_FILES="/etc/corosync/corosync.conf /etc/sysconfig/ctdb /etc/sysconfig/sbd" + if [[ -s /etc/xinetd.d/csync2 ]]; then + TMPORT=$(grep -i port /etc/xinetd.d/csync2 | awk '{print $3}') + log_cmd $OF "ss -nlp | grep $TMPORT" fi log_cmd $OF 'ntpq -p' log_cmd $OF 'crm_mon -r -1' @@ -2661,7 +2647,7 @@ log_cmd $OF 'corosync-cfgtool -s' log_cmd $OF 'crm configure show' conf_files $OF $CONF_FILES - if [ -s /etc/sysconfig/sbd ]; then + if [[ -s /etc/sysconfig/sbd ]]; then . /etc/sysconfig/sbd for SBD in $(echo $SBD_DEVICE | sed -e 's/;/ /g') do @@ -2669,16 +2655,14 @@ log_cmd $OF "sbd -d $SBD dump" done fi - if (( SLES_VER >= 111 )); then - log_cmd $OF 'ls -lR --time-style=long-iso /etc/csync2' - conf_files $OF /etc/csync2/csync2.cfg /etc/xinetd.d/csync2 - fi + log_cmd $OF 'ls -lR --time-style=long-iso /etc/csync2' + conf_files $OF /etc/csync2/csync2.cfg /etc/xinetd.d/csync2 CURRENT_PATH=$(pwd) cd $LOG for HBRDIR in $VAR_OPTION_HBREPORT_DIRS do HBRS=$(find $HBRDIR -maxdepth 1 -type f 2>/dev/null | egrep "/hb[_-]?report[0-9a-zA-Z._-]*\.tar\.bz2$") - if [ -n "$HBRS" ]; then + if [[ -n "$HBRS" ]]; then for HBR_PATH in $HBRS do HBR=$(basename $HBR_PATH) @@ -2708,7 +2692,7 @@ FILES="/var/log/ha-log /var/log/pacemaker.log /var/log/ctdb/log.ctdb" test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES CORBIN="/usr/sbin/corosync-fplay" - if [ -x $CORBIN ]; then + if [[ -x $CORBIN ]]; then CLN=$($CORBIN 2>/dev/null | wc -l) if [ $CLN -gt 1000 ]; then log_cmd $OF 'corosync-fplay | head -500' @@ -2721,59 +2705,84 @@ else echolog Skipped fi - else - if rpm_verify $OF heartbeat + ;; + 15*) + if rpm_verify $OF pacemaker then - check_service $OF heartbeat - log_cmd $OF 'cl_status hbstatus' - conf_files $OF /etc/ha.d/ha.cf /etc/ha.d/haresources - log_cmd $OF 'ls -l --time-style=long-iso /etc/ha.d/authkeys/' - log_cmd $OF 'ntpq -p' - CHECKDIR="/var/lib/heartbeat/pengine" - HALOG="$LOG/ha-pengine" - if [ -d $CHECKDIR ]; then - FOUND=$(find -L ${CHECKDIR}/ -type f) - if [ -n "$FOUND" ]; then - mkdir -p $HALOG - log_write $OF "#==[ Command ]======================================#" - if [ $ADD_OPTION_LOGS -gt 0 ]; then - log_write $OF "# cp -a $CHECKDIR $HALOG" - cp -a $CHECKDIR/* $HALOG &>/dev/null - else - log_write $OF "# cp $CHECKDIR $HALOG" - log_write $OF "# NOTE: Only the newest $VAR_OPTION_PENGINE_FILES_LIMIT files are copied" - for i in $(\ls -rA1t $CHECKDIR | tail -${VAR_OPTION_PENGINE_FILES_LIMIT}) - do - cp ${CHECKDIR}/${i} $HALOG &>/dev/null - done - fi - log_write $OF - fi + log_cmd $OF "rpm -qa | egrep 'ais|resource-agents|cluster-glue|corosync|csync2|pacemaker'" + log_cmd $OF "systemctl status pacemaker.service" + CONF_FILES="/etc/corosync/corosync.conf /etc/sysconfig/ctdb /etc/sysconfig/sbd" + if [[ -s /etc/xinetd.d/csync2 ]]; then + TMPORT=$(grep -i port /etc/xinetd.d/csync2 | awk '{print $3}') + log_cmd $OF "ss -nlp | grep $TMPORT" fi - if cl_status hbstatus &>/dev/null - then - test $SLES_VER -ge 100 && log_cmd $OF 'crm_mon -r -1' - log_cmd $OF 'cl_status listnodes' - log_cmd $OF 'cl_status rscstatus' - for HBNODE in $(cl_status listnodes 2>/dev/null) + log_cmd $OF 'chronyc sources -v' + log_cmd $OF 'crm_mon -r -1' + log_cmd $OF 'crm_mon -r -n -1' + log_cmd $OF 'corosync-cfgtool -s' + log_cmd $OF 'crm configure show' + conf_files $OF $CONF_FILES + if [[ -s /etc/sysconfig/sbd ]]; then + . /etc/sysconfig/sbd + for SBD in $(echo $SBD_DEVICE | sed -e 's/;/ /g') do - log_cmd $OF "cl_status listhblinks $HBNODE" - for HBLINK in $(cl_status listhblinks $HBNODE 2>/dev/null) + log_cmd $OF "sbd -d $SBD list" + log_cmd $OF "sbd -d $SBD dump" + done + fi + log_cmd $OF 'ls -lR --time-style=long-iso /etc/csync2' + conf_files $OF /etc/csync2/csync2.cfg /etc/xinetd.d/csync2 + CURRENT_PATH=$(pwd) + cd $LOG + for HBRDIR in $VAR_OPTION_HBREPORT_DIRS + do + HBRS=$(find $HBRDIR -maxdepth 1 -type f 2>/dev/null | egrep "/hb[_-]?report[0-9a-zA-Z._-]*\.tar\.bz2$") + if [[ -n "$HBRS" ]]; then + for HBR_PATH in $HBRS do - log_cmd $OF "cl_status hblinkstatus $HBNODE $HBLINK" + HBR=$(basename $HBR_PATH) + log_cmd $OF "tar jxf ${HBR_PATH}" + conf_files $OF "$LOG/${HBR%%.tar.bz2}/analysis.txt" done + fi + done + cd $CURRENT_PATH + CURRENT_CIB='' + FILES='' + if [[ -d /var/lib/heartbeat/ ]]; then + FILES=$(find -L /var/lib/heartbeat/ -type f | egrep -v "cores|pengine|hb_uuid|cib\.xml") + [[ -e /var/lib/heartbeat/crm/cib.xml ]] && CURRENT_CIB='/var/lib/heartbeat/crm/cib.xml' + for i in $(find -L /var/lib/heartbeat/cores -type f) + do + log_cmd $OF "file $i" done fi - test -d /var/lib/heartbeat && FILES=$(find -L /var/lib/heartbeat/ -type f | egrep -v "cores|pengine|hb_uuid") || FILES="" - conf_files $OF /etc/ha_logd.cf $FILES - test $SLES_VER -ge 100 && log_cmd $OF 'cibadmin -Q' - FILES="/var/log/ha-log" + if [[ -d /var/lib/pacemaker/ ]]; then + TFILES=$(find -L /var/lib/pacemaker/ -type f | egrep -v "cores|pengine|hb_uuid|cib\.xml") + FILES="$FILES $TFILES" + [[ -e /var/lib/pacemaker/cib/cib.xml ]] && CURRENT_CIB='/var/lib/pacemaker/cib/cib.xml' + fi + log_cmd $OF 'cibadmin -Q' + conf_files $OF $CURRENT_CIB $FILES + FILES="/var/log/ha-log /var/log/pacemaker.log /var/log/ctdb/log.ctdb" test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + CORBIN="/usr/sbin/corosync-fplay" + if [[ -x $CORBIN ]]; then + CLN=$($CORBIN 2>/dev/null | wc -l) + if [ $CLN -gt 1000 ]; then + log_cmd $OF 'corosync-fplay | head -500' + log_cmd $OF 'corosync-fplay | tail -500' + else + log_cmd $OF 'corosync-fplay' + fi + fi echolog Done else echolog Skipped fi - fi + ;; + *) echolog Error ;; + esac } slp_info() { @@ -2848,15 +2857,7 @@ OCFS2_MODULES=1 fi case $SLES_VER in - 8*|9*|10*) - check_service $OF o2cb - check_service $OF ocfs2 - [[ -x /usr/bin/findmnt ]] && log_cmd $OF "findmnt" || log_cmd $OF "mount" - timed_log_cmd $OF "mounted.ocfs2 -d" - timed_log_cmd $OF "mounted.ocfs2 -f" - conf_files $OF "/etc/ocfs2/cluster.conf /etc/sysconfig/o2cb" - ;; - 11*|12*) + 11*|12*|15*) [[ -x /usr/bin/findmnt ]] && log_cmd $OF "findmnt" || log_cmd $OF "mount" (( OCFS2_MODULES )) && timed_log_cmd $OF "mounted.ocfs2 -d" (( OCFS2_MODULES )) && timed_log_cmd $OF "mounted.ocfs2 -f" @@ -2981,6 +2982,7 @@ OF=shell_history.txt addHeaderFile $OF log_icmd $OF "history" + conf_files $OF /root/.bash_history echolog Done } @@ -3232,7 +3234,7 @@ SLAPD_SCHEMAS=$(grep ^include $SLAPD_CONF | awk '{print $2}') fi check_service $OF ldap - log_cmd $OF "netstat -nlp | grep slapd" + log_cmd $OF "ss -nlp | grep slapd" log_cmd $OF "ls -al /etc/openldap/schema" conf_files $OF $SLAPD_CONF /etc/sysconfig/openldap if [ -d $SLAPD_DIR ]; then @@ -3377,48 +3379,6 @@ OF=x.txt addHeaderFile $OF case $SLES_VER in - 80|90) if rpm_verify $OF XFree86 - then - log_cmd $OF 'ls -al /dev | egrep "video.*|mouse.*"' - log_cmd $OF '3Ddiag' - rpm_verify $OF XFree86-Mesa - rpm_verify $OF XFree86-libs - log_cmd $OF 'hwinfo --framebuffer' - conf_files $OF /etc/XF86Config /etc/X11/XF86Config - if rpm_verify $OF sax2 - then - log_cmd $OF 'sysp -q mouse' - log_cmd $OF 'sysp -c' - log_cmd $OF 'sysp -q keyboard' - FILES="/var/log/SaX.log" - test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES - fi - FILES="/var/log/XFree86.[0,1].log /var/log/xdm.errors /root/.X.err /root/.xsession-errors" - test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES - echolog Done - else - echolog Skipped - fi - ;; - 10*) - log_cmd $OF 'ls -al /dev | egrep "video.*|mouse.*"' - log_cmd $OF '3Ddiag' - rpm_verify $OF Mesa - rpm_verify $OF xorg-x11-libs - log_cmd $OF 'hwinfo --framebuffer' - conf_files $OF /etc/sysconfig/displaymanager /etc/sysconfig/windowmanager /etc/X11/xorg.conf - log_cmd $OF 'intel_reg_dumper' - log_cmd $OF 'lspci -n' - log_cmd $OF 'modetest' - - if rpm_verify $OF sax2 - then - log_cmd $OF 'sysp -q mouse' - log_cmd $OF 'sysp -c' - log_cmd $OF 'sysp -q keyboard' - log_files $OF $VAR_OPTION_LINE_COUNT /var/log/SaX.log - fi - ;; 11*) for i in xorg-x11-Xvnc xorg-x11-libs xorg-x11 do @@ -3591,7 +3551,7 @@ check_service $OF sshd fi conf_files $OF /etc/ssh/sshd_config /etc/ssh/ssh_config /etc/pam.d/sshd - log_cmd $OF 'netstat -nlp | grep sshd' + log_cmd $OF 'ss -nlp | grep sshd' echolog Done else echolog Skipped @@ -3667,7 +3627,7 @@ else check_service $OF cups fi - log_cmd $OF 'netstat -nlp | grep cupsd' + log_cmd $OF 'ss -nlp | grep cupsd' BEP=$(ls -1 /usr/lib*/cups/backend/parallel 2>/dev/null | head -n1) if [ $SLES_VER -ge 110 ]; then if [ $MIN_OPTION_AUTOMOD -eq 0 ]; then @@ -3722,6 +3682,7 @@ cp $SARDIR/sa* $SARSCDIR &>/dev/null else log_write $OF "# NOTE: Only the newest $VAR_OPTION_SAR_FILES_LIMIT files are copied" + log_write $OF "# Use sar -f filename to read included sar files" for i in $(\ls -A1 $SARDIR/sa* 2>/dev/null | tail -$VAR_OPTION_SAR_FILES_LIMIT) do cp $i $SARSCDIR &>/dev/null @@ -3748,7 +3709,7 @@ log_write $OF "#-----[ Novell DNS ]--------------------------------#" if rpm_verify $OF novell-bind; then check_service $OF novell-named - log_cmd $OF 'netstat -nlp | grep named' + log_cmd $OF 'ss -nlp | grep named' FILES=/etc/sysconfig/novell/NvlDns* SYSNOVLDNS=$(ls -1 /etc/sysconfig/novell/NvlDns* | sort | tail -1) conf_text_files $OF $FILES @@ -3774,7 +3735,7 @@ log_write $OF "#-----[ System DNS ]--------------------------------#" if rpm_verify $OF bind; then check_service $OF named - [ $SKIP -gt 0 ] && log_cmd $OF 'netstat -nlp | grep named' + [ $SKIP -gt 0 ] && log_cmd $OF 'ss -nlp | grep named' FILES=$(grep ^include /etc/named.conf | cut -d';' -f1 | sed -e 's/"//g' | awk '{print $2}') conf_files $OF /etc/named.conf $FILES /etc/sysconfig/named ZDIR=$(grep ^[[:space:]]*directory /etc/named.conf | cut -d';' -f1 | sed -e 's/"//g' | awk '{print $2}') @@ -3805,7 +3766,7 @@ SKIP=0 if rpm_verify $OF dhcp-server; then check_service $OF dhcpd - log_cmd $OF 'netstat -nlp | grep dhcp' + log_cmd $OF 'ss -nlp | grep dhcp' conf_files $OF /etc/sysconfig/dhcpd conf_files $OF /etc/dhcpd.conf /var/lib/dhcp/db/dhcpd.leases else @@ -3835,6 +3796,27 @@ fi } +tuned_info() { + printlog "Tuned..." + test $OPTION_TUNED -eq 0 && { echolog Excluded; return 1; } + OF=tuned.txt + addHeaderFile $OF + if rpm_verify $OF tuned; then + log_cmd $OF "systemctl status tuned.service" + log_cmd $OF "tuned-adm active" + log_cmd $OF "tuned-adm profile_info" + FILES=$(find -L /etc/tuned/ -type f 2>/dev/null) + conf_files $OF $FILES + FILES=$(find -L /usr/lib/tuned/ -type f 2>/dev/null | grep '\.conf$') + conf_files $OF $FILES + FILES="/var/log/tuned/tuned.log" + test $ADD_OPTION_LOGS -gt 0 && log_files $OF 0 $FILES || log_files $OF $VAR_OPTION_LINE_COUNT $FILES + echolog Done + else + echolog Skipped + fi +} + cimom_info() { printlog "CIMOM..." test $OPTION_CIMOM -eq 0 && { echolog Excluded; return 1; } @@ -3853,8 +3835,7 @@ if [ -n "$OWSSLCHECK" ]; then if [ -L $OWSSLCHECK ]; then case $SLES_VER in - 90*) log_cmd $OF "readlink -fv $OWSSLCHECK" ;; - 10*|11*|12*) log_cmd $OF "readlink -ev $OWSSLCHECK" ;; + 11*|12*|15*) log_cmd $OF "readlink -ev $OWSSLCHECK" ;; esac fi fi @@ -3869,7 +3850,7 @@ if rpm_verify $OF sblim-sfcb; then log_cmd $OF "egrep -i \"cim|provider\" $RPMPATH" check_service $OF sfcb - log_cmd $OF "netstat -nlp | grep sfcb" + log_cmd $OF "ss -nlp | grep sfcb" conf_files $OF /etc/sfcb/sfcb.cfg log_cmd $OF "ls -lR --time-style=long-iso /etc/sfcb/" else @@ -3885,7 +3866,7 @@ OF=ib.txt addHeaderFile $OF case $SLES_VER in - 10*|11*) + 11*) if rpm_verify $OF ofed; then check_service $OF openibd conf_files $OF /etc/infiniband/openib.conf @@ -4061,7 +4042,7 @@ if rpm -q novell-nrm &>/dev/null; then check_service $OF novell-httpstkd conf_files $OF /etc/opt/novell/httpstkd.conf - log_cmd $OF 'netstat -nlp | grep -i http' + log_cmd $OF 'ss -nlp | grep -i http' log_cmd $OF 'ps -eaf | grep httpstkd' [ -d /etc/opt/novell/httpstkd ] && log_cmd $OF 'ls -lR --time-style=long-iso /etc/opt/novell/httpstkd' else @@ -4110,34 +4091,6 @@ echolog Done } -sam_info() { - printlog "Supportability Analysis..." - test $OPTION_SAM -eq 0 && { echolog Excluded; return 1; } - OF=sam.txt - addHeaderFile $OF - cd $LOG - test $ADD_OPTION_RPMV -gt 0 && RPMVER="--orphan-search" || RPMVER="--no-rpm-verify" - if rpm_verify $OF suse-sam; then - echonlog "Please Wait..." - wait_trace_on "sam -vvv --no-log-timestamp $RPMVER" - sam -vvv --no-log-timestamp $RPMVER &>/dev/null - wait_trace_off - conf_files $OF sam.log - rm -f sam.log sam.report sam.xml - if [ -s sam.html -a -s $VAR_OPTION_HEADER_FILE ]; then - mv sam.html sam.html.tmp - echo '<!--' > sam.html - cat $VAR_OPTION_HEADER_FILE >> sam.html - echo '-->' >> sam.html - cat sam.html.tmp >> sam.html - rm -f sam.html.tmp - fi - echolog Done - else - echolog Skipped - fi -} - transactional_info() { printlog "Transactional Update..." test $OPTION_TRANSACTIONAL -eq 0 && { echolog Excluded; return 1; } @@ -4376,6 +4329,7 @@ disk_info (( SLES_VER >= 110 )) && btrfs_info (( SLES_VER >= 120 )) && transactional_info + (( SLES_VER >= 120 )) && tuned_info yast_files #Minimum Requirement fslist_info audit_info @@ -4426,7 +4380,6 @@ smartmon_info [ -s ${FSLIST_ADD_FILE} ] && fslist_ufiles_info hardware_info #Minimum Requirement - (( SLES_VER >= 110 )) && sam_info rpm_full_verify exec_plugins (( OPTION_MOD > 0 )) && post_lsmod_list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/bin/supportconfig.rc new/supportutils-3.1/bin/supportconfig.rc --- old/supportutils-3.1/bin/supportconfig.rc 2018-01-29 22:09:21.246048097 +0100 +++ new/supportutils-3.1/bin/supportconfig.rc 2018-02-02 14:57:56.347744600 +0100 @@ -41,7 +41,6 @@ OPTION_PAM=1 OPTION_PRINT=1 OPTION_PROC=1 -OPTION_SAM=1 OPTION_SAR=1 OPTION_SLERT=1 OPTION_SLP=1 @@ -54,6 +53,7 @@ OPTION_SYSCONFIG=1 OPTION_SYSFS=1 OPTION_TRANSACTIONAL=1 +OPTION_TUNED=1 OPTION_UDEV=1 OPTION_UFILES=1 OPTION_UP=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/man/supportconfig.conf.5 new/supportutils-3.1/man/supportconfig.conf.5 --- old/supportutils-3.1/man/supportconfig.conf.5 2018-01-29 19:29:29.960858361 +0100 +++ new/supportutils-3.1/man/supportconfig.conf.5 2018-02-02 14:57:56.347744600 +0100 @@ -1,4 +1,4 @@ -.TH SUPPORTCONFIG.CONF 5 "23 Jan 2018" "supportutils" "Support Utilities Manual" +.TH SUPPORTCONFIG.CONF 5 "01 Feb 2018" "supportutils" "Support Utilities Manual" .SH NAME supportconfig.conf \- .BR supportconfig (1) @@ -123,9 +123,6 @@ OPTION_PROC Includes key /proc file content. \fBproc.txt\fR (1) .TP -OPTION_SAM -Supportability Analysis Module report. NOTE: This takes up to 10 minutes to complete. \fBsam.txt\fR (1) -.TP OPTION_SAR System Activity Reporting related information, including copies of the SAR data files. \fBsar.txt\fR (1) .TP @@ -163,6 +160,9 @@ OPTION_TRANSACTIONAL Gathers transactional update information. \fBtransactional.txt\fR (1) .TP +OPTION_TUNED +Gathers dynamic adaptive system tuning daemon information. \fBtuned.txt\fR (1) +.TP OPTION_UDEV UDEV device manager related information. \fBudev.txt\fR (1) .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/supportutils-3.1/spec/supportutils.changes new/supportutils-3.1/spec/supportutils.changes --- old/supportutils-3.1/spec/supportutils.changes 2018-01-29 23:45:26.292780588 +0100 +++ new/supportutils-3.1/spec/supportutils.changes 2018-02-02 21:41:33.163179239 +0100 @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Fri Feb 2 20:40:39 UTC 2018 - [email protected] + +- Accounts for firewalld now (bsc#1079137) +- Added dmesg taint seach +- Removed mii-tool from networking +- Updated HA to use chrony +- Added kdumptool calibrate to crash.txt +- Removed SLES_VER case for sles8,9 and 10 + +------------------------------------------------------------------- +Thu Feb 1 22:29:11 UTC 2018 - [email protected] + +- Added tuned feature OPTION_TUNED tuned.txt (bsc#1071545) +- Fixed udev service +- Fixed no disk device with sfdisk (bsc#1078638) + +------------------------------------------------------------------- +Tue Jan 30 16:56:36 UTC 2018 - [email protected] + +- Removed OPTION_SAM from man pages and resource file +- Validated missing commands +- Updated apparmor with systemctl service +- Replaced deprecated networking commands (bsc#1078318) + +------------------------------------------------------------------- +Mon Jan 29 23:06:21 UTC 2018 - [email protected] + +- Removed sam_info since suse_sam is no longer available +- Assigned SLE15 to SLES_VER selections (bsc#1078168) + +------------------------------------------------------------------- Mon Jan 29 22:44:52 UTC 2018 - [email protected] - Includes X without display issue (bsc#1077813)
