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.

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

Conversation

ernstae
Copy link
Contributor

@ernstae ernstae commented Sep 14, 2017

This is a proposed change that we (UW IHME) have been using in production for a few weeks, and a needed deviation from the master branch of the salt-formula

This is reasonably simple, by detecting minion pillar data with elasticsearch configuration for the returner, and spits out the necessary YAML.

Example pillar:

      elasticsearch:
            ----------
            functions_blacklist:
                - test.ping
                - saltutil.findjob
                - pillar.items
                - grains.items
            hosts:
                - 10.0.0.1:9200
                - 10.0.0.2:9200
                - 10.0.0.3:9200
                - 10.0.0.4:9200
                - 10.0.0.5:9200
            index_date:
                True
            number_of_replicas:
                1
            number_of_shards:
                5
            states_count:
                True
            states_order_output:
                True
            states_single_index:
                True

Example output:

#####   elasticsearch connection settings  #####
##########################################
elasticsearch.number_of_replicas: 1
elasticsearch.states_order_output: True
elasticsearch.states_count: True
elasticsearch.number_of_shards: 5
elasticsearch.states_single_index: True
elasticsearch.index_date: True
elasticsearch.hosts:
  - 10.0.0.1:9200
  - 10.0.0.2:9200
  - 10.0.0.3:9200
  - 10.0.0.4:9200
  - 10.0.0.5:9200
elasticsearch.functions_blacklist: 
  - test.ping
  - saltutil.findjob
  - pillar.items
  - grains.items

@aboe76 aboe76 requested a review from jochumdev September 14, 2017 16:18
Copy link
Member

@aboe76 aboe76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks clean and I see no issues

@jochumdev
Copy link
Member

Looks good to me, needs a Squash though :)

@aboe76 aboe76 merged commit 9ef5335 into saltstack-formulas:master Sep 29, 2017
@aboe76
Copy link
Member

aboe76 commented Sep 29, 2017

@pcdummy and @ernstae thanks

@ernstae ernstae deleted the feature/elasticsearch-returner branch October 10, 2017 23:05
ixs pushed a commit to bawuenet/salt-formula that referenced this pull request Mar 10, 2018
…ormulas#335)

Proposed pull request for elasticsearch returner in the minion.d/f_defaults.conf file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants