From 9a7a05f3123cb7c5e5edbaf9a5fbefdc0d220d02 Mon Sep 17 00:00:00 2001 From: Ioannis Tsouvalas Date: Fri, 6 Sep 2024 21:00:34 +0300 Subject: [PATCH] Syslog and Forwarder Agent TLS in rabbitmq - Removed unnecessary `cloud-controller` TLS configurations. - Added TLS configurations for `syslog_agent_api`, `syslog_agent_metrics`, and `forwarder_agent_metrics` --- manifests/forges/rabbitmq-autoscale.yml | 18 ++++++++++++++---- manifests/forges/rabbitmq.yml | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/manifests/forges/rabbitmq-autoscale.yml b/manifests/forges/rabbitmq-autoscale.yml index 564c20a..088b98c 100644 --- a/manifests/forges/rabbitmq-autoscale.yml +++ b/manifests/forges/rabbitmq-autoscale.yml @@ -33,11 +33,21 @@ instance_groups: agent: cert: (( vault meta.cf.exodus_path ":loggregator_tls_agent_cert" )) key: (( vault meta.cf.exodus_path ":loggregator_tls_agent_key" )) - cloud-controller: + syslog_agent_api: tls: - ca_cert: (( vault meta.cf.exodus_path ":cloud_controller_tls_ca" )) - cert: (( vault meta.cf.exodus_path ":cloud_controller_tls_certificate" )) - key: (( vault meta.cf.exodus_path ":cloud_controller_tls_private_key" )) + ca_cert: (( vault meta.cf.exodus_path ":syslog_agent_api_tls_ca" )) + cert: (( vault meta.cf.exodus_path ":syslog_agent_api_tls_certificate" )) + key: (( vault meta.cf.exodus_path ":syslog_agent_api_tls_private_key" )) + syslog_agent_metrics: + tls: + ca_cert: (( vault meta.cf.exodus_path ":syslog_agent_metrics_tls_ca" )) + cert: (( vault meta.cf.exodus_path ":syslog_agent_metrics_tls_certificate" )) + key: (( vault meta.cf.exodus_path ":syslog_agent_metrics_tls_private_key" )) + forwarder_agent_metrics: + tls: + ca_cert: (( vault meta.cf.exodus_path ":forwarder_agent_metrics_tls_ca" )) + cert: (( vault meta.cf.exodus_path ":forwarder_agent_metrics_tls_certificate" )) + key: (( vault meta.cf.exodus_path ":forwarder_agent_metrics_tls_private_key" )) rabbitmq_metrics_emitter: cloud_foundry: api: (( grab meta.cf.api_url )) diff --git a/manifests/forges/rabbitmq.yml b/manifests/forges/rabbitmq.yml index 298e292..513921e 100644 --- a/manifests/forges/rabbitmq.yml +++ b/manifests/forges/rabbitmq.yml @@ -18,7 +18,7 @@ meta: releases: - name: rabbitmq-forge - version: 1.2.4+dev.23 + version: 1.2.5+dev.5 # url: https://github.com/blacksmith-community/rabbitmq-forge-boshrelease/releases/download/v1.2.4/rabbitmq-forge-1.2.4.tgz # sha1: 539bf9fce41657f6d0bd549e4b5bed9d3232c96f