Merge remote-tracking branch 'remotes/origin/dev' into issue/4674

2026-06-22 02:08:07 +02:00 · 2021-07-08 14:12:26 -04:00
parent 56697fde19 70d7513f84
commit f56514ed7d
11 changed files with 67 additions and 44 deletions
@@ -630,8 +630,10 @@
 {% elif grains['role'] in ['so-node', 'so-hotnode', 'so-warmnode', 'so-heavynode']  %}
 [[inputs.elasticsearch]]
   servers = ["https://{{ NODEIP }}:9200"]
+{% if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
   username = "{{ ES_USER }}"
   password = "{{ ES_PASS }}"
+{% endif %}
   insecure_skip_verify = true
 {% endif %}