X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fsysstat.sh;h=d90061c01513c824ee27faa359f9343a3b14ab29;hb=refs%2Ftags%2Fv0.4.0;hp=022374ad24cd06f448090bcb1df3d92abdfb4c89;hpb=5785ce683ff42678e42565aee81ffc5f840990b3;p=releng%2Fglobal-jjb.git diff --git a/shell/sysstat.sh b/shell/sysstat.sh index 022374ad..d90061c0 100644 --- a/shell/sysstat.sh +++ b/shell/sysstat.sh @@ -15,6 +15,11 @@ OS=$(facter operatingsystem) case "$OS" in Ubuntu) SYSSTAT_PATH="/var/log/sysstat" + + # Dont run the script when systat is not enabled by default + if ! grep --quiet 'ENABLED="true"' "/etc/default/sysstat"; then + exit 0 + fi ;; CentOS|RedHat) SYSSTAT_PATH="/var/log/sa" @@ -27,11 +32,11 @@ esac SAR_DIR="$WORKSPACE/archives/sar-reports" mkdir -p "$SAR_DIR" -cp "$SYSSTAT_PATH/"* $_ +cp "$SYSSTAT_PATH/"* "$_" # convert sar data to ascii format while IFS="" read -r s do - [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/"sar${s//[!0-9]/} + [ -f "$s" ] && LC_TIME=POSIX sar -A -f "$s" > "$SAR_DIR/sar${s//[!0-9]/}" done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true) # DON'T fail build if script fails.