From 334a0d7b1cb56f0ada8c11d196a3920ee87fcb69 Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Wed, 14 Sep 2022 10:33:27 -0400
Subject: [PATCH] Start using so-elastic-agent container

---
 salt/elastic-fleet/init.sls | 28 ++++++++++++++++++++++++++--
 salt/ssl/init.sls           |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/salt/elastic-fleet/init.sls b/salt/elastic-fleet/init.sls
index ea3092c0b..54ac866ed 100644
--- a/salt/elastic-fleet/init.sls
+++ b/salt/elastic-fleet/init.sls
@@ -10,15 +10,39 @@
 {% set FLEETSERVERPOLICY = salt['pillar.get']('elasticfleet:server:server_policy','so-manager') %}
 {% set FLEETURL = salt['pillar.get']('elasticfleet:server:url') %}
 
-elasticfleetdir:
+# Add EA Group
+elasticsagentgroup:
+  group.present:
+    - name: elastic-agent
+    - gid: 947
+
+# Add EA user
+elastic-agent:
+  user.present:
+    - uid: 947
+    - gid: 947
+    - home: /opt/so/conf/elastic-fleet
+    - createhome: False
+
+eaconfdir:
+  file.directory:
+    - name: /opt/so/conf/elastic-fleet
+    - user: 947
+    - group: 939
+    - makedirs: True
+
+eastatedir:
   file.directory:
     - name: /opt/so/conf/elastic-fleet/state
+    - user: 947
+    - group: 939
     - makedirs: True
 
+
   {% if SERVICETOKEN != '' %}
 so-elastic-fleet:
   docker_container.running:
-    - image: docker.elastic.co/beats/elastic-agent:8.4.1
+    - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-elastic-agent:{{ GLOBALS.so_version }}
     - name: so-elastic-fleet
     - hostname: Fleet-{{ GLOBALS.hostname }}
     - detach: True
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 7093ae912..855a4a3ea 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -210,7 +210,7 @@ chownilogstashelasticfleetp8:
     - replace: False
     - name: /etc/pki/elasticfleet.p8
     - mode: 640
-    - user: 931
+    - user: 947
     - group: 939
 
 # Create Symlinks to the keys so I can distribute it to all the things