From 9d9eecea56b15f6f96f9d33def8045afb6527051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Fri, 7 Oct 2016 15:30:35 +0200
Subject: [PATCH] Prefill Sensu client custom config

- Custom config has to contain OpenStack auth information,
  so it has to be generated for user during deployment.
  This patch maintains the ability to provide a custom
  configuration for the Sensu client.

Change-Id: If449642c4bbad683421e1f461b8721e655db0c45
---
 environments/monitoring-environment.yaml     | 36 ++++++--------------
 puppet/services/monitoring/sensu-client.yaml | 17 ++++++++-
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/environments/monitoring-environment.yaml b/environments/monitoring-environment.yaml
index 62ab06dcf2..f4aa67a9b7 100644
--- a/environments/monitoring-environment.yaml
+++ b/environments/monitoring-environment.yaml
@@ -1,30 +1,16 @@
-## A Heat environment file which can be used to set up monitoring
-## and logging agents
+## A Heat environment file which can be used to set up monitoring agents
 
 resource_registry:
   OS::TripleO::Services::SensuClient: ../puppet/services/monitoring/sensu-client.yaml
 
 #parameter_defaults:
-  #### Sensu settings ####
-  ##MonitoringRabbitHost: 10.10.10.10
-  ##MonitoringRabbitPort: 5672
-  ##MonitoringRabbitUserName: sensu
-  ##MonitoringRabbitPassword: sensu
-  ##MonitoringRabbitUseSSL: false
-  ##MonitoringRabbitVhost: "/sensu"
-  ##SensuClientCustomConfig:
-  ##  - api:
-  ##    - warning: 10
-  ##      critical: 20
-  ##    openstack:
-  ##    - username: admin
-  ##      password: changeme
-  ##      project_name: admin
-  ##      auth_url: http://controller:5000/v2.0
-  ##      region_name: RegionOne
-
-  #### EFK settings ####
-  ## TBD
-
-  #### Grafana/Graphite settings ####
-  ## TBD
+#  MonitoringRabbitHost: 10.10.10.10
+#  MonitoringRabbitPort: 5672
+#  MonitoringRabbitUserName: sensu
+#  MonitoringRabbitPassword: sensu
+#  MonitoringRabbitUseSSL: false
+#  MonitoringRabbitVhost: "/sensu"
+#  SensuClientCustomConfig:
+#    api:
+#      warning: 10
+#      critical: 20
diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml
index 3f37e7507e..a26c7458f4 100644
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@@ -18,6 +18,13 @@ parameters:
       Mapping of service endpoint -> protocol. Typically set
       via parameter_defaults in the resource registry.
     type: json
+  AdminPassword:
+    description: Keystone admin user password
+    type: string
+  KeystoneRegion:
+    default: 'regionOne'
+    description: Keystone region for endpoint
+    type: string
   SensuClientCustomConfig:
     default: {}
     description: Hash containing custom sensu-client variables.
@@ -44,6 +51,14 @@ outputs:
           - sensu::api: false
             sensu::client: true
             sensu::server: false
-            sensu::client_custom: {get_param: SensuClientCustomConfig}
+            sensu::client_custom:
+              map_merge:
+                - {get_param: SensuClientCustomConfig}
+                - openstack:
+                    username: 'admin'
+                    password: {get_param: AdminPassword}
+                    auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+                    tenant_name: 'admin'
+                    region: {get_param: KeystoneRegion}
       step_config: |
         include ::tripleo::profile::base::monitoring::sensu