From 4352825cebf47897dc4277d17af2f7e66cdf806d Mon Sep 17 00:00:00 2001 From: Wes Date: Tue, 28 Mar 2023 12:25:49 +0000 Subject: [PATCH] Calculate log size limit every time so-curator-cluster-delete-delete runs --- salt/curator/files/bin/so-curator-cluster-delete-delete | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salt/curator/files/bin/so-curator-cluster-delete-delete b/salt/curator/files/bin/so-curator-cluster-delete-delete index 73076851c..e2468b22e 100755 --- a/salt/curator/files/bin/so-curator-cluster-delete-delete +++ b/salt/curator/files/bin/so-curator-cluster-delete-delete @@ -5,8 +5,9 @@ # Elastic License 2.0. {% from 'vars/globals.map.jinja' import GLOBALS %} -{%- set ELASTICSEARCH_HOST = GLOBALS.node_ip -%} -{%- set LOG_SIZE_LIMIT = salt['pillar.get']('elasticsearch:retention:log_size_limit') -%} +{% import_yaml 'elasticsearch/defaults.yaml' as ELASTICDEFAULTS %} +{%- set ELASTICSEARCH_HOST = GLOBALS.node_ip -%} +{%- set RETENTION = salt['pillar.get']('elasticsearch:retention', ELASTICDEFAULTS.elasticsearch.retention, merge=true) -%} # Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one # or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at @@ -17,7 +18,7 @@ LOG="/opt/so/log/curator/so-curator-cluster-delete.log" overlimit() { - [[ $(/usr/sbin/so-elasticsearch-cluster-space-used) -gt "{{LOG_SIZE_LIMIT}}" ]] + [[ $(/usr/sbin/so-elasticsearch-cluster-space-used) -gt "/usr/sbin/so-elasticsearch-cluster-space-total{{ RETENTION.retention_pct}}" ]] } closedindices() {