From 267b6afad0fc7fd6ee1f3a717bfdefd2487c6328 Mon Sep 17 00:00:00 2001
From: HadhemiDD <43783545+HadhemiDD@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:22:55 +0200
Subject: [PATCH] [Release] Bumped postgres version to 22.0.2 and tibco_ems
 version to 2.1.0 (#18872)

* [Release] Bumped tibco_ems version to 2.1.0

* [Release] Bumped postgres version to 22.0.2
---
 postgres/CHANGELOG.md                           | 6 ++++++
 postgres/changelog.d/18866.fixed                | 1 -
 postgres/datadog_checks/postgres/__about__.py   | 2 +-
 requirements-agent-release.txt                  | 4 ++--
 tibco_ems/CHANGELOG.md                          | 6 ++++++
 tibco_ems/changelog.d/18840.added               | 1 -
 tibco_ems/datadog_checks/tibco_ems/__about__.py | 2 +-
 7 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 postgres/changelog.d/18866.fixed
 delete mode 100644 tibco_ems/changelog.d/18840.added

diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index 77c8d3f0a0687..05107ba22b3e2 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 22.0.2 / 2024-10-18
+
+***Fixed***:
+
+* Revert "Parse each row of pg_stat_activity separately inside a try/catch (#18762)" ([#18866](https://github.com/DataDog/integrations-core/pull/18866))
+
 ## 22.0.1 / 2024-10-14
 
 ***Fixed***:
diff --git a/postgres/changelog.d/18866.fixed b/postgres/changelog.d/18866.fixed
deleted file mode 100644
index d4ff9d0caecc9..0000000000000
--- a/postgres/changelog.d/18866.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Revert "Parse each row of pg_stat_activity separately inside a try/catch (#18762)"
diff --git a/postgres/datadog_checks/postgres/__about__.py b/postgres/datadog_checks/postgres/__about__.py
index d63d7a9be6019..882bf87b60564 100644
--- a/postgres/datadog_checks/postgres/__about__.py
+++ b/postgres/datadog_checks/postgres/__about__.py
@@ -2,4 +2,4 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
-__version__ = "22.0.1"
+__version__ = "22.0.2"
diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt
index 50c585038707f..ec257c0233140 100644
--- a/requirements-agent-release.txt
+++ b/requirements-agent-release.txt
@@ -141,7 +141,7 @@ datadog-pgbouncer==8.0.0; sys_platform != 'win32'
 datadog-php-fpm==5.0.0
 datadog-ping-federate==2.0.0
 datadog-postfix==3.0.0; sys_platform != 'win32'
-datadog-postgres==22.0.1
+datadog-postgres==22.0.2
 datadog-powerdns-recursor==4.0.0
 datadog-presto==3.1.0
 datadog-process==5.0.0
@@ -180,7 +180,7 @@ datadog-teleport==2.1.0
 datadog-temporal==3.1.0
 datadog-tenable==3.0.0
 datadog-teradata==4.0.0; sys_platform != 'darwin'
-datadog-tibco-ems==2.0.1; sys_platform != 'win32'
+datadog-tibco-ems==2.1.0; sys_platform != 'win32'
 datadog-tls==4.0.0
 datadog-tokumx==3.2.0
 datadog-tomcat==4.0.0
diff --git a/tibco_ems/CHANGELOG.md b/tibco_ems/CHANGELOG.md
index e6598d144cdea..36c78722ea863 100644
--- a/tibco_ems/CHANGELOG.md
+++ b/tibco_ems/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 2.1.0 / 2024-10-18
+
+***Added***:
+
+* Fix metric size unit parsing ([#18840](https://github.com/DataDog/integrations-core/pull/18840))
+
 ## 2.0.1 / 2024-10-04
 
 ***Fixed***:
diff --git a/tibco_ems/changelog.d/18840.added b/tibco_ems/changelog.d/18840.added
deleted file mode 100644
index 27f3994548c56..0000000000000
--- a/tibco_ems/changelog.d/18840.added
+++ /dev/null
@@ -1 +0,0 @@
-Fix metric size unit parsing
\ No newline at end of file
diff --git a/tibco_ems/datadog_checks/tibco_ems/__about__.py b/tibco_ems/datadog_checks/tibco_ems/__about__.py
index 4e2ee3360463e..f8405f9a7a8ae 100644
--- a/tibco_ems/datadog_checks/tibco_ems/__about__.py
+++ b/tibco_ems/datadog_checks/tibco_ems/__about__.py
@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2024-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = '2.0.1'
+__version__ = '2.1.0'