From e1d8f578c2ca2173073b77f9296742c6dc8d741c Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 8 Oct 2020 12:35:14 -0400
Subject: [PATCH] [feat] Add log dirs for playbook + influxdb

---
 salt/common/files/log-rotate.conf |  1 +
 salt/influxdb/init.sls            |  9 +++++++++
 salt/playbook/init.sls            | 17 ++++++++++-------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/salt/common/files/log-rotate.conf b/salt/common/files/log-rotate.conf
index b2f972b7f..d383981cd 100644
--- a/salt/common/files/log-rotate.conf
+++ b/salt/common/files/log-rotate.conf
@@ -6,6 +6,7 @@
 /opt/so/log/soc/*.log
 /opt/so/log/kratos/*.log
 /opt/so/log/kibana/*.log
+/opt/so/log/influxdb/*.log
 /opt/so/log/elastalert/*.log
 /opt/so/log/soctopus/*.log
 /opt/so/log/curator/*.log
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index 6f95cfec2..669c9e9eb 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -16,6 +16,14 @@ influxconfdir:
     - name: /opt/so/conf/influxdb/etc
     - makedirs: True
 
+influxlogdir:
+  file.directory:
+    - name: /opt/so/log/influxdb
+    - dir_mode: 775
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 influxdbdir:
   file.directory:
     - name: /nsm/influxdb
@@ -36,6 +44,7 @@ so-influxdb:
     - environment:
       - INFLUXDB_HTTP_LOG_ENABLED=false
     - binds:
+      - /opt/so/log/influxdb/:/log:rw
       - /opt/so/conf/influxdb/etc/influxdb.conf:/etc/influxdb/influxdb.conf:ro
       - /nsm/influxdb:/var/lib/influxdb:rw
       - /etc/pki/influxdb.crt:/etc/ssl/influxdb.crt:ro
diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index 6e2397347..c78743eb5 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -58,6 +58,14 @@ query_updatepluginurls:
     - connection_user: root
     - connection_pass: {{ MYSQLPASS }}
 
+playbooklogdir:
+  file.directory:
+    - name: /opt/so/log/playbook
+    - dir_mode: 775
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 {% if PLAYBOOKPASS == None %}
 
 playbook_password_none:
@@ -73,6 +81,8 @@ so-playbook:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-playbook:{{ VERSION }}
     - hostname: playbook
     - name: so-playbook
+    - binds:
+      - /opt/so/log/playbook:/playbook/log:rw
     - environment:
       - REDMINE_DB_MYSQL={{ MANAGERIP }}
       - REDMINE_DB_DATABASE=playbook
@@ -83,13 +93,6 @@ so-playbook:
 
 {% endif %}
 
-playbooklogdir:
-  file.directory:
-    - name: /opt/so/log/playbook
-    - user: 939
-    - group: 939
-    - makedirs: True
-
 so-playbooksynccron:
   cron.present:
     - name: /usr/sbin/so-playbook-sync > /opt/so/log/playbook/sync.log 2>&1