Merge pull request #10897 from Security-Onion-Solutions/2.4/heavyrc2

2.4/heavyrc2
Security-Onion-Solutions · Aug 1, 2023 · f27ebc4 · f27ebc4
2 parents ba3660d + 63b4bdc
commit f27ebc4
Show file tree

Hide file tree

Showing 12 changed files with 340 additions and 346 deletions.
diff --git a/salt/elasticagent/enabled.sls b/salt/elasticagent/enabled.sls
@@ -35,6 +35,7 @@ so-elastic-agent:
       - /opt/so/conf/elastic-agent/elastic-agent.yml:/usr/share/elastic-agent/elastic-agent.yml:ro
       - /etc/pki/tls/certs/intca.crt:/etc/pki/tls/certs/intca.crt:ro 
       - /nsm:/nsm:ro
+      - /opt/so/log:/opt/so/log:ro
      {% if DOCKER.containers['so-elastic-agent'].custom_bind_mounts %}
         {% for BIND in DOCKER.containers['so-elastic-agent'].custom_bind_mounts %}
       - {{ BIND }}
@@ -47,6 +48,8 @@ so-elastic-agent:
       - {{ XTRAENV }}
         {% endfor %}
       {% endif %}
+    - require:
+      - file: create-elastic-agent-config
     - watch:
       - file: create-elastic-agent-config