From 6e0891e586247c16fe9c6690bdf1a64fd92ae46f Mon Sep 17 00:00:00 2001 From: Wes Date: Wed, 1 Mar 2023 15:16:52 +0000 Subject: [PATCH] Update Curator configuration to align with requirements for Curator 8.0.x --- salt/curator/files/curator.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/salt/curator/files/curator.yml b/salt/curator/files/curator.yml index 2f9b44dbc..86fd4a3aa 100644 --- a/salt/curator/files/curator.yml +++ b/salt/curator/files/curator.yml @@ -14,22 +14,25 @@ --- # Remember, leave a key empty if there is no value. None will be a string, # not a Python "NoneType" -client: - hosts: - - {{elasticsearch}} - port: 9200 +elasticsearch: + client: + hosts: + - https://{{elasticsearch}}:9200 + cloud_id: + ca_certs: + client_cert: + client_key: + verify_certs: False + request_timeout: 30 + other_settings: + api_key: + id: + api_key: + master_only: False {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} - username: "{{ ES_USER }}" - password: "{{ ES_PASS }}" + username: "{{ ES_USER }}" + password: "{{ ES_PASS }}" {%- endif %} - url_prefix: - use_ssl: True - certificate: - client_cert: - client_key: - ssl_no_validate: True - timeout: 30 - master_only: False logging: loglevel: INFO