From d501b0fac941a0e5245974e0bc419fe4e953f163 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 18 Jan 2023 09:46:55 -0500
Subject: [PATCH 1/3] add elastic agent to assigned hostgroups

---
 salt/firewall/assigned_hostgroups.map.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/salt/firewall/assigned_hostgroups.map.yaml b/salt/firewall/assigned_hostgroups.map.yaml
index e91859743..6e249ec93 100644
--- a/salt/firewall/assigned_hostgroups.map.yaml
+++ b/salt/firewall/assigned_hostgroups.map.yaml
@@ -85,6 +85,8 @@ role:
             portgroups:
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
+              - {{ portgroups.elastic_agent_control }}
+              - {{ portgroups.elastic_agent_data }}
           searchnodes:
             portgroups:
               - {{ portgroups.redis }}
@@ -110,6 +112,10 @@ role:
           elasticsearch_rest:
             portgroups:
               - {{ portgroups.elasticsearch_rest }}
+          elastic_agent_endpoint:
+            portgroups:
+              - {{ portgroups.elastic_agent_control }}
+              - {{ portgroups.elastic_agent_data }}
           endgame:
             portgroups:
               - {{ portgroups.endgame }}
@@ -144,6 +150,8 @@ role:
             portgroups:
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
+              - {{ portgroups.elastic_agent_control }}
+              - {{ portgroups.elastic_agent_data }}
           searchnodes:
             portgroups:
               - {{ portgroups.redis }}
@@ -220,6 +228,8 @@ role:
               - {{ portgroups.yum }}
               - {{ portgroups.beats_5044 }}
               - {{ portgroups.beats_5644 }}
+              - {{ portgroups.elastic_agent_control }}
+              - {{ portgroups.elastic_agent_data }}
           searchnodes:
             portgroups:
               - {{ portgroups.docker_registry }}

From 1eafb8d62a2f84e51e78f8ead3f2e1a00a622daa Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 18 Jan 2023 13:46:06 -0500
Subject: [PATCH 2/3] reload salt modules when docker is installed

---
 salt/docker/init.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/docker/init.sls b/salt/docker/init.sls
index f8f89e058..b4a5506c9 100644
--- a/salt/docker/init.sls
+++ b/salt/docker/init.sls
@@ -19,6 +19,7 @@ dockerheldpackages:
       - docker-ce-rootless-extras: 20.10.5-3.el7
     - hold: True
     - update_holds: True
+    - reload_modules: True
 
 #disable docker from managing iptables
 iptables_disabled:

From a1fa4e3ef25c9b940662137b21f8bda8a760d61a Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 20 Jan 2023 15:43:57 -0500
Subject: [PATCH 3/3] revert reload_modules since bugged

---
 salt/docker/init.sls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/docker/init.sls b/salt/docker/init.sls
index b4a5506c9..f8f89e058 100644
--- a/salt/docker/init.sls
+++ b/salt/docker/init.sls
@@ -19,7 +19,6 @@ dockerheldpackages:
       - docker-ce-rootless-extras: 20.10.5-3.el7
     - hold: True
     - update_holds: True
-    - reload_modules: True
 
 #disable docker from managing iptables
 iptables_disabled: