From 0b58b547b6d739034a9462933ac3f8f418bbbe70 Mon Sep 17 00:00:00 2001
From: pleimer <pfbleimer@gmail.com>
Date: Thu, 15 Oct 2020 14:53:54 -0400
Subject: [PATCH] Config options for AMQP1 transport in collectd sensubility

This patch exposes configuration options for setting up collectd
sensubility to use AMQP1 transport. This is primarily for
compatability with the Service Telemetry Framework.

Change-Id: Id74eb494e022e88f0a1d5c1044d3a7a283b5178f
Depends-On: https://review.opendev.org/#/c/760124/
(cherry picked from commit 6fef2d86b2d65801e8fb8514e5e5ba783715076a)
---
 .../metrics/collectd-container-puppet.yaml       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml
index ee4478fd12..693d323a5d 100644
--- a/deployment/metrics/collectd-container-puppet.yaml
+++ b/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