Merge pull request #9421 from Security-Onion-Solutions/mkr24

Redis defaults.yaml

setup/so-functions

@@ -1383,9 +1383,10 @@ kratos_pillar() {
 	touch $adv_kratos_pillar_file
 	printf '%s\n'\
 		"kratos:"\
-		"  kratoskey: '$KRATOSKEY'"\
-		"  sessiontimeout: '24h'"\
-		"  mfa_issuer: 'Security Onion'"\
+		"  config:"\
+		"    secrets:"\
+		"      default:"\
+		"        - '$KRATOSKEY'"\
 		"" > "$kratos_pillar_file"
 }
 
@@ -1494,9 +1495,13 @@ docker_pillar() {
 redis_pillar() {
 	title "Create the redis pillar file"
 	touch $adv_redis_pillar_file
-	printf '%s\n'\
-		"redis_settings:"\
-		"  redis_maxmemory: 812" > "$redis_pillar_file"
+	touch $redis_pillar_file
+}
+
+influxdb_pillar() {
+	title "Create the influxdb pillar file"
+	touch $adv_influxdb_pillar_file
+	touch $influxdb_pillar_file
 }
 
 mark_version() {

setup/so-variables

@@ -84,7 +84,7 @@ mkdir -p $local_salt_dir/salt/firewall/hostgroups
 mkdir -p $local_salt_dir/salt/firewall/portgroups
 mkdir -p $local_salt_dir/salt/firewall/ports
 
-for THEDIR in bpf pcap elasticsearch ntp firewall redis backup strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf filebeat logstash soc manager kratos idstools idh elastalert 
+for THEDIR in bpf pcap elasticsearch ntp firewall redis backup influxdb strelka sensoroni curator soc soctopus docker zeek suricata nginx telegraf filebeat logstash soc manager kratos idstools idh elastalert 
 do
     mkdir -p $local_salt_dir/pillar/$THEDIR
     touch $local_salt_dir/pillar/$THEDIR/adv_$THEDIR.sls
@@ -210,3 +210,9 @@ export telegraf_pillar_file
 
 adv_telegraf_pillar_file="$local_salt_dir/pillar/telegraf/adv_telegraf.sls"
 export adv_telegraf_pillar_file
+
+influxdb_pillar_file="$local_salt_dir/pillar/influxdb/soc_influxdb.sls"
+export influxdb_pillar_file
+
+adv_influxdb_pillar_file="$local_salt_dir/pillar/influxdb/adv_influxdb.sls"
+export adv_influxdb_pillar_file