Skip to content

Commit 1440dbd

Browse files
mauneelsorathia-crestmauneelsorathia-crest
authored
Merge branch 'master' into microsoft-dns-assets-v1.0.0
2 parents 8526bd3 + 764c1b1 commit 1440dbd

File tree

815 files changed

+89695
-2970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

815 files changed

+89695
-2970
lines changed

‎.cursor/rules/testing.mdc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ description:
33
globs: **/*.py
44
alwaysApply: false
55
---
6-
Run unit and integration tests with `ddev --no-interactive test <INTEGRATION>`. For example, for the pbouncer integration, run `ddev --no-interactive test pgbouncer`.
7-
Run E2E tests with `ddev ddev --no-interactive env test <INTEGRATION> --dev`. For example, for the pbouncer integration, run `ddev ddev --no-interactive env test pgbouncer --dev`.
6+
Run unit and integration tests with `ddev --no-interactive test <INTEGRATION>`. For example, for the pgbouncer integration, run `ddev --no-interactive test pgbouncer`.
7+
Run E2E tests with `ddev ddev --no-interactive env test <INTEGRATION> --dev`. For example, for the pgbouncer integration, run `ddev ddev --no-interactive env test pgbouncer --dev`.

‎.ddev/ci/scripts/ddev/linux/55_fetch_master.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -ex
44

5-
# Only required on pull requests
6-
if [[ $GITHUB_BASE_REF ]]; then
5+
# Only required on non-master branches
6+
if [[ "$GITHUB_REF_NAME" != "master" ]]; then
77
git fetch origin master:master
88
fi
99

‎.ddev/ci/scripts/ddev/windows/55_fetch_master.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
:: Only required on pull requests
2-
if defined GITHUB_BASE_REF (
1+
:: Only required on non-master branches
2+
if "%GITHUB_REF_NAME%" NEQ "master" (
33
git fetch origin master:master
44
)

‎.ddev/ci/scripts/singlestore/linux/55_set_license_secret.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.ddev/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ exclude = [
159159
# https://github.com/DataDog/integrations-core/pull/15859
160160
'psycopg2-binary',
161161
'psutil',
162-
'pymongo[srv]', # Upgrade from 4.8.0 to 4.10.1 causes "AttributeError: module 'pymongo' has no attribute 'mongo_client'"
162+
'pymongo', # Upgrade from 4.8.0 to 4.10.1 causes "AttributeError: module 'pymongo' has no attribute 'mongo_client'"
163163
]
164164

165165
# Dependencies for the downloader that are security-related and should be updated separately from the others

‎.deps/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"sha256": "23d9ededc2704b2d40790013366de20943bfb0084b009f950c7e06efb9a8ec1c"
2+
"sha256": "8a36510d8c2224eecedc580568217b394a0e0931e2d7f20b21a8d1ba80959e99"
33
}

‎.deps/resolved/linux-aarch64_3.12.txt

Lines changed: 16 additions & 15 deletions
Large diffs are not rendered by default.

‎.deps/resolved/linux-x86_64_3.12.txt

Lines changed: 22 additions & 21 deletions
Large diffs are not rendered by default.

‎.deps/resolved/macos-x86_64_3.12.txt

Lines changed: 18 additions & 17 deletions
Large diffs are not rendered by default.

‎.deps/resolved/windows-x86_64_3.12.txt

Lines changed: 18 additions & 17 deletions
Large diffs are not rendered by default.

‎.github/CODEOWNERS

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/docs/ @DataDog/documentation @DataDog/agent-integrations
1010
*.md @DataDog/documentation @DataDog/agent-integrations
1111
conf.yaml.example @DataDog/documentation @DataDog/agent-integrations
12-
conf.yaml.default @DataDog/documentation @DataDog/agent-integrations @DataDog/agent-metrics-logs
12+
conf.yaml.default @DataDog/documentation @DataDog/agent-integrations
1313
auto_conf.yaml @DataDog/documentation @DataDog/agent-integrations @DataDog/container-integrations
1414
manifest.json @DataDog/documentation @DataDog/agent-integrations
1515
**/assets @DataDog/documentation @DataDog/agent-integrations
@@ -138,11 +138,6 @@ manifest.json @DataDog/documentation @DataDog/agent-integrations
138138
/otel/*.md @DataDog/opentelemetry @DataDog/agent-integrations @DataDog/documentation
139139
/otel/manifest.json @DataDog/opentelemetry @DataDog/agent-integrations @DataDog/documentation
140140

141-
# Agent Platform
142-
/nvidia_jetson/ @DataDog/agent-platform @DataDog/agent-integrations
143-
/nvidia_jetson/*.md @DataDog/agent-platform @DataDog/agent-integrations @DataDog/documentation
144-
/nvidia_jetson/manifest.json @DataDog/agent-platform @DataDog/agent-integrations @DataDog/documentation
145-
146141
# Database monitoring
147142
**/base/utils/db/utils.py @DataDog/agent-integrations @DataDog/database-monitoring-agent
148143
datadog_checks_base/tests/**/test_util.py @DataDog/agent-integrations @DataDog/database-monitoring-agent
@@ -233,6 +228,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
233228
/brevo/manifest.json @DataDog/saas-integrations @DataDog/documentation
234229
/brevo/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
235230

231+
/checkpoint_harmony_email_and_collaboration/ @DataDog/saas-integrations
232+
/checkpoint_harmony_email_and_collaboration/*.md @DataDog/saas-integrations @DataDog/documentation
233+
/checkpoint_harmony_email_and_collaboration/manifest.json @DataDog/saas-integrations @DataDog/documentation
234+
/checkpoint_harmony_email_and_collaboration/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
235+
236236
/cisco_umbrella_dns/ @DataDog/saas-integrations
237237
/cisco_umbrella_dns/*.md @DataDog/saas-integrations @DataDog/documentation
238238
/cisco_umbrella_dns/manifest.json @DataDog/saas-integrations @DataDog/documentation
@@ -306,6 +306,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
306306
/microsoft_dns/manifest.json @DataDog/agent-integrations @DataDog/documentation
307307
/microsoft_dns/assets/logs/ @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
308308

309+
/microsoft_sysmon/ @DataDog/agent-integrations
310+
/microsoft_sysmon/*.md @DataDog/agent-integrations @DataDog/documentation
311+
/microsoft_sysmon/manifest.json @DataDog/agent-integrations @DataDog/documentation
312+
/microsoft_sysmon/assets/logs/ @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
313+
309314
/mimecast/ @DataDog/saas-integrations
310315
/mimecast/*.md @DataDog/saas-integrations @DataDog/documentation
311316
/mimecast/manifest.json @DataDog/saas-integrations @DataDog/documentation
@@ -469,6 +474,11 @@ plaid/assets/logs/ @DataDog/saa
469474
/streamnative/manifest.json @DataDog/saas-integrations @DataDog/documentation
470475
/streamnative/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
471476

477+
/servicenow_performance/ @DataDog/saas-integrations
478+
/servicenow_performance/*.md @DataDog/saas-integrations @DataDog/documentation
479+
/servicenow_performance/manifest.json @DataDog/saas-integrations @DataDog/documentation
480+
/servicenow_performance/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
481+
472482
/silverstripe_cms/ @DataDog/agent-integrations
473483
/silverstripe_cms/*.md @DataDog/agent-integrations @DataDog/documentation
474484
/silverstripe_cms/manifest.json @DataDog/agent-integrations @DataDog/documentation
@@ -513,14 +523,19 @@ plaid/assets/logs/ @DataDog/saa
513523
/gpu/*.md @DataDog/ebpf-platform @DataDog/documentation
514524
/gpu/manifest.json @DataDog/ebpf-platform @DataDog/agent-integrations @DataDog/documentation
515525

526+
/openvpn/ @DataDog/agent-integrations
527+
/openvpn/*.md @DataDog/agent-integrations @DataDog/documentation
528+
/openvpn/manifest.json @DataDog/agent-integrations @DataDog/documentation
529+
/openvpn/assets/logs/ @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
530+
516531
# To keep Security up-to-date with changes to the signing tool.
517532
/datadog_checks_dev/datadog_checks/dev/tooling/signing.py @DataDog/agent-integrations
518533
# As well as the secure downloader.
519534
/datadog_checks_downloader/ @DataDog/agent-integrations
520535
docs/developer/process/integration-release.md @DataDog/agent-integrations
521536
# As well as the pipelines.
522537
/.github/workflows/ @DataDog/agent-integrations
523-
/.github/workflows/build-deps.yml @DataDog/agent-delivery
538+
/.github/workflows/resolve-build-deps.yml @DataDog/agent-delivery
524539
/.gitlab-ci.yml @DataDog/agent-integrations
525540
/.github/CODEOWNERS @DataDog/agent-integrations @DataDog/saas-integrations
526541
/.github/workflows/config/labeler.yml @DataDog/agent-integrations @DataDog/saas-integrations

‎.github/workflows/backport-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id: token-generator
2525
with:
2626
app-id: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
27-
private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
27+
private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}
2828
repositories: integrations-core
2929
- uses: tibdex/backport@v2
3030
with:

‎.github/workflows/build-ddev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ jobs:
604604
with:
605605
skip-existing: true
606606
user: __token__
607-
password: ${{ secrets.PYPI_TOKEN_DDEV }}
607+
password: ${{ secrets.PYPI_TOKEN_DDEV_2 }}
608608

609609
- name: Add assets to current release
610610
uses: softprops/action-gh-release@v2

‎.github/workflows/config/labeler.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ integration/ceph:
110110
- ceph/**/*
111111
integration/cert_manager:
112112
- cert_manager/**/*
113+
integration/checkpoint_harmony_email_and_collaboration:
114+
- checkpoint_harmony_email_and_collaboration/**/*
113115
integration/checkpoint_quantum_firewall:
114116
- checkpoint_quantum_firewall/**/*
115117
integration/cilium:
@@ -174,6 +176,8 @@ integration/dcgm:
174176
- dcgm/**/*
175177
integration/delinea_privilege_manager:
176178
- delinea_privilege_manager/**/*
179+
integration/delinea_secret_server:
180+
- delinea_secret_server/**/*
177181
integration/directory:
178182
- directory/**/*
179183
integration/disk:
@@ -312,6 +316,8 @@ integration/jmeter:
312316
- jmeter/**/*
313317
integration/journald:
314318
- journald/**/*
319+
integration/juniper_srx_firewall:
320+
- juniper_srx_firewall/**/*
315321
integration/kafka:
316322
- kafka/**/*
317323
integration/kafka_consumer:
@@ -390,6 +396,8 @@ integration/metabase:
390396
- metabase/**/*
391397
integration/microsoft_dns:
392398
- microsoft_dns/**/*
399+
integration/microsoft_sysmon:
400+
- microsoft_sysmon/**/*
393401
integration/milvus:
394402
- milvus/**/*
395403
integration/mimecast:
@@ -440,6 +448,8 @@ integration/openstack:
440448
- openstack/**/*
441449
integration/openstack_controller:
442450
- openstack_controller/**/*
451+
integration/openvpn:
452+
- openvpn/**/*
443453
integration/oracle:
444454
- oracle/**/*
445455
integration/orca_security:

