Skip to content

[sensu/client/server] add flag to disable rabbitmq configuration #48

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

Open
arthurzenika wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[sensu/client/server] add flag to disable rabbitmq configuration #48

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
045a645
[sensu/client/server] add flag not disable rabbitmq configuration
Sep 8, 2017
c3240fc
[pillar.example] typo, remove unused config
Sep 8, 2017
714bc77
[api] add switch to disable rabbitmq configuration
Sep 8, 2017
dc47d7d
[init.sls] remove rabbitmq.json file when configure_rabbitmq is False
Sep 8, 2017
790297b
[sensu/client] ship redis configuration when sensu:transport:name is …
Sep 8, 2017
b0c6b77
[sensu/redis] add ability to configure redis sentinels
Oct 18, 2017
7e9fe05
Add pillar roles as subscriptions
Oct 31, 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
2 changes: 2 additions & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ sensu:
- timeout
- name: aws-sdk
version: 2.2.6
configure_rabbitmq: true
client:
embedded_ruby: true
nagios_plugins: true
redact:
- password
gem_proxy: http://192.168.1.1:3128/
configure_rabbitmq: true
rabbitmq:
host: 10.0.0.1
user: sensu
Expand Down
6 changes: 6 additions & 0 deletions sensu/api.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
include:
- sensu
- sensu.api_conf
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- sensu.rabbitmq_conf
{% endif %}
- sensu.redis_conf

sensu-api:
service.running:
- enable: True
- require:
- file: /etc/sensu/conf.d/api.json
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- file: /etc/sensu/conf.d/rabbitmq.json
{% endif %}
- file: /etc/sensu/conf.d/redis.json
- watch:
- file: /etc/sensu/conf.d/api.json
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- file: /etc/sensu/conf.d/rabbitmq.json
{% endif %}
- file: /etc/sensu/conf.d/redis.json
13 changes: 13 additions & 0 deletions sensu/client.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@

include:
- sensu
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- sensu.rabbitmq_conf
{% endif %}
{% if salt['pillar.get']('sensu:transport:name') %}
- sensu.transport_conf
{% endif %}
{% if salt['pillar.get']('sensu:transport:name') == 'redis' %}
- sensu.redis_conf
{% endif %}

{% if grains['os_family'] == 'Windows' %}
/opt/sensu/bin/sensu-client.xml:
Expand Down Expand Up @@ -133,6 +141,11 @@ sensu-client:
- enable: True
- require:
- file: /etc/sensu/conf.d/client.json
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- file: /etc/sensu/conf.d/rabbitmq.json
{% endif %}
{% if salt['pillar.get']('sensu:transport:name') %}
- file: /etc/sensu/conf.d/transport.json
{% endif %}
- watch:
- file: /etc/sensu/conf.d/*
6 changes: 6 additions & 0 deletions sensu/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ old sensu repository:
- require_in:
- pkg: sensu
{% endif %}


{% if not salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
/etc/sensu/conf.d/rabbitmq.json:
file.absent
{% endif %}
4 changes: 4 additions & 0 deletions sensu/server.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
include:
- sensu
- sensu.api_conf # Some handlers need to access the API server
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- sensu.rabbitmq_conf
{% endif %}
- sensu.redis_conf

/etc/sensu/conf.d:
Expand Down Expand Up @@ -102,4 +104,6 @@ sensu-server:
- enable: True
- require:
- file: /etc/sensu/conf.d/redis.json
{% if salt['pillar.get']('sensu:server:configure_rabbitmq', True) %}
- file: /etc/sensu/conf.d/rabbitmq.json
{% endif %}