Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
grep: DO NOT return exit code 1 on no match
[releng/global-jjb.git]
/
shell
/
sysstat.sh
diff --git
a/shell/sysstat.sh
b/shell/sysstat.sh
index
022374a
..
d90061c
100644
(file)
--- a/
shell/sysstat.sh
+++ b/
shell/sysstat.sh
@@
-15,6
+15,11
@@
OS=$(facter operatingsystem)
case "$OS" in
Ubuntu)
SYSSTAT_PATH="/var/log/sysstat"
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"
;;
CentOS|RedHat)
SYSSTAT_PATH="/var/log/sa"
@@
-27,11
+32,11
@@
esac
SAR_DIR="$WORKSPACE/archives/sar-reports"
mkdir -p "$SAR_DIR"
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
# 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.
done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
# DON'T fail build if script fails.