Merge lp:~percona-toolkit-dev/percona-toolkit/pt-stalk-should-also-gather-dmesg-output-1349086 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.12

[Frank Cizmich]

pt-stalk now gathers data from dmesg. It gathers from the last 60 seconds to keep the data relevant to the triggered event.

Note:
This proposal has been submitted before for 2.2.11 but was put on hold because changes were only made on pt-stalk and not made in lib/bash/collect.sh

[Daniel Nichter (daniel-nichter)]

Would be nice to test somehow? But I guess we don't test many of the various collections. So ok otherwise.

review: Approve

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2014-09-25 13:48:22 +0000
+++ bin/pt-stalk	2014-10-22 18:33:46 +0000
@@ -779,6 +779,7 @@
 CMD_SYSCTL="${CMD_SYSCTL:-"$(_which sysctl)"}"
 CMD_TCPDUMP="${CMD_TCPDUMP:-"$(_which tcpdump)"}"
 CMD_VMSTAT="${CMD_VMSTAT:-"$(_which vmstat)"}"
+CMD_DMESG="${CMD_DMESG:-"$(_which dmesg)"}"
 
 [ -z "$CMD_SYSCTL" -a -x "/sbin/sysctl" ] && CMD_SYSCTL="/sbin/sysctl"
 
@@ -862,6 +863,14 @@
    if [ "$CMD_SYSCTL" ]; then
       $CMD_SYSCTL -a >> "$d/$p-sysctl" &
    fi
+
+   # collect dmesg events from 60 seconds ago until present
+   if [ "$CMD_DMESG" ]; then
+      local UPTIME=`cat /proc/uptime | awk '{ print $1 }'`
+      local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}')
+      $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & 
+   fi
+
    local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
    if [ "$CMD_VMSTAT" ]; then
       $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" &
@@ -876,6 +885,7 @@
       $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" &
    fi
 
+
    $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" &
    local mysqladmin_pid=$!
 

=== modified file 'lib/bash/collect.sh'
--- lib/bash/collect.sh	2013-12-14 04:19:51 +0000
+++ lib/bash/collect.sh	2014-10-22 18:33:46 +0000
@@ -40,6 +40,7 @@
 CMD_SYSCTL="${CMD_SYSCTL:-"$(_which sysctl)"}"
 CMD_TCPDUMP="${CMD_TCPDUMP:-"$(_which tcpdump)"}"
 CMD_VMSTAT="${CMD_VMSTAT:-"$(_which vmstat)"}"
+CMD_DMESG="${CMD_DMESG:-"$(_which dmesg)"}"
 
 # Try to find command manually.
 [ -z "$CMD_SYSCTL" -a -x "/sbin/sysctl" ] && CMD_SYSCTL="/sbin/sysctl"
@@ -146,6 +147,14 @@
    if [ "$CMD_SYSCTL" ]; then
       $CMD_SYSCTL -a >> "$d/$p-sysctl" &
    fi
+
+   # collect dmesg events from 60 seconds ago until present
+   if [ "$CMD_DMESG" ]; then
+      local UPTIME=`cat /proc/uptime | awk '{ print $1 }'`
+      local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}')
+      $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & 
+   fi
+
    local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
    if [ "$CMD_VMSTAT" ]; then
       $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" &