Merge "Config options for AMQP1 transport in collectd sensubility" into stable/ussuri

deployment/metrics/collectd-container-puppet.yaml

@@ -337,6 +337,14 @@ parameters:
     type: json
     description: JSON formated definition of standalone checks to be scheduled on client side.
     default: {}
+  CollectdSensubilityTransport:
+    type: string
+    description: Bus type for sent data. Options are 'sensu' (rabbitmq) and 'amqp1'
+    default: sensu
+  CollectdSensubilityResultsChannel:
+    type: string
+    description: AMQP1 channel address
+    default: collectd/notify
   CollectdEnableContainerHealthCheck:
     type: boolean
     description: >
@@ -345,7 +353,7 @@ parameters:
     default: true
   CollectdContainerHealthCheckCommand:
     type: string
-    default: "/scripts/collectd_check_health.py"
+    default: /scripts/collectd_check_health.py
   CollectdContainerHealthCheckInterval:
     type: number
     description: The frequency in seconds the docker health check is executed.
@@ -652,6 +660,12 @@ outputs:
                         handlers: {get_param: CollectdContainerHealthCheckHandlers}
                         occurrences: {get_param: CollectdContainerHealthCheckOccurrences}
                         refresh: {get_param: CollectdContainerHealthCheckRefresh}
+                tripleo::profile::base::metrics::collectd::sensubility::results_channel:
+                  get_param: CollectdSensubilityResultsChannel
+                tripleo::profile::base::metrics::collectd::sensubility::transport:
+                  get_param: CollectdSensubilityTransport
+                tripleo::profile::base::metrics::collectd::sensubility::amqp_port:
+                  get_param: CollectdAmqpPort
             - {}
           - if:
             - enable_libpodstats