From f6f4375e1396956124d875388e6176a8fb2873da Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Tue, 31 Aug 2021 15:34:26 -0400
Subject: [PATCH] Add logic for cronjobs

---
 ...o-cluster-warm => so-curator-cluster-warm} |   0
 salt/curator/init.sls                         | 127 ++++++++++++------
 2 files changed, 85 insertions(+), 42 deletions(-)
 rename salt/curator/files/bin/{so-cluster-warm => so-curator-cluster-warm} (100%)

diff --git a/salt/curator/files/bin/so-cluster-warm b/salt/curator/files/bin/so-curator-cluster-warm
similarity index 100%
rename from salt/curator/files/bin/so-cluster-warm
rename to salt/curator/files/bin/so-curator-cluster-warm
diff --git a/salt/curator/init.sls b/salt/curator/init.sls
index 1acea5d25..57da8bfa1 100644
--- a/salt/curator/init.sls
+++ b/salt/curator/init.sls
@@ -5,6 +5,9 @@
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
 {% set MANAGER = salt['grains.get']('master') %}
 {% set REMOVECURATORCRON = False %}
+{% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
+{% set HOTWARM = salt['pillar.get']('elasticsearch:hot_warm_enabled', False) %}
+
 {% if grains['role'] in ['so-eval', 'so-node', 'so-managersearch', 'so-heavynode', 'so-standalone', 'so-manager'] %}
   {% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
   {% from "curator/map.jinja" import CURATOROPTIONS with context %}
@@ -148,62 +151,102 @@ delete_so-curator_so-status:
 
   {% if REMOVECURATORCRON %}
 so-curatorcloseddeletecron:
- cron.absent:
-   - name: /usr/sbin/so-curator-closed-delete > /opt/so/log/curator/cron-closed-delete.log 2>&1
-   - user: root
+  cron.absent:
+    - name: /usr/sbin/so-curator-closed-delete > /opt/so/log/curator/cron-closed-delete.log 2>&1
+    - user: root
 
 so-curatorclosecron:
- cron.absent:
-   - name: /usr/sbin/so-curator-close > /opt/so/log/curator/cron-close.log 2>&1
-   - user: root
+  cron.absent:
+    - name: /usr/sbin/so-curator-close > /opt/so/log/curator/cron-close.log 2>&1
+    - user: root
 
 so-curatordeletecron:
- cron.absent:
-   - name: /usr/sbin/so-curator-delete > /opt/so/log/curator/cron-delete.log 2>&1
-   - user: root
+  cron.absent:
+    - name: /usr/sbin/so-curator-delete > /opt/so/log/curator/cron-delete.log 2>&1
+    - user: root
 
   {% else %}
 
+    {% if TRUECLUSTER is sameas true %}
 so-curatorcloseddeletecron:
- cron.present:
-   - name: /usr/sbin/so-curator-closed-delete > /opt/so/log/curator/cron-closed-delete.log 2>&1
-   - user: root
-   - minute: '*'
-   - hour: '*'
-   - daymonth: '*'
-   - month: '*'
-   - dayweek: '*'
+  cron.absent:
+    - name: /usr/sbin/so-curator-closed-delete > /opt/so/log/curator/cron-closed-delete.log 2>&1
+    - user: root
 
 so-curatorclosecron:
- cron.present:
-   - name: /usr/sbin/so-curator-close > /opt/so/log/curator/cron-close.log 2>&1
-   - user: root
-   - minute: '*'
-   - hour: '*'
-   - daymonth: '*'
-   - month: '*'
-   - dayweek: '*'
+  cron.absent:
+    - name: /usr/sbin/so-curator-close > /opt/so/log/curator/cron-close.log 2>&1
+    - user: root
 
 so-curatordeletecron:
- cron.present:
-   - name: /usr/sbin/so-curator-delete > /opt/so/log/curator/cron-delete.log 2>&1
-   - user: root
-   - minute: '*'
-   - hour: '*'
-   - daymonth: '*'
-   - month: '*'
-   - dayweek: '*'
+  cron.absent:
+    - name: /usr/sbin/so-curator-delete > /opt/so/log/curator/cron-delete.log 2>&1
+    - user: root
+   
+so-curatorclusterclose:
+  cron.present:
+    - name: /usr/sbin/so-curator-cluster-close > /opt/so/log/curator/cron-close.log 2>&1
+    - user: root
+    - minute: '*'
+    - hour: '*/1'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
 
+so-curatorclusterdelete:
+  cron.present:
+    - name: /usr/sbin/so-curator-cluster-delete > /opt/so/log/curator/cron-close.log 2>&1
+    - user: root
+    - minute: '*'
+    - hour: '*/1'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
+        {% if HOTWARM is sameas true %}
+so-curatorclusterwarm:
+  cron.present:
+    - name: /usr/sbin/so-curator-cluster-warm > /opt/so/log/curator/cron-close.log 2>&1
+    - user: root
+    - minute: '*'
+    - hour: '*/1'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
+        {% endif %%}
+
+    {% else %}
+so-curatorcloseddeletecron:
+  cron.present:
+    - name: /usr/sbin/so-curator-closed-delete > /opt/so/log/curator/cron-closed-delete.log 2>&1
+    - user: root
+    - minute: '*/5'
+    - hour: '*'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
+
+so-curatorclosecron:
+  cron.present:
+    - name: /usr/sbin/so-curator-close > /opt/so/log/curator/cron-close.log 2>&1
+    - user: root
+    - minute: '*/5'
+    - hour: '*'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
+
+so-curatordeletecron:
+  cron.present:
+    - name: /usr/sbin/so-curator-delete > /opt/so/log/curator/cron-delete.log 2>&1
+    - user: root
+    - minute: '*/5'
+    - hour: '*'
+    - daymonth: '*'
+    - month: '*'
+    - dayweek: '*'
+  
+    {% endif %}
   {% endif %}
-
-# Begin Curator Cron Jobs
-
-# Close
-# Delete
-# Hot Warm
-# Segment Merge
-
-# End Curator Cron Jobs
 {% endif %}
 
 {% else %}