Skip to content

[pull] master from DataDog:master #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Dec 19, 2025
Merged

[pull] master from DataDog:master #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c918317
[Release] Bumped ddev version to 14.1.0 (#22175)
iliakur Dec 19, 2025
4390a15
Bump urllib3 to 2.6.2 and ensure pr-all runs on dependency changes (#…
AAraKKe Dec 19, 2025
134983a
ci fix (#22182)
steveny91 Dec 19, 2025
9a91565
[Release] Bumped kafka_consumer version to 6.10.1 (#22186)
lucia-sb Dec 19, 2025
eebd0e7
Point to correct Python version when running Update and Resolve depen…
Kyle-Neale Dec 19, 2025
4e1d2d4
Change the changelog type (#22194)
AAraKKe Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .builders/images/runner_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
python-dotenv==1.0.0
urllib3==2.6.0
urllib3==2.6.2
auditwheel==6.0.0; sys_platform == 'linux'
delvewheel==1.5.2; sys_platform == 'win32'
delocate==0.13.0; sys_platform == 'darwin'
Expand Down
4 changes: 2 additions & 2 deletions .builders/tests/test_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,9 @@ def test_lockfile_generation(tmp_path, setup_targets_dir):
lock_files = list(fake_resolved_dir.glob("*.txt"))
assert lock_files, "No lock files generated"
lockfile_map = {lock_file.name: lock_file.read_text().strip() for lock_file in lock_files}
linux_x86_64_lockfile = lockfile_map["linux-x86_64_3.12.txt"]
linux_x86_64_lockfile = lockfile_map[f"linux-x86_64_{upload.CURRENT_PYTHON_VERSION}.txt"]
assert linux_x86_64_lockfile == f'existing @ https://agent-int-packages.datadoghq.com/built/existing/existing-1.1.1-{frozen_timestamp}-cp312-cp312-manylinux2010_x86_64.whl#sha256=built-hash'
linux_aarch64_lockfile = lockfile_map["linux-aarch64_3.12.txt"]
linux_aarch64_lockfile = lockfile_map[f"linux-aarch64_{upload.CURRENT_PYTHON_VERSION}.txt"]
assert linux_aarch64_lockfile == f'existing @ https://agent-int-packages.datadoghq.com/built/existing/existing-1.1.1-{frozen_timestamp}-cp312-cp312-manylinux2010_aarch64.whl#sha256=built-hash'
assert len(lock_files) == 2

Expand Down
2 changes: 1 addition & 1 deletion .builders/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
CACHE_CONTROL = 'public, max-age=15'
VALID_PROJECT_NAME = re.compile(r'^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$', re.IGNORECASE)
UNNORMALIZED_PROJECT_NAME_CHARS = re.compile(r'[-_.]+')
CURRENT_PYTHON_VERSION = "3.12"
CURRENT_PYTHON_VERSION = "3.13"

def is_valid_project_name(project_name: str) -> bool:
# https://peps.python.org/pep-0508/#names
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/pr-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ on:
pull_request:
paths:
- datadog_checks_base/datadog_checks/**
- datadog_checks_base/pyproject.toml
- datadog_checks_dev/datadog_checks/dev/*.py
- datadog_checks_dev/pyproject.toml
- ddev/src/**
- ddev/pyproject.toml
- "!agent_requirements.in"

concurrency:
Expand Down
1 change: 1 addition & 0 deletions .in-toto/tag.4604c9db.link
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"signatures":[{"keyid":"4604c9dba0d5cd4efd0c2ef07148ea09cd188aa8","other_headers":"04000108001d1621044604c9dba0d5cd4efd0c2ef07148ea09cd188aa8050269452a44","signature":"7108ce180e5664e4bc080e729d0824bfabcb4d0c4b1b9e8151a540eb747b0e183d6abbda315e1b1306927be86138aac4a4ca6774201295f13e20fcf11e2933962c2ece1acaabd1ce749e1188192c8eecb76ab454b879ee67d1f69586895a1894d8f51256618ecec2566537fd1f1034655c40dd8217b3e5a5b02378e27731e5db6b1c529981d6ad7fb7c0c2e70e592f5de35eb0faf2e54a3c1dea0d9cda642ab716557b3e7613079897cf12354b60ddbd60891e6e9b3120a444e2ece476b310ba7b24c45ced213001ca3add1906ca6e5b2b8feb95b6a00693bcbf7b051d15c4812e3cf99f5255f1b471c6531f1576bb4870d32dc81c326450957a4d561ba55c3e40dc0d9f9c98a830a65602694157eadc0f2a27e2a04907d6db3731005ef8e09a130f4a790a1815137400bf8992c140c5a0c32b07fc04216ef16b03246d3289b63ddca99d2394a0e2569048e8fce86ff946865f801bbe095a8f55d90df94364d5e954cd57c985d5d0f3265be4e32d9bc83427fbb43dabe12619226e15813b1884ad1d53bab84b7c98e519ef9757ab943f3d6ae5bf659ba328854fd0ce9f1c3fd27dd08cc74f59798bbb64ce30b9f054e7ea6e719b61d0f343e8d4f1cc44caf31306409d9786682422b4f9a5fa4fa1a41c53506a4f16d5176011e099a1242f5e1b3fca0f8032d55dc372d5d1cb04581d9ee3cb5aa0af87eca255bc4e4e5bdceab5"}],"signed":{"_type":"link","byproducts":{},"command":[],"environment":{},"materials":{},"name":"tag","products":{"kafka_consumer/datadog_checks/kafka_consumer/__about__.py":{"sha256":"2cb43a7f435b42b0f9336af223e313561877f3210eaa3a88781a0f7095ca3b3c"},"kafka_consumer/datadog_checks/kafka_consumer/__init__.py":{"sha256":"5d5a2f991c64a95c96c8713f3179f9d0944682b6bed037b8c34d9f85463ca57c"},"kafka_consumer/datadog_checks/kafka_consumer/client.py":{"sha256":"527d368fe060cbb2137410fe12b1d13d4e9796b0fb0f0efbd754c8f14b374d98"},"kafka_consumer/datadog_checks/kafka_consumer/cluster_metadata.py":{"sha256":"3cee7d41abc9243b55d4277c39da31cdb82c89d938e58aa392b5ce7b1c825433"},"kafka_consumer/datadog_checks/kafka_consumer/config.py":{"sha256":"0f957ea070289b07b4b6f9d788860321910e935b68faf5059277a7987f7c9c5f"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/__init__.py":{"sha256":"c9cf5c66894430e7edbb00d00613b58ccfd38360f2fe490a23c17cf71ed294dc"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/defaults.py":{"sha256":"911cea6d1917c9a8034c38f4faf4a08cf25ad68fa3031982979c40c69aa53c06"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/instance.py":{"sha256":"9c3e30e9174fbc876a5216eace0e5f73f4a41dedcd1db4fbfd67b723718c6414"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/shared.py":{"sha256":"357206e383a5d7f8113f6e81b5ff0cf403c8a8c7904464690919f8bfe6626956"},"kafka_consumer/datadog_checks/kafka_consumer/config_models/validators.py":{"sha256":"0424fe17778b76e1b589b9564d0d543d1b71dba1edd6e5d71a7c528dddf68e0b"},"kafka_consumer/datadog_checks/kafka_consumer/constants.py":{"sha256":"21a1edada5cb667cf57c990b91c43147a60ad8c10b1b49bd3c56963427445675"},"kafka_consumer/datadog_checks/kafka_consumer/data/conf.yaml.example":{"sha256":"8f84ed2da42065e4f3ca4b143e517df2f2350e993d67b63b7763775e624b165c"},"kafka_consumer/datadog_checks/kafka_consumer/kafka_consumer.py":{"sha256":"48d70a2d88f6ac9b059cd49683cd4048193f3fbfcbbe43329d609a3929c07930"},"kafka_consumer/pyproject.toml":{"sha256":"1971b2ce7abe7a59ae1b8f2d1271d17e359b802d7c3645e2dd8a78ce60d7f14d"}}}}
2 changes: 1 addition & 1 deletion agent_requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ simplejson==3.20.1
snowflake-connector-python==3.17.2
supervisor==4.3.0
tuf==4.0.0
urllib3==2.6.0
urllib3==2.6.2
vertica-python==1.4.0
wrapt==1.17.3
1 change: 1 addition & 0 deletions datadog_checks_base/changelog.d/22172.security
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump urllib3 to version 2.6.2
2 changes: 1 addition & 1 deletion datadog_checks_base/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ deps = [
"requests-unixsocket2==1.0.0",
"requests==2.32.5",
"simplejson==3.20.1",
"urllib3==2.6.0",
"urllib3==2.6.2",
"wrapt==1.17.3",
]
http = [
Expand Down
10 changes: 10 additions & 0 deletions ddev/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

<!-- towncrier release notes start -->

## 14.1.0 / 2025-12-18

***Added***:

* Bump datatog_checks_dev to get its latest features. ([#22171](https://github.com/DataDog/integrations-core/pull/22171))

***Fixed***:

* Ensure correct commit attribution when sending size metrics by requiring an explicit commit in the ddev size status command. ([#21993](https://github.com/DataDog/integrations-core/pull/21993))

## 14.0.2 / 2025-11-21

***Fixed***:
Expand Down
1 change: 0 additions & 1 deletion ddev/changelog.d/21993.fixed
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ddev/changelog.d/22171.added
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions kafka_consumer/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

<!-- towncrier release notes start -->

## 6.10.1 / 2025-12-19

***Fixed***:

* Support Protobuf messages with schema registry ([#22020](https://github.com/DataDog/integrations-core/pull/22020))

## 6.10.0 / 2025-11-26

***Added***:
Expand Down
1 change: 0 additions & 1 deletion kafka_consumer/changelog.d/22020.fixed
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion kafka_consumer/datadog_checks/kafka_consumer/__about__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# All rights reserved
# Licensed under a 3-clause BSD style license (see LICENSE)

__version__ = "6.10.0"
__version__ = "6.10.1"
2 changes: 1 addition & 1 deletion requirements-agent-release.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ datadog-ivanti-connect-secure==1.2.0
datadog-jboss-wildfly==3.3.0
datadog-journald==3.2.0
datadog-juniper-srx-firewall==1.2.0
datadog-kafka-consumer==6.10.0
datadog-kafka-consumer==6.10.1
datadog-kafka==4.3.0
datadog-karpenter==3.2.0
datadog-keda==2.2.0
Expand Down
3 changes: 0 additions & 3 deletions teleport/tests/docker/teleport/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ services:
image: public.ecr.aws/gravitational/teleport-distroless:17.2
ports:
- 3000:3000
- 3080:3080
- 3025:3025
- 443:443
volumes:
- ./etc/teleport:/etc/teleport
command: --diag-addr=0.0.0.0:3000
Expand Down
Loading