mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-07 09:42:46 +01:00
Merge branch 'dev' into foxtrot
# Conflicts: # salt/common/tools/sbin/soup
This commit is contained in:
@@ -1243,8 +1243,13 @@ es_heapsize() {
|
||||
# https://www.elastic.co/guide/en/elasticsearch/guide/current/heap-sizing.html
|
||||
ES_HEAP_SIZE="25000m"
|
||||
else
|
||||
# Set heap size to 25% of available memory
|
||||
ES_HEAP_SIZE=$(( total_mem / 4 ))"m"
|
||||
# Set heap size to 33% of available memory
|
||||
ES_HEAP_SIZE=$(( total_mem / 3 ))
|
||||
if [ "$ES_HEAP_SIZE" -ge 25001 ] ; then
|
||||
ES_HEAP_SIZE="25000m"
|
||||
else
|
||||
ES_HEAP_SIZE=$ES_HEAP_SIZE"m"
|
||||
fi
|
||||
fi
|
||||
export ES_HEAP_SIZE
|
||||
|
||||
@@ -1686,8 +1691,8 @@ manager_global() {
|
||||
" so-zeek:"\
|
||||
" shards: 5"\
|
||||
" warm: 7"\
|
||||
" close: 365"\
|
||||
" delete: 45"\
|
||||
" close: 45"\
|
||||
" delete: 365"\
|
||||
"minio:"\
|
||||
" access_key: '$ACCESS_KEY'"\
|
||||
" access_secret: '$ACCESS_SECRET'"\
|
||||
|
||||
Reference in New Issue
Block a user