From d3e1bdf48aae2157e4b4105b3b13210e56991a70 Mon Sep 17 00:00:00 2001
From: Enrico Donnici <enrico.donnici@datadoghq.com>
Date: Thu, 30 Jan 2025 09:17:15 +0100
Subject: [PATCH] Port changelogs and version bumps from 7.63 RC3 to master.
 (#19513)

---
 pgbouncer/CHANGELOG.md                          | 6 ++++++
 pgbouncer/changelog.d/19497.fixed               | 1 -
 pgbouncer/datadog_checks/pgbouncer/__about__.py | 2 +-
 postgres/CHANGELOG.md                           | 6 ++++++
 postgres/changelog.d/19499.fixed                | 1 -
 postgres/datadog_checks/postgres/__about__.py   | 2 +-
 requirements-agent-release.txt                  | 4 ++--
 7 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 pgbouncer/changelog.d/19497.fixed
 delete mode 100644 postgres/changelog.d/19499.fixed

diff --git a/pgbouncer/CHANGELOG.md b/pgbouncer/CHANGELOG.md
index 20aefa866336f..968e716362ae0 100644
--- a/pgbouncer/CHANGELOG.md
+++ b/pgbouncer/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 8.1.1 / 2025-01-29
+
+***Fixed***:
+
+* Revert "Upgrade PGBouncer to psycopg3" due to instability in testing ([#19497](https://github.com/DataDog/integrations-core/pull/19497))
+
 ## 8.1.0 / 2025-01-25
 
 ***Security***:
diff --git a/pgbouncer/changelog.d/19497.fixed b/pgbouncer/changelog.d/19497.fixed
deleted file mode 100644
index f75698f68acf3..0000000000000
--- a/pgbouncer/changelog.d/19497.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Revert "Upgrade PGBouncer to psycopg3" due to instability in testing
diff --git a/pgbouncer/datadog_checks/pgbouncer/__about__.py b/pgbouncer/datadog_checks/pgbouncer/__about__.py
index 28840c3e7ae21..03da2e002bfda 100644
--- a/pgbouncer/datadog_checks/pgbouncer/__about__.py
+++ b/pgbouncer/datadog_checks/pgbouncer/__about__.py
@@ -1,4 +1,4 @@
 # (C) Datadog, Inc. 2018-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
-__version__ = "8.1.0"
+__version__ = "8.1.1"
diff --git a/postgres/CHANGELOG.md b/postgres/CHANGELOG.md
index 57149be63b341..c5d89c9ae87fa 100644
--- a/postgres/CHANGELOG.md
+++ b/postgres/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 22.5.1 / 2025-01-29
+
+***Fixed***:
+
+* Revert "Upgrade postgres to psycopg3" due to instability in testing ([#19499](https://github.com/DataDog/integrations-core/pull/19499))
+
 ## 22.5.0 / 2025-01-25
 
 ***Added***:
diff --git a/postgres/changelog.d/19499.fixed b/postgres/changelog.d/19499.fixed
deleted file mode 100644
index 03a7138d6239a..0000000000000
--- a/postgres/changelog.d/19499.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Revert "Upgrade postgres to psycopg3" due to instability in testing
\ No newline at end of file
diff --git a/postgres/datadog_checks/postgres/__about__.py b/postgres/datadog_checks/postgres/__about__.py
index a55223453d799..9438497f02390 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.5.0"
+__version__ = "22.5.1"
diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt
index 49af6a782a1ec..4b751197b3b7a 100644
--- a/requirements-agent-release.txt
+++ b/requirements-agent-release.txt
@@ -142,11 +142,11 @@ datadog-ossec-security==2.0.0
 datadog-palo-alto-panorama==1.0.0
 datadog-pan-firewall==3.0.0
 datadog-pdh-check==4.1.0; sys_platform == 'win32'
-datadog-pgbouncer==8.1.0; sys_platform != 'win32'
+datadog-pgbouncer==8.1.1; sys_platform != 'win32'
 datadog-php-fpm==5.1.0
 datadog-ping-federate==2.0.0
 datadog-postfix==3.0.0; sys_platform != 'win32'
-datadog-postgres==22.5.0
+datadog-postgres==22.5.1
 datadog-powerdns-recursor==4.1.0
 datadog-presto==3.1.0
 datadog-process==5.0.0