Chore: Add v3-*-sjc flavors to openstack script

[releng/global-jjb.git] / shell / sysstat.sh

diff --git a/shell/sysstat.sh b/shell/sysstat.sh
index 66c18f8..627bd3c 100644 (file)
--- a/shell/sysstat.sh
+++ b/shell/sysstat.sh
@@ -11,15 +11,27 @@
 echo "---> sysstat.sh"
 set +e  # DON'T fail build if script fails.
 
+if awk -F/ '$2 == "docker"' /proc/self/cgroup | read -r; then
+    exit 0
+fi
+
+
 OS=$(facter operatingsystem)
 case "$OS" in
     Ubuntu)
+        os_release=$(facter operatingsystemrelease)
+        case $os_release in
+            18.04|20.04|22.04|24.04)
+                if ! systemctl status sysstat > /dev/null; then
+                    exit 0
+                fi
+                ;;
+            *)
+                echo "ERROR: Unknown Release: Ubuntu $os_release"
+                exit 1
+                ;;
+        esac
         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"
@@ -32,11 +44,10 @@ esac
 
 SAR_DIR="$WORKSPACE/archives/sar-reports"
 mkdir -p "$SAR_DIR"
-cp "$SYSSTAT_PATH/"* "$_"
+cp "$SYSSTAT_PATH/"* "$SAR_DIR"
 # 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]/}"
+while IFS="" read -r sarfilenum; do
+    [ -f "$sarfilenum" ] && LC_TIME=POSIX sar -A -f "$sarfilenum" > "$SAR_DIR/sar${sarfilenum//[!0-9]/}"
 done < <(find "$SYSSTAT_PATH" -name "sa[0-9]*" || true)
 
 # DON'T fail build if script fails.