Merge branch 'master' into bot/update-dependencies-1704075305

DataDog · Jan 2, 2024 · 6bd88e1 · 6bd88e1
2 parents b09c66e + c33a4e6
commit 6bd88e1
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 15 deletions.
diff --git a/.in-toto/tag.05916999.link b/.in-toto/tag.05916999.link
@@ -1 +1 @@
-{"signatures":[{"keyid":"05916999737102a3cfebe7c6725d3843dbd883ed","other_headers":"04000108001d16210405916999737102a3cfebe7c6725d3843dbd883ed0502657acf27","signature":"a490e9072246199debd6b621d6067a65b25a11fede235f7f086049392efaee854093a8c2ea4e107512f9f8ccbe2c58d6696ddcaeb940da2b02f8b4c8a7135b3048d4db602a3588b61bc26bdcc27251c89ad5d48509ae9b31ad89a9fc5833a917eee47dcd49c32ac252008ac9d86f9e200352f4495db593dc8d5b6b76ab806de8c8cc33d82edb7c1eaa0c205b0bf4b5c71c248f1a6c965983a23fa6e241ed1444619345594b0f6b2d5583729aa7123b23709ae9730a137ffb9f02e8b6674c8b3dcdf5613698044f231e8df5154db40b966b3435d58137163fd65ecfad6222d6a415ca29c7668cef75a39a69b1fdf79c9e1cb0bf637fbb60f031beef5ed79764bcba082b3e64402fa411bf2f051bc08cc4a05c63fae760859ee63cc5e4d506c6b6afd1328dfe5f30adfbb01489200946952aafdaa33954d5515514a59318bd641eb0cb776f91aad48c827c1defd89a704caf38a7f74d876c88116772cc83c2c845d39869a69112b2e3cf7e408430b1177e6d211fda1c97ea4b7e149a1c6d92ac9c3c06aca1255bf76ddfdef4a309e01584bc1b9991c25c5e07dbb9f24ca4ce11106ac9f22c2b3c4f2393aacb57e6de09b702ea1f8f07c80d22fe4b4f1e11577420cdd665b4a88eebed628b767c94dfa320787e1577edafee2d79f7503d20bf79635a45be0720d16929b03447e40d6d8557ffce881c75e21616f13058f960f82d35"}],"signed":{"_type":"link","byproducts":{},"command":[],"environment":{},"materials":{},"name":"tag","products":{"apache/datadog_checks/__init__.py":{"sha256":"fe73dc8f45d35205d366455edc6e8c3a8b29870d773b6f103d5261e25f757b25"},"apache/datadog_checks/apache/__about__.py":{"sha256":"1de135cef553f57095a0a4a0484e8c2586a2db4d2fb0564e540e707b38cc5749"},"apache/datadog_checks/apache/__init__.py":{"sha256":"56a94d605f3abba4996b378f5aa5508589899ab305431d2c6287142029287baa"},"apache/datadog_checks/apache/apache.py":{"sha256":"8846cc073b43bc3dc6bfb8fa61cf84326004d84cf9e32f746342e7879524d68a"},"apache/datadog_checks/apache/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"apache/datadog_checks/apache/config_models/defaults.py":{"sha256":"7f109ebae12d3cb6db2c162eb924ab4c43cc8b5f3dffec71e1a82fecdb87845b"},"apache/datadog_checks/apache/config_models/instance.py":{"sha256":"9317901f8204ea6cfddb325a1eaf93b7f4ed7820d1f8c2eaf9fe3c5fb1c82ddf"},"apache/datadog_checks/apache/config_models/shared.py":{"sha256":"6aeb47e93fb5c0a0ff0e0202bb3bb3cf1ae045eadb5749c34337df9abbf78c84"},"apache/datadog_checks/apache/config_models/validators.py":{"sha256":"0424fe17778b76e1b589b9564d0d543d1b71dba1edd6e5d71a7c528dddf68e0b"},"apache/datadog_checks/apache/data/auto_conf.yaml":{"sha256":"249eec1d3ea0a0a17a9e4359d22874e92f5444a74e36081099cfef9db2fd9858"},"apache/datadog_checks/apache/data/conf.yaml.example":{"sha256":"2f1fae6a04cb237aac5697a903adc6a8f64df4d30c49fa9cbd6d3b6c7625b792"},"apache/pyproject.toml":{"sha256":"00be25d3c078e9c7cd12b826cd912e43437c188a42f6a8ef2162676ea3e24d64"},"apache/setup.py":{"sha256":"c2bc0b795b653687f43b62d2bf7770c9c6f7e92a9511475f3a4bb354be7b8ba4"}}}}
+{"signatures":[{"keyid":"05916999737102a3cfebe7c6725d3843dbd883ed","other_headers":"04000108001d16210405916999737102a3cfebe7c6725d3843dbd883ed05026593d518","signature":"93d9521ad84a36d50dce7931af377a416e2a714b213ebd6e89b15d5d8af7a9fa5e2da5f1a9abcbdc5fb9f0fa7425b3e831edcb69e1bd7834ccc5cdf4e957f635a5f29054b7cd5573fa93dbcaaa69f851285c37c60bacf46cad38f6676cec924159697061a5c7edbfa22d24744c42739c6f72536bb0799536c235bfd9dbc07e6cb01cff326f9403003b4620552e6c487b6353d94b5738f38f0e4c12b39fba1d2c645499e77a2af7a76ea70c8dc33da812f55d4431fa5336dfad241c84255ea04afc5b158121af8751674074d23aa57d004f3004583429051eb72e4e7b26ecaaa73b4156126949ce02ed68d47786d0f5acb94837d1477b97e65c5a7781a47b780fc11de02dd443d8dfa7f7fcb98bb8ff25b48100d7475529a6ecf385c9ccc0dec0fef72ff863b62e6b5c6eac1eccd1da4bf8d83a757fe1a0d1d37a88430b27d20e1c56d5209b12209e734d259b532f2de30439d5c2e5b537ad60be3ec67f1a1c242bdb0b4c6f4dbcd745f35383fdc526a4be3fbc08e0933ae36f358297da3e31eb0ad59aad2ef92db657d3062a82f433a4b2449e8afecf1deec199bd1be5f118fc42d897050c7e0e19375346337fae85f371b84efa96a2fb4c2f8b400a0012e711bcaaf2f86c93ff32b0a979462a139a3a443532f94cc1d6256065ff5738a3bb45bf8be37307ba1d9a1d2c9053aaf2fbe9c6c29010a3bd07e71ef102fab7226347"}],"signed":{"_type":"link","byproducts":{},"command":[],"environment":{},"materials":{},"name":"tag","products":{"apache/datadog_checks/__init__.py":{"sha256":"fe73dc8f45d35205d366455edc6e8c3a8b29870d773b6f103d5261e25f757b25"},"apache/datadog_checks/apache/__about__.py":{"sha256":"1de135cef553f57095a0a4a0484e8c2586a2db4d2fb0564e540e707b38cc5749"},"apache/datadog_checks/apache/__init__.py":{"sha256":"56a94d605f3abba4996b378f5aa5508589899ab305431d2c6287142029287baa"},"apache/datadog_checks/apache/apache.py":{"sha256":"8846cc073b43bc3dc6bfb8fa61cf84326004d84cf9e32f746342e7879524d68a"},"apache/datadog_checks/apache/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"apache/datadog_checks/apache/config_models/defaults.py":{"sha256":"7f109ebae12d3cb6db2c162eb924ab4c43cc8b5f3dffec71e1a82fecdb87845b"},"apache/datadog_checks/apache/config_models/instance.py":{"sha256":"9317901f8204ea6cfddb325a1eaf93b7f4ed7820d1f8c2eaf9fe3c5fb1c82ddf"},"apache/datadog_checks/apache/config_models/shared.py":{"sha256":"6aeb47e93fb5c0a0ff0e0202bb3bb3cf1ae045eadb5749c34337df9abbf78c84"},"apache/datadog_checks/apache/config_models/validators.py":{"sha256":"0424fe17778b76e1b589b9564d0d543d1b71dba1edd6e5d71a7c528dddf68e0b"},"apache/datadog_checks/apache/data/auto_conf.yaml":{"sha256":"249eec1d3ea0a0a17a9e4359d22874e92f5444a74e36081099cfef9db2fd9858"},"apache/datadog_checks/apache/data/conf.yaml.example":{"sha256":"2f1fae6a04cb237aac5697a903adc6a8f64df4d30c49fa9cbd6d3b6c7625b792"},"apache/pyproject.toml":{"sha256":"00be25d3c078e9c7cd12b826cd912e43437c188a42f6a8ef2162676ea3e24d64"},"apache/setup.py":{"sha256":"c2bc0b795b653687f43b62d2bf7770c9c6f7e92a9511475f3a4bb354be7b8ba4"}}}}
diff --git a/datadog_checks_dev/CHANGELOG.md b/datadog_checks_dev/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!-- towncrier release notes start -->
 
+## 29.0.1 / 2024-01-02
+
+***Fixed***:
+
+* Set the Python version back to 3.9 in the templates ([#16504](https://github.com/DataDog/integrations-core/pull/16504))
+
 ## 29.0.0 / 2023-12-12
 
 ***Removed***:

diff --git a/datadog_checks_dev/changelog.d/16507.fixed b/datadog_checks_dev/changelog.d/16507.fixed
@@ -0,0 +1 @@
+Pin the `pytest-asyncio` version to 0.23.2
diff --git a/datadog_checks_dev/datadog_checks/dev/__about__.py b/datadog_checks_dev/datadog_checks/dev/__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__ = '29.0.0'
+__version__ = '29.0.1'
diff --git a/...ks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/pyproject.toml b/...ks_dev/datadog_checks/dev/tooling/templates/integration/check/{check_name}/pyproject.toml
@@ -9,7 +9,7 @@ name = "datadog-{project_name}"
 description = "The {integration_name} check"
 readme = "README.md"
 license = "BSD-3-Clause"
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 keywords = [
     "datadog",
     "datadog agent",

diff --git a/...ecks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/pyproject.toml b/...ecks_dev/datadog_checks/dev/tooling/templates/integration/jmx/{check_name}/pyproject.toml
@@ -11,7 +11,7 @@ name = "datadog-{project_name}"
 description = "The {integration_name} check"
 readme = "README.md"
 license = "BSD-3-Clause"
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 keywords = [
     "datadog",
     "datadog agent",

diff --git a/...cks_dev/datadog_checks/dev/tooling/templates/integration/logs/{check_name}/pyproject.toml b/...cks_dev/datadog_checks/dev/tooling/templates/integration/logs/{check_name}/pyproject.toml
@@ -11,7 +11,7 @@ name = "datadog-{project_name}"
 description = "The {integration_name} check"
 readme = "README.md"
 license = "BSD-3-Clause"
-requires-python = ">=3.11"
+requires-python = ">=3.9"
 keywords = [
     "datadog",
     "datadog agent",

diff --git a/datadog_checks_dev/pyproject.toml b/datadog_checks_dev/pyproject.toml
@@ -39,7 +39,7 @@ dependencies = [
     "psutil",
     "py>=1.8.2; python_version < '3.0'",  # https://github.com/ionelmc/pytest-benchmark/issues/226
     "pytest",
-    "pytest-asyncio>=0.20.3; python_version > '3.0'",
+    "pytest-asyncio==0.23.2; python_version > '3.0'",
     "pytest-benchmark[histogram]<4.0.0; python_version < '3.0'",
     "pytest-benchmark[histogram]>=4.0.0; python_version > '3.0'",
     "pytest-cov>=2.6.1",

diff --git a/ddev/CHANGELOG.md b/ddev/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 <!-- towncrier release notes start -->
 
+## 6.2.0 / 2024-01-02
+
+***Added***:
+
+* Fetch all the tags before generating the Agent changelog ([#16460](https://github.com/DataDog/integrations-core/pull/16460))
+* Add a script to generate all the metrics for a given integration ([#16472](https://github.com/DataDog/integrations-core/pull/16472))
+
+***Fixed***:
+
+* Unpin the `hatch` version ([#16427](https://github.com/DataDog/integrations-core/pull/16427))
+* Ignore `rethinkdb` when bumping the deps ([#16449](https://github.com/DataDog/integrations-core/pull/16449))
+* Override the default configuration when environment vars are provided in the `env start` command ([#16474](https://github.com/DataDog/integrations-core/pull/16474))
+* Update the CHANGELOG file for packages in the `integrations-changelog` command ([#16492](https://github.com/DataDog/integrations-core/pull/16492))
+* Bump the `datadog-checks-dev` minimum version to 29.0.1 ([#16506](https://github.com/DataDog/integrations-core/pull/16506))
+
 ## 6.1.0 / 2023-12-14
 
 ***Added***:

diff --git a/ddev/changelog.d/16427.fixed b/ddev/changelog.d/16427.fixed
diff --git a/ddev/changelog.d/16449.fixed b/ddev/changelog.d/16449.fixed
diff --git a/ddev/changelog.d/16460.added b/ddev/changelog.d/16460.added
diff --git a/ddev/changelog.d/16472.added b/ddev/changelog.d/16472.added
diff --git a/ddev/changelog.d/16474.fixed b/ddev/changelog.d/16474.fixed
diff --git a/ddev/changelog.d/16492.fixed b/ddev/changelog.d/16492.fixed
diff --git a/ddev/pyproject.toml b/ddev/pyproject.toml
@@ -29,7 +29,7 @@ dependencies = [
     "click~=8.1.6",
     "coverage",
     "datadog-api-client==2.20.0",
-    "datadog-checks-dev[cli]~=29.0",
+    "datadog-checks-dev[cli]>=29.0.1,<=30",
     "hatch>=1.8.1",
     "httpx",
     "jsonpointer",

diff --git a/tls/tests/conftest.py b/tls/tests/conftest.py
@@ -161,12 +161,18 @@ def instance_e2e():
 
 @pytest.fixture
 def instance_remote_ok_ip():
-    return {'server': '1.1.1.1', 'tls_validate_hostname': False}
+    return {'server': '1.1.1.1', 'tls_validate_hostname': False, 'days_warning': 1, 'days_critical': 1}
 
 
 @pytest.fixture
 def instance_remote_ok_udp():
-    return {'server': '1.1.1.1', 'transport': 'udp', 'tls_validate_hostname': False}
+    return {
+        'server': '1.1.1.1',
+        'transport': 'udp',
+        'tls_validate_hostname': False,
+        'days_warning': 1,
+        'days_critical': 1,
+    }
 
 
 @pytest.fixture