From 8a0a4357005875d14aef7350a3828f76d2cc5eff Mon Sep 17 00:00:00 2001 From: weslambert Date: Wed, 24 Apr 2024 08:35:19 -0400 Subject: [PATCH 1/2] Fix warm description --- salt/elasticsearch/soc_elasticsearch.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/elasticsearch/soc_elasticsearch.yaml b/salt/elasticsearch/soc_elasticsearch.yaml index 81753f16bd..81070176cd 100644 --- a/salt/elasticsearch/soc_elasticsearch.yaml +++ b/salt/elasticsearch/soc_elasticsearch.yaml @@ -271,7 +271,7 @@ elasticsearch: helpLink: elasticsearch.html warm: min_age: - description: Minimum age of index. This determines when the index should be moved to the hot tier. + description: Minimum age of index. This determines when the index should be moved to the warm tier. global: True advanced: True helpLink: elasticsearch.html From 75b5e16696a46d805b2ad76f10383f422600b517 Mon Sep 17 00:00:00 2001 From: weslambert Date: Wed, 24 Apr 2024 09:14:39 -0400 Subject: [PATCH 2/2] Update description, type, and regex --- salt/elasticsearch/soc_elasticsearch.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/salt/elasticsearch/soc_elasticsearch.yaml b/salt/elasticsearch/soc_elasticsearch.yaml index 81070176cd..dac2614ced 100644 --- a/salt/elasticsearch/soc_elasticsearch.yaml +++ b/salt/elasticsearch/soc_elasticsearch.yaml @@ -100,6 +100,8 @@ elasticsearch: hot: max_age: description: Maximum age of index. ex. 7d - This determines when the index should be moved out of the hot tier. + regex: ^\[0-9\]{1,5}d$ + forcedType: string global: True helpLink: elasticsearch.html actions: @@ -121,6 +123,8 @@ elasticsearch: cold: min_age: description: Minimum age of index. ex. 30d - This determines when the index should be moved to the cold tier. While still searchable, this tier is typically optimized for lower storage costs rather than search speed. + regex: ^\[0-9\]{1,5}d$ + forcedType: string global: True helpLink: elasticsearch.html actions: @@ -145,6 +149,8 @@ elasticsearch: delete: min_age: description: Minimum age of index. ex. 90d - This determines when the index should be deleted. + regex: ^\[0-9\]{1,5}d$ + forcedType: string global: True helpLink: elasticsearch.html so-logs: &indexSettings @@ -271,7 +277,9 @@ elasticsearch: helpLink: elasticsearch.html warm: min_age: - description: Minimum age of index. This determines when the index should be moved to the warm tier. + description: Minimum age of index. ex. 30d - This determines when the index should be moved to the warm tier. Nodes in the warm tier generally don’t need to be as fast as those in the hot tier. + regex: ^\[0-9\]{1,5}d$ + forcedType: string global: True advanced: True helpLink: elasticsearch.html @@ -296,7 +304,9 @@ elasticsearch: helpLink: elasticsearch.html cold: min_age: - description: Minimum age of index. This determines when the index should be moved to the cold tier. While still searchable, this tier is typically optimized for lower storage costs rather than search speed. + description: Minimum age of index. ex. 30d - This determines when the index should be moved to the cold tier. While still searchable, this tier is typically optimized for lower storage costs rather than search speed. + regex: ^\[0-9\]{1,5}d$ + forcedType: string global: True advanced: True helpLink: elasticsearch.html @@ -311,6 +321,8 @@ elasticsearch: delete: min_age: description: Minimum age of index. This determines when the index should be deleted. + regex: ^\[0-9\]{1,5}d$ + forcedType: string global: True advanced: True helpLink: elasticsearch.html