From aaa48f6a1adf56fdde5f9b072f32fbd402a1392f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 29 Aug 2024 13:41:58 -0400
Subject: [PATCH] support for fleet, heavynode, receiver, idh

---
 salt/manager/tools/sbin/so-salt-cloud |  1 -
 salt/setup/virt/fleet.yaml            | 18 ++++++++++++++++++
 salt/setup/virt/heavynode.yaml        | 18 ++++++++++++++++++
 salt/setup/virt/idh.yaml              | 18 ++++++++++++++++++
 salt/setup/virt/receiver.yaml         | 18 ++++++++++++++++++
 salt/setup/virt/searchnode.yaml       | 12 ++++++------
 salt/setup/virt/sensor.yaml           |  4 ++--
 salt/setup/virt/soinstall.map.jinja   | 26 +++++++++++++++-----------
 8 files changed, 95 insertions(+), 20 deletions(-)
 create mode 100644 salt/setup/virt/fleet.yaml
 create mode 100644 salt/setup/virt/heavynode.yaml
 create mode 100644 salt/setup/virt/idh.yaml
 create mode 100644 salt/setup/virt/receiver.yaml

diff --git a/salt/manager/tools/sbin/so-salt-cloud b/salt/manager/tools/sbin/so-salt-cloud
index d0b87f5e7..b34252730 100644
--- a/salt/manager/tools/sbin/so-salt-cloud
+++ b/salt/manager/tools/sbin/so-salt-cloud
@@ -11,7 +11,6 @@ import re
 import threading
 
 def call_so_firewall_minion(ip, role):
