From 0b6f9924de943c8a16e7f8f3408369b622965824 Mon Sep 17 00:00:00 2001 From: Juanpe Araque Date: Tue, 26 Aug 2025 10:43:45 +0100 Subject: [PATCH 1/2] Port MySQL Changelog to master (latest 7.70.x release) (#21146) * Port 82bef32495 to master * Remove in-toto --- mysql/CHANGELOG.md | 6 ++++++ mysql/changelog.d/21097.fixed | 1 - mysql/datadog_checks/mysql/__about__.py | 2 +- requirements-agent-release.txt | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 mysql/changelog.d/21097.fixed diff --git a/mysql/CHANGELOG.md b/mysql/CHANGELOG.md index 21b9804a3d42f..613a8078f114a 100644 --- a/mysql/CHANGELOG.md +++ b/mysql/CHANGELOG.md @@ -2,6 +2,12 @@ +## 15.7.3 / 2025-08-25 + +***Fixed***: + +* Change statement_rows to TTL cache to fix mysql memory leaks ([#21097](https://github.com/DataDog/integrations-core/pull/21097)) + ## 15.7.2 / 2025-08-07 ***Fixed***: diff --git a/mysql/changelog.d/21097.fixed b/mysql/changelog.d/21097.fixed deleted file mode 100644 index 2046fd6863c92..0000000000000 --- a/mysql/changelog.d/21097.fixed +++ /dev/null @@ -1 +0,0 @@ -Change statement_rows to TTL cache to fix mysql memory leaks diff --git a/mysql/datadog_checks/mysql/__about__.py b/mysql/datadog_checks/mysql/__about__.py index 3313befeacbcd..12e8706253423 100644 --- a/mysql/datadog_checks/mysql/__about__.py +++ b/mysql/datadog_checks/mysql/__about__.py @@ -2,4 +2,4 @@ # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = "15.7.2" +__version__ = "15.7.3" diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt index fa747c41e0311..1f5bc5f20689c 100644 --- a/requirements-agent-release.txt +++ b/requirements-agent-release.txt @@ -144,7 +144,7 @@ datadog-microsoft-dns==1.0.0; sys_platform == 'win32' datadog-microsoft-sysmon==1.0.0; sys_platform == 'win32' datadog-milvus==2.0.1 datadog-mongo==10.3.0 -datadog-mysql==15.7.2 +datadog-mysql==15.7.3 datadog-nagios==3.0.0 datadog-network==5.3.0 datadog-nfsstat==3.1.0; sys_platform == 'linux2' From 10a7543eeb121f0f2b719629cc41cb41b3b286e3 Mon Sep 17 00:00:00 2001 From: Kyle Neale Date: Tue, 26 Aug 2025 10:20:07 -0400 Subject: [PATCH 2/2] Handle removed integrations in `ddev release agent changelog` command (#21167) * Fix ddev release agent changelog command * Lint * Add changelog --- ddev/changelog.d/21167.fixed | 1 + ddev/src/ddev/cli/release/agent/changelog.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 ddev/changelog.d/21167.fixed diff --git a/ddev/changelog.d/21167.fixed b/ddev/changelog.d/21167.fixed new file mode 100644 index 0000000000000..70238f2c6b57f --- /dev/null +++ b/ddev/changelog.d/21167.fixed @@ -0,0 +1 @@ +Handle changelog generation for removed integrations \ No newline at end of file diff --git a/ddev/src/ddev/cli/release/agent/changelog.py b/ddev/src/ddev/cli/release/agent/changelog.py index 478dd60279e52..2939c0e06fc4e 100644 --- a/ddev/src/ddev/cli/release/agent/changelog.py +++ b/ddev/src/ddev/cli/release/agent/changelog.py @@ -23,6 +23,11 @@ 'Mesos': 'Mesos Slave' } +REMOVED_INTEGRATIONS = { + # name --> display name + 'kaspersky': 'Kaspersky' +} + @click.command( short_help="Provide a list of updated checks on a given Datadog Agent version, in changelog form", @@ -69,8 +74,12 @@ def changelog(app: Application, since: str, to: str, write: bool, force: bool): for entry in CHANGELOG_MANUAL_ENTRIES.get(agent, []): changelog_contents.write(f'{entry}\n') for name, ver in version_changes.items(): - display_name = app.repo.integrations.get(name).display_name - display_name = DISPLAY_NAME_MAPPING.get(display_name, display_name) + try: + display_name = app.repo.integrations.get(name).display_name + display_name = DISPLAY_NAME_MAPPING.get(display_name, display_name) + # OSError is raised if the integration path does not exist - likely a deleted or migrated integration + except OSError: + display_name = REMOVED_INTEGRATIONS.get(name, name) breaking_notice = " **BREAKING CHANGE**" if ver[1] else "" changelog_url = check_changelog_url.format(name)