Skip to content

Commit f281332

Browse files
lu-zhengdalu-zhengda
authored
Merge branch 'master' into update_setup_include_use_master
2 parents dcacbb1 + 717d94d commit f281332

File tree

612 files changed

+67391
-2548
lines changed

Some content is hidden

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

612 files changed

+67391
-2548
lines changed

‎.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.

‎.github/CODEOWNERS

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ manifest.json @DataDog/documentation @DataDog/agent-integrations
110110
/tcp_queue_length/manifest.json @DataDog/container-integrations @DataDog/agent-integrations @DataDog/documentation
111111

112112
# NDM
113-
/cisco_aci/ @DataDog/ndm-integrations @DataDog/agent-integrations
114-
/cisco_sdwan/ @DataDog/ndm-integrations @DataDog/agent-integrations
115-
/snmp/ @DataDog/ndm-core @DataDog/agent-integrations
113+
/cisco_aci/ @DataDog/ndm-integrations @DataDog/agent-integrations @DataDog/documentation
114+
/cisco_sdwan/ @DataDog/ndm-integrations @DataDog/agent-integrations @DataDog/documentation
115+
/snmp/ @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
116116
/snmp/*.md @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
117-
/snmp_*/ @DataDog/ndm-core @DataDog/agent-integrations
117+
/snmp_*/ @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
118118
/snmp_*/*.md @DataDog/ndm-core @DataDog/agent-integrations @DataDog/documentation
119119
/network_path/ @DataDog/network-device-monitoring @DataDog/Networks @DataDog/agent-integrations
120120
/network_path/*.md @DataDog/network-device-monitoring @DataDog/Networks @DataDog/agent-integrations @DataDog/documentation
@@ -228,6 +228,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
228228
/brevo/manifest.json @DataDog/saas-integrations @DataDog/documentation
229229
/brevo/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
230230

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+
231236
/cisco_umbrella_dns/ @DataDog/saas-integrations
232237
/cisco_umbrella_dns/*.md @DataDog/saas-integrations @DataDog/documentation
233238
/cisco_umbrella_dns/manifest.json @DataDog/saas-integrations @DataDog/documentation
@@ -296,6 +301,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
296301
/metabase/manifest.json @DataDog/saas-integrations @DataDog/documentation
297302
/metabase/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
298303

304+
/microsoft_sysmon/ @DataDog/agent-integrations
305+
/microsoft_sysmon/*.md @DataDog/agent-integrations @DataDog/documentation
306+
/microsoft_sysmon/manifest.json @DataDog/agent-integrations @DataDog/documentation
307+
/microsoft_sysmon/assets/logs/ @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
308+
299309
/mimecast/ @DataDog/saas-integrations
300310
/mimecast/*.md @DataDog/saas-integrations @DataDog/documentation
301311
/mimecast/manifest.json @DataDog/saas-integrations @DataDog/documentation
@@ -508,6 +518,11 @@ plaid/assets/logs/ @DataDog/saa
508518
/gpu/*.md @DataDog/ebpf-platform @DataDog/documentation
509519
/gpu/manifest.json @DataDog/ebpf-platform @DataDog/agent-integrations @DataDog/documentation
510520

521+
/openvpn/ @DataDog/agent-integrations
522+
/openvpn/*.md @DataDog/agent-integrations @DataDog/documentation
523+
/openvpn/manifest.json @DataDog/agent-integrations @DataDog/documentation
524+
/openvpn/assets/logs/ @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
525+
511526
# To keep Security up-to-date with changes to the signing tool.
512527
/datadog_checks_dev/datadog_checks/dev/tooling/signing.py @DataDog/agent-integrations
513528
# As well as the secure downloader.

‎.github/pinact.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Configuration file for pinact used to validate that no
2+
# GitHub actions are left unpined: .github/workflows/validate-pinned-actions.yml
3+
# Used to exclude specific actions from the pin check
4+
version: 3
5+
ignore_actions:
6+
# Lets keep static analyzer action updated as much as possible
7+
- name: DataDog/datadog-static-analyzer-github-action
8+
ref: .*

‎.github/workflows/backport-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
)
2121
steps:
2222
- name: Create token
23-
uses: actions/create-github-app-token@v1
23+
uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
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
29-
- uses: tibdex/backport@v2
29+
- uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e # v2.0.4
3030
with:
3131
label_pattern: "^backport/(?<base>([^ ]+))$"
3232
labels_template: "[\"backport\", \"bot\"]"

‎.github/workflows/build-ddev.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
with:
3939
fetch-depth: 0
4040

@@ -45,7 +45,7 @@ jobs:
4545
run: python -m build
4646

4747
- name: Upload artifacts
48-
uses: actions/upload-artifact@v4
48+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4949
with:
5050
name: python-artifacts
5151
path: ddev/dist/*
@@ -96,7 +96,7 @@ jobs:
9696

9797
steps:
9898
- name: Checkout code
99-
uses: actions/checkout@v4
99+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
100100
with:
101101
fetch-depth: 0
102102

@@ -108,7 +108,7 @@ jobs:
108108
tar --strip-components=1 -xzf - -C $PYAPP_REPO
109109
110110
- name: Set up Python ${{ env.PYTHON_VERSION }}
111-
uses: actions/setup-python@v5
111+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
112112
with:
113113
python-version: ${{ env.PYTHON_VERSION }}
114114

@@ -119,13 +119,13 @@ jobs:
119119
run: pip install -e . --no-deps
120120

121121
- name: Install Rust toolchain
122-
uses: dtolnay/rust-toolchain@stable
122+
uses: dtolnay/rust-toolchain@b56f20b9f22943bc548a7945b40601028db81a31 # 1.86.0 Latest rust stable version as of 2025-05-08 (https://forge.rust-lang.org/)
123123
with:
124124
targets: ${{ matrix.job.target }}
125125

126126
- name: Set up cross compiling
127127
if: matrix.job.cross
128-
uses: taiki-e/install-action@v2
128+
uses: taiki-e/install-action@97a83ae1347bc407f550a16fb0694d6f446eec88 # v2.50.9
129129
with:
130130
tool: cross
131131

@@ -142,7 +142,7 @@ jobs:
142142
143143
- name: Download Python artifacts
144144
if: ${{ !startsWith(github.event.ref, 'refs/tags') }}
145-
uses: actions/download-artifact@v4
145+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
146146
with:
147147
name: python-artifacts
148148
path: ddev/dist
@@ -214,7 +214,7 @@ jobs:
214214

215215
- name: Upload staged managed archive
216216
if: runner.os != 'Linux'
217-
uses: actions/upload-artifact@v4
217+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
218218
with:
219219
name: staged-managed-${{ runner.os }}-${{ matrix.job.target }}
220220
path: ddev/packaging/*
@@ -235,7 +235,7 @@ jobs:
235235

236236
- name: Upload staged standalone archive
237237
if: runner.os != 'Linux'
238-
uses: actions/upload-artifact@v4
238+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
239239
with:
240240
name: staged-standalone-${{ runner.os }}-${{ matrix.job.target }}
241241
path: ddev/packaging/*
@@ -245,7 +245,7 @@ jobs:
245245
# can upload directly at this point
246246
- name: Upload standalone archive
247247
if: runner.os == 'Linux'
248-
uses: actions/upload-artifact@v4
248+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
249249
with:
250250
name: standalone-${{ matrix.job.target }}
251251
path: ddev/packaging/*
@@ -262,10 +262,10 @@ jobs:
262262

263263
steps:
264264
- name: Checkout code
265-
uses: actions/checkout@v4
265+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
266266

267267
- name: Set up Python ${{ env.PYTHON_VERSION }}
268-
uses: actions/setup-python@v5
268+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
269269
with:
270270
python-version: ${{ env.PYTHON_VERSION }}
271271

@@ -304,7 +304,7 @@ jobs:
304304
OUTER
305305
306306
- name: Download staged standalone binaries
307-
uses: actions/download-artifact@v4
307+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
308308
with:
309309
pattern: staged-standalone-${{ runner.os }}-*
310310
path: ddev/archives
@@ -317,7 +317,7 @@ jobs:
317317
run: ${{ steps.script-prepare.outputs.script }}
318318

319319
- name: Upload standalone binaries
320-
uses: actions/upload-artifact@v4
320+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
321321
with:
322322
name: standalone-${{ matrix.job.target }}
323323
path: ddev/archives/*
@@ -327,7 +327,7 @@ jobs:
327327
run: rm -rf archives bin targets
328328

329329
- name: Download staged managed binaries
330-
uses: actions/download-artifact@v4
330+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
331331
with:
332332
pattern: staged-managed-${{ runner.os }}-*
333333
path: ddev/archives
@@ -351,7 +351,7 @@ jobs:
351351
mv build/*/release/*/*.{exe,msi} installers
352352
353353
- name: Upload installers
354-
uses: actions/upload-artifact@v4
354+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
355355
with:
356356
name: installers-${{ runner.os }}
357357
path: ddev/installers/*
@@ -368,10 +368,10 @@ jobs:
368368

369369
steps:
370370
- name: Checkout code
371-
uses: actions/checkout@v4
371+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
372372

373373
- name: Set up Python ${{ env.PYTHON_VERSION }}
374-
uses: actions/setup-python@v5
374+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
375375
with:
376376
python-version: ${{ env.PYTHON_VERSION }}
377377

@@ -454,7 +454,7 @@ jobs:
454454
OUTER
455455
456456
- name: Download staged standalone binaries
457-
uses: actions/download-artifact@v4
457+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
458458
with:
459459
pattern: staged-standalone-${{ runner.os }}-*
460460
path: ddev/archives
@@ -479,7 +479,7 @@ jobs:
479479
done
480480
481481
- name: Upload standalone binaries
482-
uses: actions/upload-artifact@v4
482+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
483483
with:
484484
name: standalone-${{ runner.os }}
485485
path: ddev/archives/*
@@ -489,7 +489,7 @@ jobs:
489489
run: rm -rf archives bin notarize-bin
490490

491491
- name: Download staged managed binaries
492-
uses: actions/download-artifact@v4
492+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
493493
with:
494494
pattern: staged-managed-${{ runner.os }}-*
495495
path: ddev/archives
@@ -559,7 +559,7 @@ jobs:
559559
"signed/${{ steps.pkg.outputs.path }}"
560560
561561
- name: Upload installer
562-
uses: actions/upload-artifact@v4
562+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
563563
with:
564564
name: installers-${{ runner.os }}
565565
path: ddev/signed/${{ steps.pkg.outputs.path }}
@@ -580,34 +580,34 @@ jobs:
580580

581581
steps:
582582
- name: Download Python artifacts
583-
uses: actions/download-artifact@v4
583+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
584584
with:
585585
name: python-artifacts
586586
path: dist
587587

588588
- name: Download binaries
589-
uses: actions/download-artifact@v4
589+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
590590
with:
591591
pattern: standalone*
592592
path: archives
593593
merge-multiple: true
594594

595595
- name: Download installers
596-
uses: actions/download-artifact@v4
596+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
597597
with:
598598
pattern: installers-*
599599
path: installers
600600
merge-multiple: true
601601

602602
- name: Push Python artifacts to PyPI
603-
uses: pypa/gh-action-pypi-publish@release/v1
603+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
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
610-
uses: softprops/action-gh-release@v2
610+
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
611611
with:
612612
files: |-
613613
archives/*

‎.github/workflows/cache-shared-deps.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
PYTHON_VERSION: "3.12"
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Set up Python ${{ env.PYTHON_VERSION }}
25-
uses: actions/setup-python@v5
25+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2626
id: python
2727
with:
2828
python-version: "${{ env.PYTHON_VERSION }}"
2929

3030
- name: Check cache
31-
uses: actions/cache/restore@v4
31+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
3232
id: cache
3333
with:
3434
path: ${{ runner.os == 'Windows' && '~\AppData\Local\pip\Cache' || runner.os == 'macOS' && '~/Library/Caches/pip' || '~/.cache/pip' }}
@@ -68,7 +68,7 @@ jobs:
6868
run: pip install ./datadog_checks_base[deps] ./datadog_checks_dev
6969

7070
- name: Cache dependencies
71-
uses: actions/cache/save@v4
71+
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7272
if: steps.cache.outputs.cache-hit != 'true'
7373
with:
7474
path: ${{ runner.os == 'Windows' && '~\AppData\Local\pip\Cache' || runner.os == 'macOS' && '~/Library/Caches/pip' || '~/.cache/pip' }}

‎.github/workflows/claim-pypi-name.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323

2424
steps:
2525
- name: Checkout code
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727

2828
- name: Set up Python 3.11
29-
uses: actions/setup-python@v5
29+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3030
with:
3131
python-version: 3.11
3232

@@ -38,7 +38,7 @@ jobs:
3838
bash .github/workflows/scripts/build_placeholders.sh
3939
4040
- name: Push Python artifacts to PyPI
41-
uses: pypa/gh-action-pypi-publish@release/v1
41+
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # v1.12.4
4242
with:
4343
# We don't mind invalid metadata, we only want to claim the package name.
4444
verify-metadata: false

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
30+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL

0 commit comments

Comments
 (0)