openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Allow Sensu to connect to RabbitMQ cluster 

This patch adds possibility to connect sensu-clients to RabbitMQ cluster
instead of a single RabbitMQ node.

Closes-Bug: #1714910
Change-Id: I291a9ddb888aa2291181715c198f7ba5ca1a6ad4
This commit is contained in:
Martin Mágr 2017-08-18 12:02:03 +02:00
parent 97161236cf
commit 3fd76806e1
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
puppet/services/monitoring/sensu-base.yaml
View File

@ -29,6 +29,10 @@ parameters:
default: {} default: {}
description: Parameters specific to the role description: Parameters specific to the role
type: json type: json
MonitoringRabbitCluster:
description: RabbitMQ cluster configuration Sensu has to connect to.
type: json
default: []
MonitoringRabbitHost: MonitoringRabbitHost:
description: RabbitMQ host Sensu has to connect to. description: RabbitMQ host Sensu has to connect to.
type: string type: string
@ -58,6 +62,7 @@ parameters:
description: The RabbitMQ password used for monitoring purposes. description: The RabbitMQ password used for monitoring purposes.
type: string type: string
hidden: true hidden: true
default: sensu
MonitoringRabbitUserName: MonitoringRabbitUserName:
description: The RabbitMQ username used for monitoring purposes. description: The RabbitMQ username used for monitoring purposes.
type: string type: string
@ -80,25 +85,33 @@ parameters:
- private_key - private_key
- secret - secret
conditions:
not_cluster_connection:
equals: [{get_param: MonitoringRabbitCluster}, []]
outputs: outputs:
role_data: role_data:
description: Role data for the Sensu role. description: Role data for the Sensu role.
value: value:
service_name: sensu_base service_name: sensu_base
config_settings: config_settings:
sensu::enterprise: false map_merge:
sensu::enterprise_dashboard: false - sensu::enterprise: false
sensu::install_repo: false sensu::enterprise_dashboard: false
sensu::manage_user: false sensu::install_repo: false
sensu::rabbitmq_host: {get_param: MonitoringRabbitHost} sensu::manage_user: false
sensu::rabbitmq_password: {get_param: MonitoringRabbitPassword} sensu::redact: {get_param: SensuRedactVariables}
sensu::rabbitmq_port: {get_param: MonitoringRabbitPort} sensu::sensu_plugin_provider: 'yum'
sensu::rabbitmq_ssl: {get_param: MonitoringRabbitUseSSL} sensu::sensu_plugin_name: 'rubygem-sensu-plugin'
sensu::rabbitmq_ssl_private_key: {get_param: MonitoringRabbitSSLPrivateKey} sensu::version: 'present'
sensu::rabbitmq_ssl_cert_chain: {get_param: MonitoringRabbitSSLCertChain} - if:
sensu::rabbitmq_user: {get_param: MonitoringRabbitUserName} - not_cluster_connection
sensu::rabbitmq_vhost: {get_param: MonitoringRabbitVhost} - sensu::rabbitmq_host: {get_param: MonitoringRabbitHost}
sensu::redact: {get_param: SensuRedactVariables} sensu::rabbitmq_port: {get_param: MonitoringRabbitPort}
sensu::sensu_plugin_provider: 'yum' sensu::rabbitmq_user: {get_param: MonitoringRabbitUserName}
sensu::sensu_plugin_name: 'rubygem-sensu-plugin' sensu::rabbitmq_password: {get_param: MonitoringRabbitPassword}
sensu::version: 'present' sensu::rabbitmq_vhost: {get_param: MonitoringRabbitVhost}
sensu::rabbitmq_ssl: {get_param: MonitoringRabbitUseSSL}
sensu::rabbitmq_ssl_private_key: {get_param: MonitoringRabbitSSLPrivateKey}
sensu::rabbitmq_ssl_cert_chain: {get_param: MonitoringRabbitSSLCertChain}
- sensu::rabbitmq_cluster: {get_param: MonitoringRabbitCluster}