From d5a502f08594ff2491fd07a54e43b82b0bc18c72 Mon Sep 17 00:00:00 2001 From: HadhemiDD <43783545+HadhemiDD@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:54:24 +0100 Subject: [PATCH] Port changes from 7.60 RC6 to master (#19127) * [Release] Bumped sqlserver version to 20.1.1 * [Release] Bumped slurm version to 1.0.1 * [Release] Bumped kafka_consumer version to 6.1.0 --- kafka_consumer/CHANGELOG.md | 6 ++++++ kafka_consumer/changelog.d/19099.security | 1 - kafka_consumer/datadog_checks/kafka_consumer/__about__.py | 2 +- requirements-agent-release.txt | 6 +++--- slurm/CHANGELOG.md | 6 ++++++ slurm/changelog.d/19117.fixed | 1 - slurm/datadog_checks/slurm/__about__.py | 2 +- sqlserver/CHANGELOG.md | 6 ++++++ sqlserver/changelog.d/19110.fixed | 1 - sqlserver/datadog_checks/sqlserver/__about__.py | 2 +- 10 files changed, 24 insertions(+), 9 deletions(-) delete mode 100644 kafka_consumer/changelog.d/19099.security delete mode 100644 slurm/changelog.d/19117.fixed delete mode 100644 sqlserver/changelog.d/19110.fixed diff --git a/kafka_consumer/CHANGELOG.md b/kafka_consumer/CHANGELOG.md index e6191714d124e..f51c5184d183c 100644 --- a/kafka_consumer/CHANGELOG.md +++ b/kafka_consumer/CHANGELOG.md @@ -2,6 +2,12 @@ +## 6.1.0 / 2024-11-25 + +***Security***: + +* Bump confluent-kafka to 2.6.1 ([#19099](https://github.com/DataDog/integrations-core/pull/19099)) + ## 6.0.0 / 2024-10-04 / Agent 7.59.0 ***Removed***: diff --git a/kafka_consumer/changelog.d/19099.security b/kafka_consumer/changelog.d/19099.security deleted file mode 100644 index 48e5443d8c3a5..0000000000000 --- a/kafka_consumer/changelog.d/19099.security +++ /dev/null @@ -1 +0,0 @@ -Bump confluent-kafka to 2.6.1 \ No newline at end of file diff --git a/kafka_consumer/datadog_checks/kafka_consumer/__about__.py b/kafka_consumer/datadog_checks/kafka_consumer/__about__.py index 91262416e46c9..34fa89c4d14c1 100644 --- a/kafka_consumer/datadog_checks/kafka_consumer/__about__.py +++ b/kafka_consumer/datadog_checks/kafka_consumer/__about__.py @@ -2,4 +2,4 @@ # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = "6.0.0" +__version__ = "6.1.0" diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt index 316f42c8a2c9a..85498b3337d42 100644 --- a/requirements-agent-release.txt +++ b/requirements-agent-release.txt @@ -91,7 +91,7 @@ datadog-impala==3.1.0 datadog-istio==8.0.0 datadog-jboss-wildfly==3.1.0 datadog-journald==3.0.0 -datadog-kafka-consumer==6.0.0 +datadog-kafka-consumer==6.1.0 datadog-kafka==4.0.0 datadog-karpenter==2.1.0 datadog-kong==5.0.0 @@ -159,13 +159,13 @@ datadog-scylla==4.0.0 datadog-sidekiq==3.0.0 datadog-silk==4.0.0 datadog-singlestore==4.0.0 -datadog-slurm==1.0.0; sys_platform == 'linux2' +datadog-slurm==1.0.1; sys_platform == 'linux2' datadog-snmp==9.0.0 datadog-snowflake==7.0.0 datadog-solr==2.1.0 datadog-sonarqube==5.0.0 datadog-spark==6.1.0 -datadog-sqlserver==20.1.0 +datadog-sqlserver==20.1.1 datadog-squid==4.0.0 datadog-ssh-check==4.0.0 datadog-statsd==3.0.0 diff --git a/slurm/CHANGELOG.md b/slurm/CHANGELOG.md index 63d0291de381b..2df8076b53349 100644 --- a/slurm/CHANGELOG.md +++ b/slurm/CHANGELOG.md @@ -2,6 +2,12 @@ +## 1.0.1 / 2024-11-25 + +***Fixed***: + +* Fix issue in which the sacct params kept growing with each iteration ([#19117](https://github.com/DataDog/integrations-core/pull/19117)) + ## 1.0.0 / 2024-11-06 ***Added***: diff --git a/slurm/changelog.d/19117.fixed b/slurm/changelog.d/19117.fixed deleted file mode 100644 index 11da713cd1f7d..0000000000000 --- a/slurm/changelog.d/19117.fixed +++ /dev/null @@ -1 +0,0 @@ -Fix issue in which the sacct params kept growing with each iteration diff --git a/slurm/datadog_checks/slurm/__about__.py b/slurm/datadog_checks/slurm/__about__.py index acbfd1c866b84..e0db4e56d553f 100644 --- a/slurm/datadog_checks/slurm/__about__.py +++ b/slurm/datadog_checks/slurm/__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__ = '1.0.0' +__version__ = '1.0.1' diff --git a/sqlserver/CHANGELOG.md b/sqlserver/CHANGELOG.md index 6958ccddfd01e..19d8334773f8d 100644 --- a/sqlserver/CHANGELOG.md +++ b/sqlserver/CHANGELOG.md @@ -2,6 +2,12 @@ +## 20.1.1 / 2024-11-25 + +***Fixed***: + +* Use alternative schema collection query for sqlserver 2016 and older due to STRING_AGG not being supported until SQLServer 2017 ([#19110](https://github.com/DataDog/integrations-core/pull/19110)) + ## 20.1.0 / 2024-10-31 ***Added***: diff --git a/sqlserver/changelog.d/19110.fixed b/sqlserver/changelog.d/19110.fixed deleted file mode 100644 index 5b971349edede..0000000000000 --- a/sqlserver/changelog.d/19110.fixed +++ /dev/null @@ -1 +0,0 @@ -Use alternative schema collection query for sqlserver 2016 and older due to STRING_AGG not being supported until SQLServer 2017 diff --git a/sqlserver/datadog_checks/sqlserver/__about__.py b/sqlserver/datadog_checks/sqlserver/__about__.py index 9d60babc50b9c..88c205094f084 100644 --- a/sqlserver/datadog_checks/sqlserver/__about__.py +++ b/sqlserver/datadog_checks/sqlserver/__about__.py @@ -2,4 +2,4 @@ # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = '20.1.0' +__version__ = '20.1.1'