CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11677 from Security-Onion-Solutions/lowram

Browse Source 
Allow 16GB of memory
This commit is contained in:
Mike Reeves
2023-11-01 16:38:40 -04:00
committed by GitHub
parent f9e2940181 e6a0838e4c
commit cd8949d26b
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
files/firewall/assigned_hostgroups.local.map.yaml
View File

@@ -12,7 +12,6 @@ role:
eval: eval:
fleet: fleet:
heavynode: heavynode:
helixsensor:
idh: idh:
import: import:
manager: manager:

27
setup/so-functions
View File

@@ -562,7 +562,7 @@ check_requirements() {
req_cores=4 req_cores=4
req_nics=2 req_nics=2
elif [[ $is_standalone ]]; then elif [[ $is_standalone ]]; then
req_mem=24 req_mem=16
req_cores=4 req_cores=4
req_nics=2 req_nics=2
elif [[ $is_manager ]]; then elif [[ $is_manager ]]; then
@@ -586,7 +586,7 @@ check_requirements() {
req_cores=4 req_cores=4
req_nics=1 req_nics=1
elif [[ $is_heavynode ]]; then elif [[ $is_heavynode ]]; then
req_mem=24 req_mem=16
req_cores=4 req_cores=4
req_nics=2 req_nics=2
elif [[ $is_idh ]]; then elif [[ $is_idh ]]; then
@@ -651,6 +651,17 @@ check_requirements() {
if [[ $total_mem_hr -lt $req_mem ]]; then if [[ $total_mem_hr -lt $req_mem ]]; then
whiptail_requirements_error "memory" "${total_mem_hr} GB" "${req_mem} GB" whiptail_requirements_error "memory" "${total_mem_hr} GB" "${req_mem} GB"
if [[ $is_standalone || $is_heavynode ]]; then
echo "This install type will fail with less than $req_mem GB of memory. Exiting setup."
exit 0
fi
fi
if [[ $is_standalone || $is_heavynode ]]; then
if [[ $total_mem_hr -gt 15 && $total_mem_hr -lt 24 ]]; then
low_mem=true
else
low_mem=false
fi
fi fi
} }
@@ -956,9 +967,7 @@ docker_seed_registry() {
if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then
if [ "$install_type" == 'IMPORT' ]; then if [ "$install_type" == 'IMPORT' ]; then
container_list 'so-import' container_list 'so-import'
elif [ "$install_type" == 'HELIXSENSOR' ]; then
container_list 'so-helix'
else else
container_list container_list
fi fi
@@ -1217,7 +1226,7 @@ ls_heapsize() {
fi fi
case "$install_type" in case "$install_type" in
'MANAGERSEARCH' | 'HEAVYNODE' | 'HELIXSENSOR' | 'STANDALONE') 'MANAGERSEARCH' | 'HEAVYNODE' | 'STANDALONE')
LS_HEAP_SIZE='1000m' LS_HEAP_SIZE='1000m'
;; ;;
'EVAL') 'EVAL')
@@ -1699,7 +1708,11 @@ drop_install_options() {
echo "INTERFACE=$INTERFACE" >> /opt/so/install.txt echo "INTERFACE=$INTERFACE" >> /opt/so/install.txt
NODETYPE=${install_type^^} NODETYPE=${install_type^^}
echo "NODETYPE=$NODETYPE" >> /opt/so/install.txt echo "NODETYPE=$NODETYPE" >> /opt/so/install.txt
echo "CORECOUNT=$lb_procs" >> /opt/so/install.txt if [[ $low_mem == "true" ]]; then
echo "CORECOUNT=1" >> /opt/so/install.txt
else
echo "CORECOUNT=$lb_procs" >> /opt/so/install.txt
fi
echo "LSHOSTNAME=$HOSTNAME" >> /opt/so/install.txt echo "LSHOSTNAME=$HOSTNAME" >> /opt/so/install.txt
echo "LSHEAP=$LS_HEAP_SIZE" >> /opt/so/install.txt echo "LSHEAP=$LS_HEAP_SIZE" >> /opt/so/install.txt
echo "CPUCORES=$num_cpu_cores" >> /opt/so/install.txt echo "CPUCORES=$num_cpu_cores" >> /opt/so/install.txt

6
setup/so-setup
View File

@@ -676,7 +676,11 @@ if ! [[ -f $install_opt_file ]]; then
export MAINIP=$MAINIP export MAINIP=$MAINIP
export PATCHSCHEDULENAME=$PATCHSCHEDULENAME export PATCHSCHEDULENAME=$PATCHSCHEDULENAME
export INTERFACE=$INTERFACE export INTERFACE=$INTERFACE
export CORECOUNT=$lb_procs if [[ $low_mem == "true" ]]; then
export CORECOUNT=1
else
export CORECOUNT=$lb_procs
fi
export LSHOSTNAME=$HOSTNAME export LSHOSTNAME=$HOSTNAME
export LSHEAP=$LS_HEAP_SIZE export LSHEAP=$LS_HEAP_SIZE
export CPUCORES=$num_cpu_cores export CPUCORES=$num_cpu_cores