‎.github/workflows/datadog-static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
id: datadog-static-analysis
1414
uses: DataDog/datadog-static-analyzer-github-action@v1
1515
with:
16-
dd_api_key: ${{ secrets.DD_STATIC_ANALYSIS_API_KEY }}
16+
dd_api_key: ${{ secrets.DD_API_KEY }}
1717
dd_app_key: ${{ secrets.DD_STATIC_ANALYSIS_APP_KEY }}
1818
dd_service: integration-core
1919
dd_env: ci

‎.github/workflows/flaky-tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
pytest-args: '-m flaky'
3030
secrets: inherit
3131

32+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
33+
permissions:
34+
id-token: write
35+
3236
publish-test-results:
3337
needs:
3438
- test

‎.github/workflows/labeler-community.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
uses: ./.github/workflows/labeler-reusable.yml
2121
secrets:
2222
app-id: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}"
23-
private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}"
23+
private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}"

‎.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
uses: ./.github/workflows/labeler-reusable.yml
1919
secrets:
2020
app-id: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}"
21-
private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}"
21+
private-key: "${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY_2 }}"

‎.github/workflows/master.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ jobs:
2828
pytest-args: '-m "not flaky"'
2929
secrets: inherit
3030

31+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
32+
permissions:
33+
id-token: write
34+
3135
publish-test-results:
3236

3337
needs:

‎.github/workflows/nightly-base-package.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
jobs:
1414
test:
1515
uses: ./.github/workflows/test-all.yml
16+
17+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
18+
permissions:
19+
id-token: write
20+
1621
with:
1722
repo: core
1823

‎.github/workflows/pr-all.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ concurrency:
1717
jobs:
1818
test:
1919
uses: ./.github/workflows/test-all.yml
20+
21+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
22+
permissions:
23+
id-token: write
24+
2025
with:
2126
repo: core
2227

