summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-14 13:18:42 +0000
committerGerrit Code Review <review@openstack.org>2016-11-14 13:18:42 +0000
commit8f9b77ada85118f8f75346ce3eb35f7888b7d6b0 (patch)
treefb6ee27a85b5ff58c47918b22adcbefed4bf2db7 /puppet/services
parent9797d93561c5ea126a48ee58053d220a4480a8bf (diff)
parentc921b15c905eb609f0a3e1bd5943e24da46f549f (diff)
Merge "Use default Sensu redact"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/monitoring/sensu-base.yaml17
1 files changed, 14 insertions, 3 deletions
diff --git a/puppet/services/monitoring/sensu-base.yaml b/puppet/services/monitoring/sensu-base.yaml
index d7350d07..e5762328 100644
--- a/puppet/services/monitoring/sensu-base.yaml
+++ b/puppet/services/monitoring/sensu-base.yaml
@@ -43,7 +43,19 @@ parameters:
description: The RabbitMQ vhost used for monitoring purposes.
type: string
default: '/sensu'
-
+ SensuRedactVariables:
+ description: Variables from Sensu configuration, which have to be redacted.
+ type: array
+ default:
+ - password
+ - passwd
+ - pass
+ - api_key
+ - api_token
+ - access_key
+ - secret_key
+ - private_key
+ - secret
outputs:
role_data:
@@ -61,8 +73,7 @@ outputs:
sensu::rabbitmq_ssl: {get_param: MonitoringRabbitUseSSL}
sensu::rabbitmq_user: {get_param: MonitoringRabbitUserName}
sensu::rabbitmq_vhost: {get_param: MonitoringRabbitVhost}
- #sensu::redis_host: {get_param: MonitoringRedisHost}
- #sensu::redis_password: {get_param: MonitoringRedisPassword}
+ sensu::redact: {get_param: SensuRedactVariables}
sensu::sensu_plugin_provider: 'yum'
sensu::sensu_plugin_name: 'rubygem-sensu-plugin'
sensu::version: 'present'