From fa6c7b1906ad0d36639696b027319214ff47f3d9 Mon Sep 17 00:00:00 2001
From: Leif Madsen <lmadsen@redhat.com>
Date: Thu, 8 Jul 2021 17:00:26 -0400
Subject: [PATCH] Drop CollectdAmqpInstances from collectd-write-qdr.yaml

Drop the CollectdAmqpInstances parameter from collectd-write-qdr.yaml in
order to allow an administrator to override the default specified
topics. If the administrator of the cloud used collectd-write-qdr.yaml
and then needed to override the topics, a merge of the defaults and
custom topics would be added to the 10-amqp.conf for collectd, resulting
in data being published to unused topics.

Change-Id: I554d8677156934c4d49acb1346afea16339ad5c2
Signed-off-by: Leif Madsen <lmadsen@redhat.com>
(cherry picked from commit 591f2aa2d8b68234c63fbdd4f59a9232a67b7b2f)
---
 environments/metrics/collectd-write-qdr.yaml     |  8 --------
 .../collectd-write-qdr-f790703e3f0c3245.yaml     | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/collectd-write-qdr-f790703e3f0c3245.yaml

diff --git a/environments/metrics/collectd-write-qdr.yaml b/environments/metrics/collectd-write-qdr.yaml
index 0bec15b0a5..b5ccddb7f4 100644
--- a/environments/metrics/collectd-write-qdr.yaml
+++ b/environments/metrics/collectd-write-qdr.yaml
@@ -7,11 +7,3 @@ resource_registry:
 parameter_defaults:
   CollectdConnectionType: amqp1
   CollectdAmqpSendQueueLimit: 40
-  CollectdAmqpInstances:
-    notify:
-      notify: true
-      format: JSON
-      presettle: false
-    telemetry:
-      format: JSON
-      presettle: false
diff --git a/releasenotes/notes/collectd-write-qdr-f790703e3f0c3245.yaml b/releasenotes/notes/collectd-write-qdr-f790703e3f0c3245.yaml
new file mode 100644
index 0000000000..94af553f40
--- /dev/null
+++ b/releasenotes/notes/collectd-write-qdr-f790703e3f0c3245.yaml
@@ -0,0 +1,16 @@
+---
+prelude: >
+  Environment file collectd-write-qdr.yaml no longer specifies a default
+  CollectdAmqpInstances hash.
+upgrade:
+  - |
+    When upgrading an environment that uses collectd-write-qdr.yaml the
+    CollectdAmqpInstances defaults previously specified need to be added to an
+    administrator provided environment file and used during the overcloud
+    deploy process.
+fixes:
+  - |
+    The collectd-write-qdr.yaml no longer specifies a default
+    CollectdAmqpInstances hash. When specified, it was not possible to override
+    the parameter, resulting in a combined hash of the default values and the
+    administrators custom values which could lead to unexpected issues.