From 9f33d2afe11fe4be4a12b7d355e0a593a841f201 Mon Sep 17 00:00:00 2001
From: Felix Russell <felix.m.russell@gmail.com>
Date: Tue, 17 Apr 2018 13:26:45 -0700
Subject: [PATCH] [Minion] [returner] [Elasticsearch] Yaml read patch +
 example.pillar update (#359)

* Minion/returner/elasticsearch yaml read fix.

* Improved the documentation for the elasticsearch returner
---
 pillar.example                      | 19 +++++++++++++++++++
 salt/files/minion.d/f_defaults.conf |  8 +++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pillar.example b/pillar.example
index 29f6617..9a1c169 100644
--- a/pillar.example
+++ b/pillar.example
@@ -212,6 +212,24 @@ salt:
       - 'minion/deploy':
         - /srv/salt/reactors/deploy.sls
 
+    # Optional: Configure an elasticsearch returner
+    return: elasticsearch
+    elasticsearch:
+      hosts:
+        - example.elasticsearch.host:9200
+        - example.elasticsearch.host2:9200
+      index_date: True
+      index: salt
+      number_of_shards: 5
+      number_of_replicas: 2
+      debug_returner_payload: True
+      states_count: True
+      states_order_output: True
+      states_single_index: True
+      functions_blacklist:
+        - test.ping
+        - saltutil.find_job
+
   # salt cloud config
   cloud:
     master: salt
@@ -342,3 +360,4 @@ salt_formulas:
       - salt-formula
       - postfix-formula
       - openssh-formula
+
diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index ddc2860..cc187ab 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -1215,16 +1215,18 @@ return:
 {% if 'elasticsearch' in cfg_minion -%}
 {%- do default_keys.append('elasticsearch') %}
 {%- do default_keys.append('return') %}
+
 #####   elasticsearch connection settings  #####
 ##########################################
+elasticsearch:
 {%- for name, value in cfg_minion['elasticsearch'].items() %}
 {%- if value is list %}
-elasticsearch.{{ name }}:
+  {{ name }}:
 {%- for objvalue in value %}
-  - {{ objvalue }}
+    - {{ objvalue }}
 {%- endfor %}
 {%- else %}
-elasticsearch.{{ name }}: {{ value }}
+  {{ name }}: {{ value }}
 {%- endif %}
 {%- endfor %}
 {%- endif %}