From d8b99290506c81452d5f0aca439c6df1c0d8145a Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Tue, 3 Sep 2024 14:44:06 -0400 Subject: [PATCH 1/7] bump psutil --- disk/hatch.toml | 2 +- disk/pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/disk/hatch.toml b/disk/hatch.toml index 001e43ce25414..c85c5f07a7df2 100644 --- a/disk/hatch.toml +++ b/disk/hatch.toml @@ -1,4 +1,4 @@ [env.collectors.datadog-checks] [[envs.default.matrix]] -python = ["3.11"] +python = ["3.12"] diff --git a/disk/pyproject.toml b/disk/pyproject.toml index ad2e1e73553a1..7ce713fea8236 100644 --- a/disk/pyproject.toml +++ b/disk/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] From 203fb453ebfdd8b8ede079a729b12ad45ec919bb Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Tue, 3 Sep 2024 20:33:56 -0400 Subject: [PATCH 2/7] bump psutil --- disk/changelog.d/18491.added | 1 + 1 file changed, 1 insertion(+) create mode 100644 disk/changelog.d/18491.added diff --git a/disk/changelog.d/18491.added b/disk/changelog.d/18491.added new file mode 100644 index 0000000000000..6f7b3197628a3 --- /dev/null +++ b/disk/changelog.d/18491.added @@ -0,0 +1 @@ +Bump psutil version for python 3.12 support \ No newline at end of file From 35ae4ce43efef1c1b17087e7f1d736683f83e1df Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Wed, 4 Sep 2024 09:42:51 -0400 Subject: [PATCH 3/7] add version to agent_requirements --- agent_requirements.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent_requirements.in b/agent_requirements.in index aa87fa921a177..753c8316271f3 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -55,6 +55,7 @@ prometheus-client==0.20.0; python_version > '3.0' protobuf==3.17.3; python_version < '3.0' protobuf==5.27.3; python_version > '3.0' psutil==5.9.0 +psutil==5.9.6 psycopg2-binary==2.9.9; python_version > '3.0' pyasn1==0.4.8 pycryptodomex==3.20.0 @@ -70,7 +71,7 @@ pyopenssl==24.2.1; python_version > '3.0' pysmi==0.3.4; python_version < '3.0' pysmi==1.2.1; python_version > '3.0' pysnmp-mibs==0.1.6 -pysnmp==4.4.10; python_version < '3.0' +pysnmp==4.4.10; python_version < '3.0' pysnmp==5.1.0; python_version > '3.0' pysocks==1.7.1 python-binary-memcached==0.26.1; sys_platform != 'win32' and python_version < '3.0' From de9ea5a0e372d34cfb78763645080bfd205846c9 Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Wed, 4 Sep 2024 09:59:27 -0400 Subject: [PATCH 4/7] bump all integrations that use psutil --- agent_requirements.in | 1 - btrfs/pyproject.toml | 2 +- disk/hatch.toml | 2 +- gunicorn/pyproject.toml | 2 +- ibm_mq/pyproject.toml | 2 +- network/pyproject.toml | 2 +- process/pyproject.toml | 2 +- system_core/pyproject.toml | 2 +- system_swap/pyproject.toml | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/agent_requirements.in b/agent_requirements.in index 753c8316271f3..32f5797e68d1d 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -54,7 +54,6 @@ prometheus-client==0.12.0; python_version < '3.0' prometheus-client==0.20.0; python_version > '3.0' protobuf==3.17.3; python_version < '3.0' protobuf==5.27.3; python_version > '3.0' -psutil==5.9.0 psutil==5.9.6 psycopg2-binary==2.9.9; python_version > '3.0' pyasn1==0.4.8 diff --git a/btrfs/pyproject.toml b/btrfs/pyproject.toml index beebc1e45f8fa..d3ea981217a9b 100644 --- a/btrfs/pyproject.toml +++ b/btrfs/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] diff --git a/disk/hatch.toml b/disk/hatch.toml index c85c5f07a7df2..001e43ce25414 100644 --- a/disk/hatch.toml +++ b/disk/hatch.toml @@ -1,4 +1,4 @@ [env.collectors.datadog-checks] [[envs.default.matrix]] -python = ["3.12"] +python = ["3.11"] diff --git a/gunicorn/pyproject.toml b/gunicorn/pyproject.toml index fe15047c6f398..f5fc135bbecb5 100644 --- a/gunicorn/pyproject.toml +++ b/gunicorn/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] diff --git a/ibm_mq/pyproject.toml b/ibm_mq/pyproject.toml index 5de78536c4e63..d3ca79e7bfd2c 100644 --- a/ibm_mq/pyproject.toml +++ b/ibm_mq/pyproject.toml @@ -37,7 +37,7 @@ requires-python = ">=3.9" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", "pymqi==1.12.10; (sys_platform != 'darwin' or platform_machine != 'arm64') and python_version > '3.0'", ] diff --git a/network/pyproject.toml b/network/pyproject.toml index 36497a55e0311..93f3f3bb8e1d9 100644 --- a/network/pyproject.toml +++ b/network/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] diff --git a/process/pyproject.toml b/process/pyproject.toml index fea5fd4285054..11a24522ed886 100644 --- a/process/pyproject.toml +++ b/process/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] diff --git a/system_core/pyproject.toml b/system_core/pyproject.toml index fd21a8d8bd55d..6152315718df2 100644 --- a/system_core/pyproject.toml +++ b/system_core/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] diff --git a/system_swap/pyproject.toml b/system_swap/pyproject.toml index 03bed94d7dea4..42446a6d8f20a 100644 --- a/system_swap/pyproject.toml +++ b/system_swap/pyproject.toml @@ -39,7 +39,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "psutil==5.9.0", + "psutil==5.9.6", ] [project.urls] From 805054d20d757162bd196241e952cf7402e405af Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Wed, 4 Sep 2024 10:14:34 -0400 Subject: [PATCH 5/7] fix licenses --- LICENSE-3rdparty.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index e2332cf9e9e70..5d0de99e66bf0 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -59,7 +59,7 @@ prometheus-client,PyPI,Apache-2.0,Copyright 2015 Brian Brazil prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc. All rights reserved. -psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola'" +psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola" psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio pyOpenSSL,PyPI,Apache-2.0,Copyright The pyOpenSSL developers From a86bd289696ebd014896ff509f1e86f4b506f1da Mon Sep 17 00:00:00 2001 From: Kyle-Neale Date: Wed, 4 Sep 2024 10:28:58 -0400 Subject: [PATCH 6/7] add changelog --- btrfs/changelog.d/18491.added | 1 + disk/changelog.d/18491.added.1 | 1 + gunicorn/changelog.d/18491.added | 1 + ibm_mq/changelog.d/18491.added | 1 + network/changelog.d/18491.added | 1 + process/changelog.d/18491.added | 1 + system_core/changelog.d/18491.added | 1 + system_swap/changelog.d/18491.added | 1 + 8 files changed, 8 insertions(+) create mode 100644 btrfs/changelog.d/18491.added create mode 100644 disk/changelog.d/18491.added.1 create mode 100644 gunicorn/changelog.d/18491.added create mode 100644 ibm_mq/changelog.d/18491.added create mode 100644 network/changelog.d/18491.added create mode 100644 process/changelog.d/18491.added create mode 100644 system_core/changelog.d/18491.added create mode 100644 system_swap/changelog.d/18491.added diff --git a/btrfs/changelog.d/18491.added b/btrfs/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/btrfs/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/disk/changelog.d/18491.added.1 b/disk/changelog.d/18491.added.1 new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/disk/changelog.d/18491.added.1 @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/gunicorn/changelog.d/18491.added b/gunicorn/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/gunicorn/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/ibm_mq/changelog.d/18491.added b/ibm_mq/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/ibm_mq/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/network/changelog.d/18491.added b/network/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/network/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/process/changelog.d/18491.added b/process/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/process/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/system_core/changelog.d/18491.added b/system_core/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/system_core/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file diff --git a/system_swap/changelog.d/18491.added b/system_swap/changelog.d/18491.added new file mode 100644 index 0000000000000..bf0b9ff604a5e --- /dev/null +++ b/system_swap/changelog.d/18491.added @@ -0,0 +1 @@ +Bump `psutil` version to 5.9.6 \ No newline at end of file From f94e326cebb4cac78c7156e0ddc05e98dd6d2866 Mon Sep 17 00:00:00 2001 From: Kyle Neale Date: Wed, 4 Sep 2024 11:06:23 -0400 Subject: [PATCH 7/7] remove duplicate changelog --- disk/changelog.d/18491.added.1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 disk/changelog.d/18491.added.1 diff --git a/disk/changelog.d/18491.added.1 b/disk/changelog.d/18491.added.1 deleted file mode 100644 index bf0b9ff604a5e..0000000000000 --- a/disk/changelog.d/18491.added.1 +++ /dev/null @@ -1 +0,0 @@ -Bump `psutil` version to 5.9.6 \ No newline at end of file