From c5977663909e0f503d9f56be5e42660eb95031ad Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 3 May 2023 10:17:45 -0400
Subject: [PATCH] assign firewall pillars to * in top

---
 pillar/top.sls              | 10 ++--------
 salt/firewall/defaults.yaml |  5 -----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pillar/top.sls b/pillar/top.sls
index 9e373be31..ebcd6bbb2 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -6,6 +6,8 @@ base:
     - logrotate
     - docker.soc_docker
     - docker.adv_docker
+    - firewall.soc_firewall
+    - firewall.adv_firewall
     - sensoroni.soc_sensoroni
     - sensoroni.adv_sensoroni
     - telegraf.soc_telegraf
@@ -68,8 +70,6 @@ base:
     - elasticsearch.adv_elasticsearch
     - backup.soc_backup
     - backup.adv_backup
-    - firewall.soc_firewall
-    - firewall.adv_firewall
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -108,8 +108,6 @@ base:
     - influxdb.adv_influxdb
     - backup.soc_backup
     - backup.adv_backup
-    - firewall.soc_firewall
-    - firewall.adv_firewall
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -145,8 +143,6 @@ base:
     - soc.soc_soc
     - backup.soc_backup
     - backup.adv_backup
-    - firewall.soc_firewall
-    - firewall.adv_firewall
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
@@ -223,8 +219,6 @@ base:
     - redis.adv_redis
     - influxdb.soc_influxdb
     - influxdb.adv_influxdb
-    - firewall.soc_firewall
-    - firewall.adv_firewall
     - minions.{{ grains.id }}
     - minions.adv_{{ grains.id }}
 
diff --git a/salt/firewall/defaults.yaml b/salt/firewall/defaults.yaml
index fa77aae77..95aae108e 100644
--- a/salt/firewall/defaults.yaml
+++ b/salt/firewall/defaults.yaml
@@ -42,10 +42,6 @@ firewall:
         - '0:65535'
       udp:
         - '0:65535'
-    agrules:
-      tcp:
-        - 7788
-      udp: []
     beats_5044:
       tcp:
         - 5044
@@ -360,7 +356,6 @@ firewall:
                 - docker_registry
                 - elastic_agent_control
                 - elastic_agent_data
-                - agrules    
             sensor:
               portgroups:
                 - beats_5044