From e2290d8a8e0606884940c53b8405e31c3c8bc619 Mon Sep 17 00:00:00 2001 From: Wes Date: Tue, 28 Mar 2023 12:19:36 +0000 Subject: [PATCH] Remove unncessary Salt logic for Elasticsearch --- .../curator/files/bin/so-curator-cluster-delete-delete | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/salt/curator/files/bin/so-curator-cluster-delete-delete b/salt/curator/files/bin/so-curator-cluster-delete-delete index 4a1dec241..73076851c 100755 --- a/salt/curator/files/bin/so-curator-cluster-delete-delete +++ b/salt/curator/files/bin/so-curator-cluster-delete-delete @@ -5,13 +5,7 @@ # Elastic License 2.0. {% from 'vars/globals.map.jinja' import GLOBALS %} -{%- if grains['role'] in ['so-searchnode', 'so-heavynode'] %} - {%- set ELASTICSEARCH_HOST = GLOBALS.node_ip -%} - {%- set ELASTICSEARCH_PORT = salt['pillar.get']('elasticsearch:es_port') -%} -{%- elif grains['role'] in ['so-eval', 'so-managersearch', 'so-standalone', 'so-manager'] %} - {%- set ELASTICSEARCH_HOST = GLOBALS.manager_ip -%} - {%- set ELASTICSEARCH_PORT = salt['pillar.get']('manager:es_port') -%} -{%- endif -%} +{%- set ELASTICSEARCH_HOST = GLOBALS.node_ip -%} {%- set LOG_SIZE_LIMIT = salt['pillar.get']('elasticsearch:retention:log_size_limit') -%} # Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one @@ -19,8 +13,6 @@ # https://securityonion.net/license; you may not use this file except in compliance with the # Elastic License 2.0. - - LOG="/opt/so/log/curator/so-curator-cluster-delete.log" overlimit() {