-    print("call_so_firewall_minion called")
     try:
         # Start so-firewall-minion as a subprocess
         process = subprocess.Popen(
diff --git a/salt/setup/virt/fleet.yaml b/salt/setup/virt/fleet.yaml
new file mode 100644
index 000000000..8a6aa06de
--- /dev/null
+++ b/salt/setup/virt/fleet.yaml
@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE:
+NODETYPE: FLEET
+CORECOUNT: 8
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 8
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 8
+MEMORY: 8
+DISKS: 0
+COPPER: 0
+SFP: 0
diff --git a/salt/setup/virt/heavynode.yaml b/salt/setup/virt/heavynode.yaml
new file mode 100644
index 000000000..8cf2e0392
--- /dev/null
+++ b/salt/setup/virt/heavynode.yaml
@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE: bond0
+NODETYPE: HEAVYNODE
+CORECOUNT: 8
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 8
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 8
+MEMORY: 16
+DISKS: 0
+COPPER: 0
+SFP: 0
diff --git a/salt/setup/virt/idh.yaml b/salt/setup/virt/idh.yaml
new file mode 100644
index 000000000..0e1ef8be0
--- /dev/null
+++ b/salt/setup/virt/idh.yaml
@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE:
+NODETYPE: IDH
+CORECOUNT: 2
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 2
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 2
+MEMORY: 1
+DISKS: 0
+COPPER: 0
+SFP: 0
diff --git a/salt/setup/virt/receiver.yaml b/salt/setup/virt/receiver.yaml
new file mode 100644
index 000000000..5a5c714aa
--- /dev/null
+++ b/salt/setup/virt/receiver.yaml
@@ -0,0 +1,18 @@
+MAINIP:
+MNIC: eth0
+NODE_DESCRIPTION: 'vm'
+ES_HEAP_SIZE:
+PATCHSCHEDULENAME:
+INTERFACE:
+NODETYPE: RECEIVER
+CORECOUNT: 2
+LSHOSTNAME:
+LSHEAP:
+CPUCORES: 2
+IDH_MGTRESTRICT:
+IDH_SERVICES:
+CPU: 2
+MEMORY: 8
+DISKS: 0
+COPPER: 0
+SFP: 0
diff --git a/salt/setup/virt/searchnode.yaml b/salt/setup/virt/searchnode.yaml
index f48502b94..2e1568f29 100644
--- a/salt/setup/virt/searchnode.yaml
+++ b/salt/setup/virt/searchnode.yaml
@@ -1,18 +1,18 @@
 MAINIP:
 MNIC: eth0
-NODE_DESCRIPTION: 'virt search'
+NODE_DESCRIPTION: 'vm'
 ES_HEAP_SIZE:
 PATCHSCHEDULENAME:
-INTERFACE: bond0
+INTERFACE:
 NODETYPE: SEARCHNODE
-CORECOUNT: 16
+CORECOUNT: 8
 LSHOSTNAME:
 LSHEAP:
-CPUCORES: 16
+CPUCORES: 8
 IDH_MGTRESTRICT:
 IDH_SERVICES:
-CPU: 16
-MEMORY: 32
+CPU: 8
+MEMORY: 16
 DISKS: 1
 COPPER: 0
 SFP: 0
diff --git a/salt/setup/virt/sensor.yaml b/salt/setup/virt/sensor.yaml
index e90bece35..e7064bdfe 100644
--- a/salt/setup/virt/sensor.yaml
+++ b/salt/setup/virt/sensor.yaml
@@ -1,6 +1,6 @@
 MAINIP:
 MNIC: eth0
-NODE_DESCRIPTION: 'virt sensor'
+NODE_DESCRIPTION: 'vm'
 ES_HEAP_SIZE:
 PATCHSCHEDULENAME:
 INTERFACE: bond0
@@ -12,7 +12,7 @@ CPUCORES: 4
 IDH_MGTRESTRICT:
 IDH_SERVICES:
 CPU: 8
-MEMORY: 8
+MEMORY: 12
 DISKS: 0
 COPPER: 0
 SFP: 0
diff --git a/salt/setup/virt/soinstall.map.jinja b/salt/setup/virt/soinstall.map.jinja
index 566b27445..c16f6cd78 100644
--- a/salt/setup/virt/soinstall.map.jinja
+++ b/salt/setup/virt/soinstall.map.jinja
@@ -11,11 +11,24 @@
 {% do DATA.update({'CORECOUNT': grains.num_cpus}) %}
 {% do DATA.update({'CPUCORES': grains.num_cpus}) %}
 
+{% if nodetype in ['searchnode', 'receiver', 'fleet', 'heavynode'] %}
 
-{% if nodetype == "searchnode" %}
-
+{#   we can't use the host grain here because the grain may not be updated yet from the hostname change #}
 {%   do DATA.update({'LSHOSTNAME': grains.id.split("_") | first}) %}
 
+{%   if total_mem >= 32000 or nodetype in ['managersearch','heavynode','standalone'] %}
+{%     set LSHEAP="1000m" %}
+{%   elif nodetype == 'eval' %}
+{%     set LSHEAP="700m" %}
+{%   else %}
+{%     set LSHEAP="500m" %}
+{%   endif %}
+{%   do DATA.update({'LSHEAP': LSHEAP}) %}
+
+{% endif %}
+
+{% if nodetype in ['searchnode', 'heavynode'] %}
+
 {#   this replicates the function es_heapsize in so-functions #}
 {%   if total_mem < 8000 %}
 {%     set ES_HEAP_SIZE = "600m" %}
@@ -31,13 +44,4 @@
 {%   endif %}
 {%   do DATA.update({'ES_HEAP_SIZE': ES_HEAP_SIZE}) %}
 
-{%   if total_mem >= 32000 or nodetype in ['managersearch','heavynode','standalone'] %}
-{%     set LSHEAP="1000m" %}
-{%   elif nodetype == 'eval' %}
-{%     set LSHEAP="700m" %}
-{%   else %}
-{%     set LSHEAP="500m" %}
-{%   endif %}
-{%   do DATA.update({'LSHEAP': LSHEAP}) %}
-
 {% endif %}