From 2c296e832fd220cbf7fcfa4362bd68432d3e30d7 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Wed, 10 Nov 2021 11:25:51 -0500
Subject: [PATCH] Remove references to CURCLOSEDAYS in setup

Curator is configured differently now so the variable set during setup is no longer in use
---
 setup/so-functions | 10 ----------
 setup/so-setup     |  5 -----
 setup/so-whiptail  | 14 --------------
 3 files changed, 29 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 582f66e1f..3f48cbd78 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -299,15 +299,6 @@ collect_adminuser_inputs() {
 	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() {
 	whiptail_management_interface_dns "8.8.8.8,8.8.4.4"
 
@@ -1609,7 +1600,6 @@ manager_pillar() {
 	printf '%s\n'\
 		"  elastalert: 1"\
 		"  es_port: $node_es_port"\
-		"  cur_close_days: $CURCLOSEDAYS"\
 		"  grafana: $GRAFANA"\
 		"  osquery: $OSQUERY"\
 		"  thehive: $THEHIVE"\
diff --git a/setup/so-setup b/setup/so-setup
index d71511971..19753d915 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -412,10 +412,6 @@ if [[ $is_manager && $is_node ]]; then
 	ZEEKVERSION=${ZEEKVERSION:-ZEEK}
 fi
 
-if [[ $is_node ]]; then
-	CURCLOSEDAYS=${CURCLOSEDAYS:-30}
-fi
-
 if [[ $is_import ]]; then
 	PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-auto}
 	MTU=${MTU:-1500}
@@ -551,7 +547,6 @@ if [[ $is_node && ! $is_eval ]]; then
 		collect_node_ls_pipeline_worker_count
 		collect_node_ls_pipeline_batch_size
 		collect_node_ls_input
-		collect_cur_close_days
 		collect_es_space_limit
 	else
 		NODE_ES_HEAP_SIZE=$ES_HEAP_SIZE
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 13bfa82b4..248c6fad6 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -299,18 +299,6 @@ whiptail_storage_requirements() {
 	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() {
 
 	[ -n "$TESTING" ] && return
@@ -580,7 +568,6 @@ whiptail_end_settings() {
 		__append_end_msg "  Logstash Worker Count: $LSPIPELINEWORKERS"
 		__append_end_msg "  Logstash Batch Size: $LSPIPELINEBATCH"
 		__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"
 	else
 		__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 Batch Size: $LSPIPELINEBATCH"
 		__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"
 	fi