‎.github/workflows/pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ jobs:
2222
with:
2323
repo: core
2424
secrets: inherit
25+
26+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
27+
permissions:
28+
id-token: write

‎.github/workflows/release-base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
run: ddev release upload -s datadog_checks_base
3535
env:
3636
TWINE_USERNAME: __token__
37-
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN_BASE }}
37+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN_BASE_2 }}

‎.github/workflows/release-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
run: ddev release upload -s datadog_checks_dev
3535
env:
3636
TWINE_USERNAME: __token__
37-
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN_DEV }}
37+
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN_DEV_2 }}

‎.github/workflows/resolve-build-deps.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77
- master
88
- 7.*.*
99
paths:
10-
- .github/workflows/build-deps.yml
10+
- .github/workflows/resolve-build-deps.yml
1111
- .builders/**
1212
- agent_requirements.in
1313
push:
1414
branches:
1515
- master
1616
- 7.*.*
1717
paths:
18-
- .github/workflows/build-deps.yml
18+
- .github/workflows/resolve-build-deps.yml
1919
- .builders/**
2020
- agent_requirements.in
2121

@@ -213,7 +213,7 @@ jobs:
213213
with:
214214
path: |
215215
~/builder_root
216-
key: macos-deps-builder-root-cache-${{ hashFiles('./.builders/images/macos/*', './.builders/images/*', './.builders/deps/*', './.builders/build.py', './.github/workflows/build-deps.yml') }}
216+
key: macos-deps-builder-root-cache-${{ hashFiles('./.builders/images/macos/*', './.builders/images/*', './.builders/deps/*', './.builders/build.py', './.github/workflows/resolve-build-deps.yml') }}
217217

218218
- name: Run the build
219219
env:
@@ -290,8 +290,8 @@ jobs:
290290
uses: actions/create-github-app-token@v1
291291
id: token-generator
292292
with:
293-
app-id: ${{ vars.DD_GITHUB_TOKEN_GENERATOR_APP_ID }}
294-
private-key: ${{ secrets.DD_GITHUB_TOKEN_GENERATOR_PRIVATE_KEY }}
293+
app-id: ${{ vars.DD_AGENT_INTEGRATIONS_BOT_APP_ID }}
294+
private-key: ${{ secrets.DD_AGENT_INTEGRATIONS_BOT_PRIVATE_KEY }}
295295
repositories: integrations-core
296296

297297
- name: Create pull request
@@ -303,7 +303,7 @@ jobs:
303303
branch: bot/update-dependency-resolution
304304
branch-suffix: timestamp
305305
delete-branch: true
306-
labels: bot,qa/skip-qa
306+
labels: bot,qa/skip-qa,bot/resolve-build-deps
307307
body: |-
308308
### Motivation
309309

‎.github/workflows/test-agent.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ jobs:
4949
agent-image-windows: "${{ inputs.agent-image-windows }}"
5050
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
5151
secrets: inherit
52+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
53+
permissions:
54+
id-token: write
5255

5356
submit-traces:
5457
needs:

‎.github/workflows/test-fips-e2e.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
TRACE_CAPTURE_BASE_DIR: "trace-captures"
4646
TRACE_CAPTURE_LOG: "trace-captures/output.log"
4747

48+
# needed for codecov in test-target.yml, allows the action to get a JWT signed by Github
49+
permissions:
50+
id-token: write
51+
4852
steps:
4953

5054
- name: Set environment variables with sanitized paths
@@ -94,7 +98,6 @@ jobs:
9498
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
9599
ORACLE_DOCKER_USERNAME: ${{ secrets.ORACLE_DOCKER_USERNAME }}
96100
ORACLE_DOCKER_PASSWORD: ${{ secrets.ORACLE_DOCKER_PASSWORD }}
97-
SINGLESTORE_LICENSE: ${{ secrets.SINGLESTORE_LICENSE }}
98101
DD_GITHUB_USER: ${{ github.actor }}
99102
DD_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100103
run: ddev ci setup ${{ inputs.target || 'tls' }}
@@ -150,8 +153,8 @@ jobs:
150153
if: >
151154
!github.event.repository.private &&
152155
always()
153-
uses: codecov/codecov-action@v4
156+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d
154157
with:
155-
token: ${{ secrets.CODECOV_TOKEN }}
158+
use_oidc: true
156159
files: "${{ inputs.target || 'tls' }}/coverage.xml"
157160
flags: "${{ inputs.target || 'tls' }}"

0 commit comments

Comments
 (0)