merge 2.4/dev

Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>

salt/firewall/containers.map.jinja

@@ -2,7 +2,6 @@
 
 {% if GLOBALS.role == 'so-eval' %}
 {% set NODE_CONTAINERS = [
-     'so-curator',
      'so-dockerregistry',
      'so-elasticsearch',
      'so-elastic-fleet',
@@ -25,7 +24,6 @@
 
 {% elif GLOBALS.role == 'so-manager' or GLOBALS.role == 'so-standalone' or GLOBALS.role == 'so-managersearch' %}
 {% set NODE_CONTAINERS = [
-     'so-curator',
      'so-dockerregistry',
      'so-elasticsearch',
      'so-elastic-fleet',
@@ -56,7 +54,6 @@
 
 {% elif GLOBALS.role == 'so-heavynode' %}
 {% set NODE_CONTAINERS = [
-     'so-curator',
      'so-elasticsearch',
      'so-elastic-agent',
      'so-logstash',
@@ -103,6 +100,7 @@
 {% set NODE_CONTAINERS = [
      'so-elastic-fleet',
      'so-logstash',
+     'so-nginx-fleet-node'
 ] %}
 
 {% elif GLOBALS.role == 'so-sensor' %}

salt/firewall/defaults.yaml

@@ -1322,6 +1322,10 @@ firewall:
               portgroups:
                 - redis
                 - beats_5644
+            managersearch:
+              portgroups:
+                - redis
+                - beats_5644
             self:
               portgroups:
                 - redis

salt/firewall/soc_firewall.yaml

@@ -3,14 +3,14 @@ firewall:
     analyst: &hostgroupsettings
       description: List of IP or CIDR blocks to allow access to this hostgroup.
       forcedType: "[]string"
-      helplink: firewall.html
+      helpLink: firewall.html
       multiline: True
       regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$
       regexFailureMessage: You must enter a valid IP address or CIDR.
     anywhere: &hostgroupsettingsadv
       description: List of IP or CIDR blocks to allow access to this hostgroup.
       forcedType: "[]string"
-      helplink: firewall.html
+      helpLink: firewall.html
       multiline: True
       advanced: True
       regex: ^(([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?)?$
@@ -20,7 +20,7 @@ firewall:
     dockernet: &ROhostgroupsettingsadv
       description: List of IP or CIDR blocks to allow access to this hostgroup.
       forcedType: "[]string"
-      helplink: firewall.html
+      helpLink: firewall.html
       multiline: True
       advanced: True
       readonly: True
@@ -68,13 +68,13 @@ firewall:
       tcp: &tcpsettings
         description: List of TCP ports for this port group.
         forcedType: "[]string"
-        helplink: firewall.html
+        helpLink: firewall.html
         advanced: True
         multiline: True
       udp: &udpsettings
         description: List of UDP ports for this port group.
         forcedType: "[]string"
-        helplink: firewall.html
+        helpLink: firewall.html
         advanced: True
         multiline: True
     agrules: