configuration fixes for sensu and rabbitmq; check definitions

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ansible/sensu-vars.yml b/ansible/sensu-vars.yml
index d523f7efc1febdd95d4e638a95ed0160e3cf103d..121308673b2b43022c78aee77e9daa42e7a6398e 100644 (file)
--- a/ansible/sensu-vars.yml
+++ b/ansible/sensu-vars.yml
@@ -1,15 +1,6 @@
 ---
-# Set the rabbitmq SSL address
-rabbitmq_conf_ssl_listeners_address: '0.0.0.0'
-
-# Set the rabbitmq vhost
-rabbitmq_vhost_definitions:
-  - name:     "{{ sensu_server_rabbitmq_vhost }}"
-
-rabbitmq_users_definitions:
-  - vhost:    "{{ sensu_server_rabbitmq_vhost }}"
-    user:     "{{ sensu_server_rabbitmq_user }}"
-    password: "{{ sensu_server_rabbitmq_password }}"
+# Set the rabbitmq address
+rabbitmq_conf_tcp_listeners_address: '0.0.0.0'
 
 sensu_server_rabbitmq_insecure: true
 
@@ -17,14 +8,32 @@ sensu_server_rabbitmq_insecure: true
 sensu_client_subscription_names:
   - test
 
-# Dummy sensu_checks
 sensu_checks:
-  test_check:
-    handler    : default
-    command    : "/bin/sh echo Hello World"
-    interval   : 60
+  cpu:
+    command: "check-cpu.rb"
+    interval: 10
+    subscribers:
+      - common
+  disk:
+    command: "check-disk-usage.rb -w 85 -c 95"
+    interval: 10
+    subscribers:
+      - common
+  load:
+    command: "check-load.rb"
+    interval: 10
+    subscribers:
+      - common
+  memory:
+    command: "check-memory.rb -w 85 -c 95"
+    interval: 10
+    subscribers:
+      - common
+  rabbitmq-alive:
+    command: "check-rabbitmq-amqp-alive.rb -u :::rabbitmq.user|guest::: -p :::rabbitmq.password|guest::: -v :::rabbitmq.vhost|%2F:::"
+    interval: 10
     subscribers:
-      - test
+      - rabbitmq
 
 # Dummy sensu_handlers
 sensu_handlers:

diff --git a/ansible/sensu.yml b/ansible/sensu.yml
index 331a0e8aefb49efb8c65c86d78da40fe62720a9c..b06e8a7fd9880a3c88e587a3479059a0e59e87fa 100644 (file)
--- a/ansible/sensu.yml
+++ b/ansible/sensu.yml
@@ -4,18 +4,24 @@
 #     ansible-galaxy install -r sensu-requirements.yml
 #
 - hosts: all
-  user: admin
   sudo: true
   vars_files:
     - sensu-vars.yml
   roles:
     - role: Mayeu.RabbitMQ
       rabbitmq_vhost_definitions:
-        - name: sensu
+          - name: "/sensu"
       rabbitmq_users_definitions:
-        - vhost:    sensu
-          user:     sensu
-          password: placeholder
+          - vhost: "/sensu"
+            user: sensu
+            password: secret
+            configure_priv: ".*"
+            read_priv: ".*"
+            write_priv: ".*"
       rabbitmq_ssl: false
     - redis
-    - Mayeu.sensu
+    - role: Mayeu.sensu
+      sensu_server_rabbitmq_port: 5672
+      sensu_server_api_password: secret
+      sensu_server_rabbitmq_password: secret
+      sensu_server_dashboard_password: secret