From 48a41538879ed7d85178d813117ea4ff71adb08b Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 8 Dec 2022 12:45:33 +0100
Subject: [PATCH] Tidy up renos for Monasca and dependencies

Change-Id: Ieb2f4ee5d4c64c92e589d4da63c5b66472052163
---
 .../notes/deprecate-monasca-9f6075d447e939d4.yaml    | 12 ------------
 .../drop_kafka_storm_zookeeper-161011a0422bbcd1.yaml |  8 --------
 ...nasca_kafka_storm_zookeeper-161011a0422bbcd1.yaml |  9 +++++++++
 3 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 releasenotes/notes/deprecate-monasca-9f6075d447e939d4.yaml
 delete mode 100644 releasenotes/notes/drop_kafka_storm_zookeeper-161011a0422bbcd1.yaml
 create mode 100644 releasenotes/notes/drop_monasca_kafka_storm_zookeeper-161011a0422bbcd1.yaml

diff --git a/releasenotes/notes/deprecate-monasca-9f6075d447e939d4.yaml b/releasenotes/notes/deprecate-monasca-9f6075d447e939d4.yaml
deleted file mode 100644
index 60957fa7f..000000000
--- a/releasenotes/notes/deprecate-monasca-9f6075d447e939d4.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-upgrade:
-  - |
-    OpenStack Monasca is no longer supported by Kolla Ansible. Please see the
-    `documentation <https://docs.openstack.org/kolla-ansible/zed/reference/logging-and-monitoring/monasca-guide.html>`__
-    for details on removing it.
-deprecations:
-  - |
-    Deprecates support for the ``Monasca`` service
-    dependencies: ``Kafka``, ``Storm`` and ``Zookeeper``. They will
-    be removed in the Antelope cycle. Prometheus + Grafana + EFK remain
-    as the primary monitoring, logging and alerting stack in Kolla Ansible.
diff --git a/releasenotes/notes/drop_kafka_storm_zookeeper-161011a0422bbcd1.yaml b/releasenotes/notes/drop_kafka_storm_zookeeper-161011a0422bbcd1.yaml
deleted file mode 100644
index efe04adc6..000000000
--- a/releasenotes/notes/drop_kafka_storm_zookeeper-161011a0422bbcd1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-upgrade:
-  - |
-    Support for deploying ``kafka``, ``storm`` and ``zookeeper`` have been
-    dropped since they have been used only with Monasca. Post-upgrade cleanup
-    of those services can be done using ``kolla-ansible monasca_cleanup`` - for
-    details please see
-    `Monasca guide <https://docs.openstack.org/kolla-ansible/zed/reference/logging-and-monitoring/monasca-guide.html>`__
diff --git a/releasenotes/notes/drop_monasca_kafka_storm_zookeeper-161011a0422bbcd1.yaml b/releasenotes/notes/drop_monasca_kafka_storm_zookeeper-161011a0422bbcd1.yaml
new file mode 100644
index 000000000..4bc33dd88
--- /dev/null
+++ b/releasenotes/notes/drop_monasca_kafka_storm_zookeeper-161011a0422bbcd1.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    OpenStack Monasca is no longer supported by Kolla Ansible. Support for
+    deploying ``kafka``, ``storm`` and ``zookeeper`` have been dropped since
+    they have been used only with Monasca. Post-upgrade cleanup of those
+    services can be done using ``kolla-ansible monasca_cleanup`` - for
+    details please see
+    `Monasca guide <https://docs.openstack.org/kolla-ansible/zed/reference/logging-and-monitoring/monasca-guide.html>`__
-- 
GitLab