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

Remove references to CURCLOSEDAYS in setup

Browse Source 
Curator is configured differently now so the variable set during setup is no longer in use
This commit is contained in:
William Wernert
2021-11-10 11:25:51 -05:00
parent 04d2b52306
commit 2c296e832f
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/so-functions
View File

@@ -299,15 +299,6 @@ collect_adminuser_inputs() {
done done
} }
collect_cur_close_days() {
whiptail_cur_close_days "$CURCLOSEDAYS"
while ! valid_int "$CURCLOSEDAYS"; do
whiptail_invalid_input
whiptail_cur_close_days "$CURCLOSEDAYS"
done
}
collect_dns() { collect_dns() {
whiptail_management_interface_dns "8.8.8.8,8.8.4.4" whiptail_management_interface_dns "8.8.8.8,8.8.4.4"
@@ -1609,7 +1600,6 @@ manager_pillar() {
printf '%s\n'\ printf '%s\n'\
" elastalert: 1"\ " elastalert: 1"\
" es_port: $node_es_port"\ " es_port: $node_es_port"\
" cur_close_days: $CURCLOSEDAYS"\
" grafana: $GRAFANA"\ " grafana: $GRAFANA"\
" osquery: $OSQUERY"\ " osquery: $OSQUERY"\
" thehive: $THEHIVE"\ " thehive: $THEHIVE"\

5
setup/so-setup
View File

@@ -412,10 +412,6 @@ if [[ $is_manager && $is_node ]]; then
ZEEKVERSION=${ZEEKVERSION:-ZEEK} ZEEKVERSION=${ZEEKVERSION:-ZEEK}
fi fi
if [[ $is_node ]]; then
CURCLOSEDAYS=${CURCLOSEDAYS:-30}
fi
if [[ $is_import ]]; then if [[ $is_import ]]; then
PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-auto} PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-auto}
MTU=${MTU:-1500} MTU=${MTU:-1500}
@@ -551,7 +547,6 @@ if [[ $is_node && ! $is_eval ]]; then
collect_node_ls_pipeline_worker_count collect_node_ls_pipeline_worker_count
collect_node_ls_pipeline_batch_size collect_node_ls_pipeline_batch_size
collect_node_ls_input collect_node_ls_input
collect_cur_close_days
collect_es_space_limit collect_es_space_limit
else else
NODE_ES_HEAP_SIZE=$ES_HEAP_SIZE NODE_ES_HEAP_SIZE=$ES_HEAP_SIZE

14
setup/so-whiptail
View File

@@ -299,18 +299,6 @@ whiptail_storage_requirements() {
whiptail_check_exitstatus $exitstatus whiptail_check_exitstatus $exitstatus
} }
whiptail_cur_close_days() {
[ -n "$TESTING" ] && return
CURCLOSEDAYS=$(whiptail --title "$whiptail_title" --inputbox \
"Please specify the threshold (in days) at which Elasticsearch indices will be closed:" 10 75 "$1" 3>&1 1>&2 2>&3)
local exitstatus=$?
whiptail_check_exitstatus $exitstatus
}
whiptail_dhcp_or_static() { whiptail_dhcp_or_static() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
@@ -580,7 +568,6 @@ whiptail_end_settings() {
__append_end_msg " Logstash Worker Count: $LSPIPELINEWORKERS" __append_end_msg " Logstash Worker Count: $LSPIPELINEWORKERS"
__append_end_msg " Logstash Batch Size: $LSPIPELINEBATCH" __append_end_msg " Logstash Batch Size: $LSPIPELINEBATCH"
__append_end_msg " Logstash Input Threads: $LSINPUTTHREADS" __append_end_msg " Logstash Input Threads: $LSINPUTTHREADS"
__append_end_msg " Curator Day Cutoff: $CURCLOSEDAYS days"
__append_end_msg " Elasticsearch Storage Space: ${log_size_limit}GB" __append_end_msg " Elasticsearch Storage Space: ${log_size_limit}GB"
else else
__append_end_msg "Elasticsearch Heap Size: $NODE_ES_HEAP_SIZE" __append_end_msg "Elasticsearch Heap Size: $NODE_ES_HEAP_SIZE"
@@ -588,7 +575,6 @@ whiptail_end_settings() {
__append_end_msg "Logstash Worker Count: $LSPIPELINEWORKERS" __append_end_msg "Logstash Worker Count: $LSPIPELINEWORKERS"
__append_end_msg "Logstash Batch Size: $LSPIPELINEBATCH" __append_end_msg "Logstash Batch Size: $LSPIPELINEBATCH"
__append_end_msg "Logstash Input Threads: $LSINPUTTHREADS" __append_end_msg "Logstash Input Threads: $LSINPUTTHREADS"
__append_end_msg "Curator Close After: $CURCLOSEDAYS days"
__append_end_msg "Elasticsearch Storage Space: ${log_size_limit}GB" __append_end_msg "Elasticsearch Storage Space: ${log_size_limit}GB"
fi fi