Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update f_defaults.conf to support elasticsearch returner #335

Merged
merged 3 commits into from
Sep 29, 2017
Merged

Update f_defaults.conf to support elasticsearch returner #335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d14b39
Proposed pull request for elasticsearch returner in the minion.d/f_de…
Sep 14, 2017
cf20b13
Updating for handling of multiple values in a list
Sep 14, 2017
06b7770
During the last edit, a mistype was introduced. This resolves that
Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions salt/files/minion.d/f_defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1212,6 +1212,24 @@ return:
#event_match_type: startswith
{{ get_config('event_match_type', 'startswith') }}

{% if 'elasticsearch' in cfg_minion -%}
{%- do default_keys.append('elasticsearch') %}
{%- do default_keys.append('return') %}
##### elasticsearch connection settings #####
##########################################
{%- for name, value in cfg_minion['elasticsearch'].items() %}
{%- if value is list %}
elasticsearch.{{ name }}:
{%- for objvalue in value %}
- {{ objvalue }}
{%- endfor %}
{%- else %}
elasticsearch.{{ name }}: {{ value }}
{%- endif %}
{%- endfor %}
{%- endif %}


{% if 'mongo' in cfg_minion -%}
{%- do default_keys.append('mongo') %}
##### mongodb connection settings #####
Expand Down