From 15924ebe0f758cf1adc689fb4dd23f8ccece0405 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 25 Feb 2022 13:29:29 -0500 Subject: [PATCH] Fix endgame index name --- salt/curator/files/action/so-endgame-close.yml | 2 +- salt/curator/files/action/so-endgame-delete.yml | 2 +- salt/curator/files/action/so-endgame-warm.yml | 2 +- setup/so-functions | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/curator/files/action/so-endgame-close.yml b/salt/curator/files/action/so-endgame-close.yml index 4c4d38341..c0fe40387 100644 --- a/salt/curator/files/action/so-endgame-close.yml +++ b/salt/curator/files/action/so-endgame-close.yml @@ -1,4 +1,4 @@ -{%- set cur_close_days = salt['pillar.get']('elasticsearch:index_settings:so-endgame:close', 30) -%} +{%- set cur_close_days = salt['pillar.get']('elasticsearch:index_settings:endgame:close', 30) -%} --- # Remember, leave a key empty if there is no value. None will be a string, # not a Python "NoneType" diff --git a/salt/curator/files/action/so-endgame-delete.yml b/salt/curator/files/action/so-endgame-delete.yml index 53d34b6d6..46ff39a51 100644 --- a/salt/curator/files/action/so-endgame-delete.yml +++ b/salt/curator/files/action/so-endgame-delete.yml @@ -1,4 +1,4 @@ -{%- set DELETE_DAYS = salt['pillar.get']('elasticsearch:index_settings:so-endgame:delete', 365) -%} +{%- set DELETE_DAYS = salt['pillar.get']('elasticsearch:index_settings:endgame:delete', 365) -%} --- # Remember, leave a key empty if there is no value. None will be a string, # not a Python "NoneType" diff --git a/salt/curator/files/action/so-endgame-warm.yml b/salt/curator/files/action/so-endgame-warm.yml index 4856a3928..5f1786e7d 100644 --- a/salt/curator/files/action/so-endgame-warm.yml +++ b/salt/curator/files/action/so-endgame-warm.yml @@ -1,4 +1,4 @@ -{%- set WARM_DAYS = salt['pillar.get']('elasticsearch:index_settings:so-endgame:warm', 7) -%} +{%- set WARM_DAYS = salt['pillar.get']('elasticsearch:index_settings:endgame:warm', 7) -%} actions: 1: action: allocation diff --git a/setup/so-functions b/setup/so-functions index d44545348..04620dd20 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1837,7 +1837,7 @@ manager_global() { " warm: 7"\ " close: 30"\ " delete: 365"\ - " so-endgame:"\ + " endgame:"\ " index_template:"\ " template:"\ " settings:"\