From e8d2a6fdc2321ae38a2b11b54fcd632a8dc475c0 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 19:32:14 -0400 Subject: [PATCH 1/7] Disk Space Check --- salt/common/tools/sbin/soup | 159 ++++++++++++++++++++---------------- 1 file changed, 90 insertions(+), 69 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 500651e80..637700de4 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -36,9 +36,85 @@ manager_check() { fi } +echo "Checking to see if this is a manager." +echo "" +manager_check + +# List all the containers +if [ $MANAGERCHECK == 'so-import' ]; then + TRUSTED_CONTAINERS=( \ + "so-idstools" \ + "so-nginx" \ + "so-filebeat" \ + "so-suricata" \ + "so-soc" \ + "so-elasticsearch" \ + "so-kibana" \ + "so-kratos" \ + "so-suricata" \ + "so-registry" \ + "so-pcaptools" \ + "so-zeek" ) +elif [ $MANAGERCHECK != 'so-helix' ]; then + TRUSTED_CONTAINERS=( \ + "so-acng" \ + "so-thehive-cortex" \ + "so-curator" \ + "so-domainstats" \ + "so-elastalert" \ + "so-elasticsearch" \ + "so-filebeat" \ + "so-fleet" \ + "so-fleet-launcher" \ + "so-freqserver" \ + "so-grafana" \ + "so-idstools" \ + "so-influxdb" \ + "so-kibana" \ + "so-kratos" \ + "so-logstash" \ + "so-minio" \ + "so-mysql" \ + "so-nginx" \ + "so-pcaptools" \ + "so-playbook" \ + "so-redis" \ + "so-soc" \ + "so-soctopus" \ + "so-steno" \ + "so-strelka-frontend" \ + "so-strelka-manager" \ + "so-strelka-backend" \ + "so-strelka-filestream" \ + "so-suricata" \ + "so-telegraf" \ + "so-thehive" \ + "so-thehive-es" \ + "so-wazuh" \ + "so-zeek" ) +else + TRUSTED_CONTAINERS=( \ + "so-filebeat" \ + "so-idstools" \ + "so-logstash" \ + "so-nginx" \ + "so-redis" \ + "so-steno" \ + "so-suricata" \ + "so-telegraf" \ + "so-zeek" ) +fi + OLD_VERSIONS=( \ + "2.0.0-rc.1" \ + "2.0.2-rc.1" \ + "2.0.3-rc.1" ) + clean_dockers() { # Place Holder for cleaning up old docker images - echo "" + echo "Trying to clean up old dockers." + docker system prune -a -f +} + } clone_to_tmp() { @@ -185,72 +261,20 @@ rc2_to_rc3() { } -update_dockers() { - # List all the containers - if [ $MANAGERCHECK == 'so-import' ]; then - TRUSTED_CONTAINERS=( \ - "so-idstools" \ - "so-nginx" \ - "so-filebeat" \ - "so-suricata" \ - "so-soc" \ - "so-elasticsearch" \ - "so-kibana" \ - "so-kratos" \ - "so-suricata" \ - "so-registry" \ - "so-pcaptools" \ - "so-zeek" ) - elif [ $MANAGERCHECK != 'so-helix' ]; then - TRUSTED_CONTAINERS=( \ - "so-acng" \ - "so-thehive-cortex" \ - "so-curator" \ - "so-domainstats" \ - "so-elastalert" \ - "so-elasticsearch" \ - "so-filebeat" \ - "so-fleet" \ - "so-fleet-launcher" \ - "so-freqserver" \ - "so-grafana" \ - "so-idstools" \ - "so-influxdb" \ - "so-kibana" \ - "so-kratos" \ - "so-logstash" \ - "so-minio" \ - "so-mysql" \ - "so-nginx" \ - "so-pcaptools" \ - "so-playbook" \ - "so-redis" \ - "so-soc" \ - "so-soctopus" \ - "so-steno" \ - "so-strelka-frontend" \ - "so-strelka-manager" \ - "so-strelka-backend" \ - "so-strelka-filestream" \ - "so-suricata" \ - "so-telegraf" \ - "so-thehive" \ - "so-thehive-es" \ - "so-wazuh" \ - "so-zeek" ) - else - TRUSTED_CONTAINERS=( \ - "so-filebeat" \ - "so-idstools" \ - "so-logstash" \ - "so-nginx" \ - "so-redis" \ - "so-steno" \ - "so-suricata" \ - "so-telegraf" \ - "so-zeek" ) - fi +space_check() { + # Check to see if there is enough space + CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}') + if [ "$CURRENTSPACE" -lt "1000" ]; then + read -rsn1 -p"You are low on disk space. Upgrade will try and clean up space. Press any key to continue or Ctrl+c to exit"; + clean_dockers + else + echo "Plenty of space for upgrading" + fi + +} +update_dockers() { + # Download the containers from the interwebs for i in "${TRUSTED_CONTAINERS[@]}" do @@ -350,9 +374,6 @@ while getopts ":b" opt; do esac done -echo "Checking to see if this is a manager." -echo "" -manager_check echo "Found that Security Onion $INSTALLEDVERSION is currently installed." echo "" detect_os From 07e536df98692a3e22ed36e125b076665b5ba5f5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 19:42:58 -0400 Subject: [PATCH 2/7] Disk Space Check --- salt/common/tools/sbin/soup | 146 +++++++++++++++++------------------- 1 file changed, 69 insertions(+), 77 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 637700de4..df8703e83 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -36,87 +36,12 @@ manager_check() { fi } -echo "Checking to see if this is a manager." -echo "" -manager_check - -# List all the containers -if [ $MANAGERCHECK == 'so-import' ]; then - TRUSTED_CONTAINERS=( \ - "so-idstools" \ - "so-nginx" \ - "so-filebeat" \ - "so-suricata" \ - "so-soc" \ - "so-elasticsearch" \ - "so-kibana" \ - "so-kratos" \ - "so-suricata" \ - "so-registry" \ - "so-pcaptools" \ - "so-zeek" ) -elif [ $MANAGERCHECK != 'so-helix' ]; then - TRUSTED_CONTAINERS=( \ - "so-acng" \ - "so-thehive-cortex" \ - "so-curator" \ - "so-domainstats" \ - "so-elastalert" \ - "so-elasticsearch" \ - "so-filebeat" \ - "so-fleet" \ - "so-fleet-launcher" \ - "so-freqserver" \ - "so-grafana" \ - "so-idstools" \ - "so-influxdb" \ - "so-kibana" \ - "so-kratos" \ - "so-logstash" \ - "so-minio" \ - "so-mysql" \ - "so-nginx" \ - "so-pcaptools" \ - "so-playbook" \ - "so-redis" \ - "so-soc" \ - "so-soctopus" \ - "so-steno" \ - "so-strelka-frontend" \ - "so-strelka-manager" \ - "so-strelka-backend" \ - "so-strelka-filestream" \ - "so-suricata" \ - "so-telegraf" \ - "so-thehive" \ - "so-thehive-es" \ - "so-wazuh" \ - "so-zeek" ) -else - TRUSTED_CONTAINERS=( \ - "so-filebeat" \ - "so-idstools" \ - "so-logstash" \ - "so-nginx" \ - "so-redis" \ - "so-steno" \ - "so-suricata" \ - "so-telegraf" \ - "so-zeek" ) -fi - OLD_VERSIONS=( \ - "2.0.0-rc.1" \ - "2.0.2-rc.1" \ - "2.0.3-rc.1" ) - clean_dockers() { # Place Holder for cleaning up old docker images echo "Trying to clean up old dockers." docker system prune -a -f } -} - clone_to_tmp() { # TODO Need to add a air gap option # Clean old files @@ -274,7 +199,71 @@ space_check() { } update_dockers() { - + # List all the containers + if [ $MANAGERCHECK == 'so-import' ]; then + TRUSTED_CONTAINERS=( \ + "so-idstools" \ + "so-nginx" \ + "so-filebeat" \ + "so-suricata" \ + "so-soc" \ + "so-elasticsearch" \ + "so-kibana" \ + "so-kratos" \ + "so-suricata" \ + "so-registry" \ + "so-pcaptools" \ + "so-zeek" ) + elif [ $MANAGERCHECK != 'so-helix' ]; then + TRUSTED_CONTAINERS=( \ + "so-acng" \ + "so-thehive-cortex" \ + "so-curator" \ + "so-domainstats" \ + "so-elastalert" \ + "so-elasticsearch" \ + "so-filebeat" \ + "so-fleet" \ + "so-fleet-launcher" \ + "so-freqserver" \ + "so-grafana" \ + "so-idstools" \ + "so-influxdb" \ + "so-kibana" \ + "so-kratos" \ + "so-logstash" \ + "so-minio" \ + "so-mysql" \ + "so-nginx" \ + "so-pcaptools" \ + "so-playbook" \ + "so-redis" \ + "so-soc" \ + "so-soctopus" \ + "so-steno" \ + "so-strelka-frontend" \ + "so-strelka-manager" \ + "so-strelka-backend" \ + "so-strelka-filestream" \ + "so-suricata" \ + "so-telegraf" \ + "so-thehive" \ + "so-thehive-es" \ + "so-wazuh" \ + "so-zeek" ) + else + TRUSTED_CONTAINERS=( \ + "so-filebeat" \ + "so-idstools" \ + "so-logstash" \ + "so-nginx" \ + "so-redis" \ + "so-steno" \ + "so-suricata" \ + "so-telegraf" \ + "so-zeek" ) + fi + # Download the containers from the interwebs for i in "${TRUSTED_CONTAINERS[@]}" do @@ -374,6 +363,9 @@ while getopts ":b" opt; do esac done +echo "Checking to see if this is a manager." +echo "" +manager_check echo "Found that Security Onion $INSTALLEDVERSION is currently installed." echo "" detect_os @@ -387,7 +379,7 @@ echo "" echo "Let's see if we need to update Security Onion." upgrade_check - +space_check echo "" echo "Performing upgrade from Security Onion $INSTALLEDVERSION to Security Onion $NEWVERSION." From 6eb3333af497a167bb368708a8152c61b23ef5b7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 19:46:16 -0400 Subject: [PATCH 3/7] Disk Space Check Final --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index df8703e83..d95974958 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -189,7 +189,7 @@ rc2_to_rc3() { space_check() { # Check to see if there is enough space CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}') - if [ "$CURRENTSPACE" -lt "1000" ]; then + if [ "$CURRENTSPACE" -lt "10" ]; then read -rsn1 -p"You are low on disk space. Upgrade will try and clean up space. Press any key to continue or Ctrl+c to exit"; clean_dockers else From eafb4e81a5b8e98a06b020a40ac9d05cc7dfd911 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 20:01:53 -0400 Subject: [PATCH 4/7] Disk Space Check Final Final --- salt/common/tools/sbin/soup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index d95974958..9d4d54a93 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -188,8 +188,8 @@ rc2_to_rc3() { space_check() { # Check to see if there is enough space - CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}') - if [ "$CURRENTSPACE" -lt "10" ]; then + CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') + if [ "$CURRENTSPACE" -lt 10 ]; then read -rsn1 -p"You are low on disk space. Upgrade will try and clean up space. Press any key to continue or Ctrl+c to exit"; clean_dockers else From 9ef2b93586b7caa4a29e53526f9fda32493f0df3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 20:09:53 -0400 Subject: [PATCH 5/7] Disk Space Check Final Final --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 9d4d54a93..1b3d88c74 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -189,7 +189,7 @@ rc2_to_rc3() { space_check() { # Check to see if there is enough space CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') - if [ "$CURRENTSPACE" -lt 10 ]; then + if [ "$CURRENTSPACE" -lt "10" ]; then read -rsn1 -p"You are low on disk space. Upgrade will try and clean up space. Press any key to continue or Ctrl+c to exit"; clean_dockers else From 62a8e676d966d98354a4408a43079d156d0c0ed1 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 20:11:04 -0400 Subject: [PATCH 6/7] Disk Space Check Final Final --- salt/common/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 1b3d88c74..228f4a39d 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -190,7 +190,7 @@ space_check() { # Check to see if there is enough space CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') if [ "$CURRENTSPACE" -lt "10" ]; then - read -rsn1 -p"You are low on disk space. Upgrade will try and clean up space. Press any key to continue or Ctrl+c to exit"; + echo "You are low on disk space. Upgrade will try and clean up space."; clean_dockers else echo "Plenty of space for upgrading" From c31d998061f04c2073a99c0c8e2f1664dd7948f7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 14 Sep 2020 20:17:28 -0400 Subject: [PATCH 7/7] Disk Space Check Final Final Final --- salt/common/tools/sbin/soup | 2 -- 1 file changed, 2 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 228f4a39d..9af10175c 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -398,8 +398,6 @@ echo "Making pillar changes." pillar_changes echo "" -echo "Cleaning up old dockers." -clean_dockers echo "" echo "Updating dockers to $NEWVERSION." update_dockers