Merge remote-tracking branch 'origin/reyesj2/kafka' into kaffytaffy

salt/firewall/containers.map.jinja

@@ -81,6 +81,11 @@
      'so-logstash',
      'so-redis',
 ] %}
+{% elif GLOBALS.role == 'so-kafkanode' %}
+{% set NODE_CONTAINERS = [
+     'so-logstash',
+     'so-kafka',
+] %}
 
 {% elif GLOBALS.role == 'so-idh' %}
 {% set NODE_CONTAINERS = [

salt/firewall/defaults.yaml

@@ -19,6 +19,7 @@ firewall:
     manager: []
     managersearch: []
     receiver: []
+    kafkanode: []
     searchnode: []
     self: []
     sensor: []
@@ -90,6 +91,11 @@ firewall:
       tcp:
         - 8086
       udp: []
+    kafka:
+      tcp:
+        - 9092
+        - 9093
+      udp: []
     kibana:
       tcp:
         - 5601
@@ -434,6 +440,15 @@ firewall:
                 - elastic_agent_data
                 - elastic_agent_update
                 - sensoroni
+            kafkanode:
+              portgroups:
+                - yum
+                - docker_registry
+                - influxdb
+                - elastic_agent_control
+                - elastic_agent_data
+                - elastic_agent_update
+                - sensoroni
             analyst:
               portgroups:
                 - nginx
@@ -512,6 +527,9 @@ firewall:
             receiver:
               portgroups:
                 - salt_manager
+            kafkanode:
+              portgroups:
+                - salt_manager
             desktop:
               portgroups:
                 - salt_manager
@@ -626,6 +644,15 @@ firewall:
                 - elastic_agent_data
                 - elastic_agent_update
                 - sensoroni
+            kafkanode:
+              portgroups:
+                - yum
+                - docker_registry
+                - influxdb
+                - elastic_agent_control
+                - elastic_agent_data
+                - elastic_agent_update
+                - sensoroni
             analyst:
               portgroups:
                 - nginx
@@ -1353,6 +1380,73 @@ firewall:
               portgroups: []
             customhostgroup9:
               portgroups: []
+    kafkanode:
+      chain:
+        DOCKER-USER:
+          hostgroups:
+            searchnode:
+              portgroups:
+                - kafka
+            kafkanode:
+              portgroups:
+                - kafka
+            customhostgroup0:
+              portgroups: []
+            customhostgroup1:
+              portgroups: []
+            customhostgroup2:
+              portgroups: []
+            customhostgroup3:
+              portgroups: []
+            customhostgroup4:
+              portgroups: []
+            customhostgroup5:
+              portgroups: []
+            customhostgroup6:
+              portgroups: []
+            customhostgroup7:
+              portgroups: []
+            customhostgroup8:
+              portgroups: []
+            customhostgroup9:
+              portgroups: []
+        INPUT:
+          hostgroups:
+            anywhere:
+              portgroups:
+                - ssh
+            dockernet:
+              portgroups:
+                - all
+            localhost:
+              portgroups:
+                - all
+            self:
+              portgroups:
+                - syslog
+            syslog:
+              portgroups:
+                - syslog
+            customhostgroup0:
+              portgroups: []
+            customhostgroup1:
+              portgroups: []
+            customhostgroup2:
+              portgroups: []
+            customhostgroup3:
+              portgroups: []
+            customhostgroup4:
+              portgroups: []
+            customhostgroup5:
+              portgroups: []
+            customhostgroup6:
+              portgroups: []
+            customhostgroup7:
+              portgroups: []
+            customhostgroup8:
+              portgroups: []
+            customhostgroup9:
+              portgroups: []
     idh:
       chain:
         DOCKER-USER:

salt/firewall/soc_firewall.yaml

@@ -34,6 +34,7 @@ firewall:
     heavynode: *hostgroupsettings
     idh: *hostgroupsettings
     import: *hostgroupsettings
+    kafkanode: *hostgroupsettings
     localhost: *ROhostgroupsettingsadv
     manager: *hostgroupsettings
     managersearch: *hostgroupsettings
@@ -115,6 +116,9 @@ firewall:
     influxdb:
       tcp: *tcpsettings
       udp: *udpsettings
+    kafka:
+      tcp: *tcpsettings
+      udp: *udpsettings
     kibana:
       tcp: *tcpsettings
       udp: *udpsettings
@@ -357,6 +361,8 @@ firewall:
               portgroups: *portgroupsdocker
             endgame:
               portgroups: *portgroupsdocker
+            kafkanode:
+              portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
             desktop:
@@ -448,6 +454,8 @@ firewall:
               portgroups: *portgroupsdocker
             syslog:
               portgroups: *portgroupsdocker
+            kafkanode:
+              portgroups: *portgroupsdocker
             analyst:
               portgroups: *portgroupsdocker
             desktop:
@@ -932,6 +940,62 @@ firewall:
               portgroups: *portgroupshost
             customhostgroup9: 
               portgroups: *portgroupshost
+    kafkanode:
+      chain:
+        DOCKER-USER:
+          hostgroups:
+            searchnode:
+              portgroups: *portgroupsdocker
+            kafkanode:
+              portgroups: *portgroupsdocker
+            customhostgroup0:
+              portgroups: *portgroupsdocker
+            customhostgroup1: 
+              portgroups: *portgroupsdocker
+            customhostgroup2: 
+              portgroups: *portgroupsdocker
+            customhostgroup3: 
+              portgroups: *portgroupsdocker
+            customhostgroup4: 
+              portgroups: *portgroupsdocker
+            customhostgroup5: 
+              portgroups: *portgroupsdocker
+            customhostgroup6: 
+              portgroups: *portgroupsdocker
+            customhostgroup7: 
+              portgroups: *portgroupsdocker
+            customhostgroup8: 
+              portgroups: *portgroupsdocker
+            customhostgroup9: 
+              portgroups: *portgroupsdocker  
+        INPUT:
+          hostgroups:
+            anywhere:
+              portgroups: *portgroupshost
+            dockernet:
+              portgroups: *portgroupshost
+            localhost:
+              portgroups: *portgroupshost
+            customhostgroup0:
+              portgroups: *portgroupshost
+            customhostgroup1: 
+              portgroups: *portgroupshost
+            customhostgroup2: 
+              portgroups: *portgroupshost
+            customhostgroup3: 
+              portgroups: *portgroupshost
+            customhostgroup4: 
+              portgroups: *portgroupshost
+            customhostgroup5: 
+              portgroups: *portgroupshost
+            customhostgroup6: 
+              portgroups: *portgroupshost
+            customhostgroup7: 
+              portgroups: *portgroupshost
+            customhostgroup8: 
+              portgroups: *portgroupshost
+            customhostgroup9: 
+              portgroups: *portgroupshost
 
     idh:
       chain: