Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .ddqa/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ jira_statuses = [
"In Progress",
"Done",
]
github_team = "ndm-core"
github_labels = ["team/ndm-core"]
github_team = "network-device-monitoring-core"
github_labels = ["team/network-device-monitoring-core"]

[teams."Network Device Monitoring Integrations"]
jira_project = "NDINT"
Expand Down
16 changes: 8 additions & 8 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -118,20 +118,20 @@ manifest.json @DataDog/documentation @DataDog/agent-integrations
/cisco_sdwan/ @DataDog/ndm-integrations @DataDog/agent-integrations
/cisco_sdwan/*.md @DataDog/ndm-integrations @DataDog/agent-integrations @DataDog/documentation
/cisco_sdwan/manifest.json @DataDog/ndm-integrations @DataDog/agent-integrations @DataDog/documentation
/snmp/ @DataDog/ndm-core @DataDog/agent-integrations
/snmp/*.md @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
/snmp/manifest.json @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
/snmp_*/ @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
/snmp_*/*.md @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
/snmp_*/manifest.json @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
/snmp/ @DataDog/network-device-monitoring-core @DataDog/agent-integrations
/snmp/*.md @DataDog/network-device-monitoring-core @DataDog/agent-integrations @DataDog/documentation
/snmp/manifest.json @DataDog/network-device-monitoring-core @DataDog/agent-integrations @DataDog/documentation
/snmp_*/ @DataDog/network-device-monitoring-core @DataDog/agent-integrations @DataDog/documentation
/snmp_*/*.md @DataDog/network-device-monitoring-core @DataDog/agent-integrations @DataDog/documentation
/snmp_*/manifest.json @DataDog/network-device-monitoring-core @DataDog/agent-integrations @DataDog/documentation
/network_path/ @DataDog/network-path @DataDog/Networks @DataDog/agent-integrations
/network_path/*.md @DataDog/network-path @DataDog/Networks @DataDog/agent-integrations @DataDog/documentation
/network_path/assets @DataDog/network-path @DataDog/Networks @DataDog/agent-integrations @DataDog/documentation
/network_path/manifest.json @DataDog/network-path @DataDog/Networks @DataDog/agent-integrations @DataDog/documentation
/versa/ @DataDog/ndm-integrations @DataDog/agent-integrations @DataDog/documentation

/datadog_checks_dev/datadog_checks/dev/tooling/commands/meta/snmp/ @DataDog/ndm-core @DataDog/agent-integrations
/docs/developer/tutorials/snmp/ @DataDog/ndm-core @DataDog/agent-integrations
/datadog_checks_dev/datadog_checks/dev/tooling/commands/meta/snmp/ @DataDog/network-device-monitoring-core @DataDog/agent-integrations
/docs/developer/tutorials/snmp/ @DataDog/network-device-monitoring-core @DataDog/agent-integrations

# System checks
/disk/ @DataDog/agent-integrations @DataDog/windows-products
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@0ec47d036c68ae0cf94c629009b1029407111281
uses: github/codeql-action/init@babab88e549fbc29e9b0058b5d63e2817a135c17
with:
languages: ${{ matrix.language }}
config-file: .github/codeql_config.yml
Expand All @@ -41,7 +41,7 @@ jobs:
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- name: Autobuild
uses: github/codeql-action/autobuild@0ec47d036c68ae0cf94c629009b1029407111281
uses: github/codeql-action/autobuild@babab88e549fbc29e9b0058b5d63e2817a135c17

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@0ec47d036c68ae0cf94c629009b1029407111281
uses: github/codeql-action/analyze@babab88e549fbc29e9b0058b5d63e2817a135c17
2 changes: 1 addition & 1 deletion .github/workflows/datadog-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Check code meets quality and security standards
id: datadog-static-analysis
uses: DataDog/datadog-static-analyzer-github-action@447086f347f225f777e409c8f2dfbd0e3b1a452d # v3.0.0
uses: DataDog/datadog-static-analyzer-github-action@c0e10d1c37e5b306b85e5bcf29b06bb233a71dc8 # v3.0.0
with:
dd_api_key: ${{ secrets.DD_API_KEY }}
dd_app_key: ${{ secrets.DD_STATIC_ANALYSIS_APP_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-hash-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@7dee1b0c1557f278e5c7dc244927139d78c0e22a # v47.0.4
uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 # v47.0.5
with:
files: .in-toto/*.link

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-agent-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
agent-image:
required: false
description: Agent 7 image
default: "datadog/agent:7-rc"
default: "registry.datadoghq.com/agent:7-rc"
type: string
test-py2:
required: false
Expand All @@ -30,7 +30,7 @@ on:
agent-image-py2:
required: false
description: Agent 6 image
default: "datadog/agent:6-rc"
default: "registry.datadoghq.com/agent:6-rc"
type: string
platform:
required: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-agent-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ on:
agent-image:
required: false
description: Agent 7 image
default: "datadog/agent:7-rc"
default: "registry.datadoghq.com/agent:7-rc"
type: string
agent-image-windows:
required: false
description: Agent 7 image on Windows
default: "datadog/agent:7-rc-servercore"
default: "registry.datadoghq.com/agent:7-rc-servercore"
type: string
test-py2:
required: false
Expand All @@ -26,7 +26,7 @@ on:
agent-image-py2:
required: false
description: Agent 6 image
default: "datadog/agent:6-rc"
default: "registry.datadoghq.com/agent:6-rc"
type: string
agent-image-windows-py2:
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ on:
agent-image:
required: false
description: Agent 7 image
default: "datadog/agent:7-rc"
default: "registry.datadoghq.com/agent:7-rc"
type: string
agent-image-windows:
required: false
description: Agent 7 image on Windows
default: "datadog/agent:7-rc-servercore"
default: "registry.datadoghq.com/agent:7-rc-servercore"
type: string
test-py2:
required: false
Expand All @@ -26,7 +26,7 @@ on:
agent-image-py2:
required: false
description: Agent 6 image
default: "datadog/agent:6-rc"
default: "registry.datadoghq.com/agent:6-rc"
type: string
agent-image-windows-py2:
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-all-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ on:
type: boolean
agent-image:
required: false
default: "datadog/agent-dev:master-py3"
default: "registry.datadoghq.com/agent-dev:master-py3"
type: string
agent-image-py2:
required: false
default: "datadog/agent-dev:master-py2"
type: string
agent-image-windows:
required: false
default: "datadog/agent-dev:master-py3-win-servercore"
default: "registry.datadoghq.com/agent:7-rc-servercore"
type: string
agent-image-windows-py2:
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ on:
type: boolean
agent-image:
required: false
default: "datadog/agent-dev:master-py3"
default: "registry.datadoghq.com/agent-dev:master-py3"
type: string
agent-image-py2:
required: false
default: "datadog/agent-dev:master-py2"
default: "registry.datadoghq.com/agent:6-rc"
type: string
agent-image-windows:
required: false
default: "datadog/agent-dev:master-py3-win-servercore"
default: "registry.datadoghq.com/agent:7-rc-servercore"
type: string
agent-image-windows-py2:
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-fips-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ jobs:

- name: Run E2E tests with FIPS disabled
env:
DDEV_E2E_AGENT: "${{ inputs.agent-image || 'datadog/agent-dev:master-py3' }}"
DDEV_E2E_AGENT: "${{ inputs.agent-image || 'registry.datadoghq.com/agent-dev:master-py3' }}"
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
run: |
ddev env test --base --new-env --junit ${{ inputs.target || 'tls' }} -- all -m "fips_off"

- name: Run E2E tests with FIPS enabled
env:
DDEV_E2E_AGENT: "${{ inputs.agent-image-fips || 'datadog/agent-dev:master-fips' }}"
DDEV_E2E_AGENT: "${{ inputs.agent-image-fips || 'registry.datadoghq.com/agent-dev:master-fips' }}"
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
run: |
ddev env test --base --new-env --junit ${{ inputs.target || 'tls' }} -- all -k "fips_on"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ on:
type: boolean
agent-image:
required: false
default: "datadog/agent-dev:master-py3"
default: "registry.datadoghq.com/agent-dev:master-py3"
type: string
agent-image-py2:
required: false
default: "datadog/agent-dev:master-py2"
type: string
agent-image-windows:
required: false
default: "datadog/agent-dev:master-py3-win-servercore"
default: "registry.datadoghq.com/agent:7-rc-servercore"
type: string
agent-image-windows-py2:
required: false
Expand Down
39 changes: 36 additions & 3 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ jobs:
repositories: integrations-core
- name: Update dependencies
run: |-
ddev dep updates --sync
ddev dep updates --sync --report /tmp/dep-report.md --report-type markdown
- name: Read dependency report
id: dep-summary
run: |-
echo "summary<<EOF" >> "$GITHUB_OUTPUT"
cat /tmp/dep-report.md >> "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
- name: Update licenses
run: |-
ddev validate licenses --sync
Expand All @@ -62,11 +68,11 @@ jobs:
### What does this PR do?
Update the dependencies

${{ steps.dep-summary.outputs.summary }}

This PR was automatically generated by the following workflow:
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

**THE CHANGELOG FILES OFTEN HAVE THE WRONG PR NUMBER. MAKE SURE TO CHECK THEM!**

### Review checklist (to be filled by reviewers)

- [ ] Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
Expand All @@ -79,3 +85,30 @@ jobs:
base: master
labels: bot,qa/skip-qa
draft: false
- name: Fix changelog PR numbers
if: steps.cpr.outputs.pull-request-number != ''
env:
GITHUB_TOKEN: ${{ steps.token-generator.outputs.token }}
run: |-
actual_pr="${{ steps.cpr.outputs.pull-request-number }}"
branch="${{ steps.cpr.outputs.pull-request-branch }}"

# Resolve the actual base branch from the PR (avoids hardcoding 'master')
base_branch=$(gh pr view "$actual_pr" --json baseRefName -q '.baseRefName')

git fetch origin "$branch" "$base_branch"
git checkout "$branch"

git diff "origin/$base_branch"...HEAD --name-only --diff-filter=A | grep 'changelog\.d/' | while read -r file; do
ext="${file##*.}"
dir=$(dirname "$file")
git mv "$file" "$dir/$actual_pr.$ext" 2>/dev/null || true
done

git diff --cached --quiet || (
git config user.email "github-actions[bot]@users.noreply.github.com"
git config user.name "github-actions[bot]"
git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git"
git commit -m "Fix changelog PR numbers"
git push origin "$branch"
)
2 changes: 1 addition & 1 deletion .github/workflows/validate-skip-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: Get files changed
id: changed_files
uses: tj-actions/changed-files@7dee1b0c1557f278e5c7dc244927139d78c0e22a # v47.0.4
uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 # v47.0.5
with:
files: |
**/datadog_checks/**
Expand Down
2 changes: 1 addition & 1 deletion LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ lazy-loader,PyPI,BSD-3-Clause,"Copyright (c) 2022--2023, Scientific Python proje
ldap3,PyPI,LGPL-3.0-only,Copyright 2013 - 2020 Giovanni Cannata
lxml,PyPI,BSD-3-Clause,Copyright (c) 2004 Infrae. All rights reserved.
lz4,PyPI,BSD-3-Clause,"Copyright (c) 2012-2013, Steeve Morin"
mmh3,PyPI,CC0-1.0,Copyright (c) 2011-2025 Hajime Senuma
mmh3,PyPI,CC0-1.0,Copyright (c) 2011-2026 Hajime Senuma
oauthlib,PyPI,BSD-3-Clause,Copyright (c) The OAuthlib Community
openstacksdk,PyPI,Apache-2.0,Copyright OpenStack <openstack-discuss@lists.openstack.org>
orjson,PyPI,Apache-2.0,
Expand Down
22 changes: 11 additions & 11 deletions agent_requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@ aws-requests-auth==0.4.3
azure-identity==1.25.2
beautifulsoup4==4.14.3
binary==1.0.2
boto3==1.42.54
botocore==1.42.54
cachetools==7.0.1
clickhouse-connect==0.11.0
boto3==1.42.63
botocore==1.42.63
cachetools==7.0.4
clickhouse-connect==0.13.0
cm-client==45.0.4
confluent-kafka==2.13.0
cryptography==46.0.5
ddtrace==3.19.5
ddtrace==4.5.1
dnspython==2.8.0
fastavro==1.12.1
foundationdb==6.3.25
hazelcast-python-client==5.6.0
in-toto==2.0.0
jellyfish==1.2.1
kubernetes==35.0.0
lazy-loader==0.4
lazy-loader==0.5
ldap3==2.9.1
lxml==6.0.1
lz4==4.4.5
mmh3==5.2.0
mmh3==5.2.1
oauthlib==3.3.1
openstacksdk==4.10.0
orjson==3.11.7
packaging==26.0
paramiko==4.0.0
prometheus-client==0.24.1
protobuf==6.33.5
protobuf==7.34.0
psutil==6.0.0
psycopg[c,pool]==3.3.3
pyasn1==0.4.8
Expand All @@ -50,7 +50,7 @@ python3-gearman==0.1.0; sys_platform != 'win32'
pyvmomi==8.0.3.0.1
pywin32==311; sys_platform == 'win32'
pyyaml==6.0.3
redis==7.2.0
redis==7.3.0
requests-kerberos==0.15.0
requests-ntlm==1.3.0
requests-oauthlib==2.0.0
Expand All @@ -62,9 +62,9 @@ securesystemslib[crypto,pynacl]==0.28.0
semver==3.0.4
service-identity[idna]==24.2.0
simplejson==3.20.2
snowflake-connector-python==4.0.0
snowflake-connector-python==4.3.0
supervisor==4.3.0
tuf==4.0.0
urllib3==2.6.3
vertica-python==1.4.0
wrapt==2.1.1
wrapt==2.1.2
9 changes: 9 additions & 0 deletions airflow/assets/dataflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
provides:
- id: airflow-metrics
always_on: true
data_type: metrics
direction: inbound
- id: airflow-logs
always_on: false
data_type: logs
direction: inbound
1 change: 1 addition & 0 deletions amazon_msk/changelog.d/22837.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion amazon_msk/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"boto3==1.42.54",
"boto3==1.42.63",
]

[project.urls]
Expand Down
1 change: 1 addition & 0 deletions clickhouse/changelog.d/22837.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
2 changes: 1 addition & 1 deletion clickhouse/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ license = "BSD-3-Clause"

[project.optional-dependencies]
deps = [
"clickhouse-connect==0.11.0",
"clickhouse-connect==0.13.0",
"lz4==4.4.5",
]

Expand Down
1 change: 1 addition & 0 deletions datadog_checks_base/changelog.d/22837.added
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update dependencies
Loading
Loading