Merge "Add release notes for Manila/CephFS with managed Ceph"

[apex-tripleo-heat-templates.git] / puppet / services / monitoring / sensu-base.yaml

diff --git a/puppet/services/monitoring/sensu-base.yaml b/puppet/services/monitoring/sensu-base.yaml
index d7350d0..a8303a5 100644 (file)
--- a/puppet/services/monitoring/sensu-base.yaml
+++ b/puppet/services/monitoring/sensu-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: Sensu base service
 
@@ -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: comma_delimited_list
+    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'