Skip to content

Commit 2e06dfa

Browse files
authored
Merge branch 'vectordotdev:master' into fix-sanitize-enrichment-tables-in-config-tests
2 parents 001d070 + d360a8e commit 2e06dfa

File tree

189 files changed

+6051
-4252
lines changed

Some content is hidden

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

189 files changed

+6051
-4252
lines changed

.github/ISSUE_TEMPLATE/minor-release.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,12 @@ Automated steps include:
9292
- Refer to the internal releasing doc to monitor the deployment.
9393
- [ ] Release Linux packages. Refer to the internal releasing doc.
9494
- [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts/blob/develop/RELEASING.md).
95+
- [ ] Release Homebrew. Refer to the internal releasing doc.
9596
- [ ] Create internal Docker images. Refer to the internal releasing doc.
97+
- [ ] Update the latest [release tag](https://github.com/vectordotdev/vector/release) description with the release announcement.
9698
- [ ] Create a new PR with title starting as `chore(releasing):`
9799
- [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`.
98100
- [ ] Run `cargo vdev build manifests` and commit changes.
99101
- [ ] Bump the release number in the `Cargo.toml` on master to the next minor release.
100102
- [ ] Also, update `Cargo.lock` with: `cargo update -p vector`.
101103
- [ ] If there is a VRL version update, revert it and make it track the git `main` branch and then run `cargo update -p vrl`.
102-
- [ ] Kick-off post-mortems for any regressions resolved by the release.

.github/actions/install-vdev/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
- name: Cache vdev binary
1818
id: cache-vdev
1919
if: ${{ inputs.skip-cache != 'true' }}
20-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
20+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2121
with:
2222
path: ~/.cargo/bin/vdev
2323
key: ${{ runner.os }}-vdev-${{ hashFiles('vdev/**', 'Cargo.toml', 'Cargo.lock') }}
@@ -33,7 +33,7 @@ runs:
3333
3434
- name: Save vdev to cache
3535
if: ${{ inputs.skip-cache == 'true' }}
36-
uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
36+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
3737
with:
3838
path: ~/.cargo/bin/vdev
3939
key: ${{ runner.os }}-vdev-${{ hashFiles('vdev/**', 'Cargo.toml', 'Cargo.lock') }}

.github/actions/setup/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ runs:
8383
- name: Check vdev cache status
8484
id: check-vdev-cache
8585
if: ${{ inputs.vdev == 'true' }}
86-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
86+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
8787
with:
8888
path: ~/.cargo/bin/vdev
8989
key: ${{ runner.os }}-vdev-${{ hashFiles('vdev/**', 'Cargo.toml', 'Cargo.lock') }}
@@ -148,7 +148,7 @@ runs:
148148

149149
- name: Cache Cargo registry, index, and git DB
150150
if: ${{ inputs.cargo-cache == 'true' || env.NEEDS_RUST == 'true' || env.VDEV_NEEDS_COMPILE == 'true' }}
151-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
151+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
152152
with:
153153
path: |
154154
~/.cargo/registry/index/
@@ -159,7 +159,7 @@ runs:
159159
${{ runner.os }}-cargo-
160160
161161
- name: Install mold
162-
if: ${{ runner.os == 'Linux' && (inputs.mold == 'true' || env.VDEV_NEEDS_COMPILE == 'true') }}
162+
if: ${{ runner.os == 'Linux' && env.DISABLE_MOLD != 'true' && (inputs.mold == 'true' || env.VDEV_NEEDS_COMPILE == 'true') }}
163163
shell: bash
164164
run: |
165165
echo "Installing mold"
@@ -244,7 +244,7 @@ runs:
244244

245245
- name: Cache prepare.sh binaries
246246
id: cache-prepare-binaries
247-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
247+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
248248
with:
249249
path: |
250250
~/.cargo/bin/cargo-deb

.github/actions/spelling/allow.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ KDL
276276
keepappkey
277277
keephq
278278
kenton
279+
keybinds
279280
Kingcom
280281
Kolkata
281282
konqueror

.github/audit.yml

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

.github/workflows/build-test-runner.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
build:
2525
runs-on: ubuntu-24.04
2626
steps:
27-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
ref: ${{ inputs.checkout_ref || inputs.commit_sha }}
3030

@@ -33,7 +33,7 @@ jobs:
3333
vdev: true
3434

3535
- name: Login to GitHub Container Registry
36-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
36+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
3737
with:
3838
registry: ghcr.io
3939
username: ${{ github.actor }}

.github/workflows/changelog.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
exit 0
4646
4747
# Checkout changelog script and changelog.d/ from master
48-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
48+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4949
if: env.SHOULD_RUN == 'true'
5050
with:
5151
ref: master
@@ -55,7 +55,7 @@ jobs:
5555
sparse-checkout-cone-mode: false
5656

5757
# Checkout PR's changelog.d/ into tmp/
58-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
58+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5959
if: env.SHOULD_RUN == 'true'
6060
with:
6161
repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/changes.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
unit_mac-yml: ${{ steps.filter.outputs.unit_mac-yml }}
183183
unit_windows-yml: ${{ steps.filter.outputs.unit_windows-yml }}
184184
steps:
185-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
185+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
186186

187187
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
188188
id: filter
@@ -326,7 +326,7 @@ jobs:
326326
webhdfs: ${{ steps.filter.outputs.webhdfs }}
327327
any: ${{ steps.detect-changes.outputs.any }}
328328
steps:
329-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
329+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
330330

331331
- uses: ./.github/actions/setup
332332
with:
@@ -418,7 +418,7 @@ jobs:
418418
opentelemetry-metrics: ${{ steps.filter.outputs.opentelemetry-metrics }}
419419
any: ${{ steps.detect-changes.outputs.any }}
420420
steps:
421-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
421+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
422422

423423
- uses: ./.github/actions/setup
424424
with:

.github/workflows/ci-integration-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
"redis", "splunk", "webhdfs"
106106
]
107107
steps:
108-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
108+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
109109
with:
110110
submodules: "recursive"
111111
ref: ${{ github.event.review.commit_id }}
@@ -141,7 +141,7 @@ jobs:
141141
"datadog-logs", "datadog-metrics", "opentelemetry-logs", "opentelemetry-metrics"
142142
]
143143
steps:
144-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
144+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
145145
with:
146146
submodules: "recursive"
147147
ref: ${{ github.event.review.commit_id }}

.github/workflows/cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-24.04
1717
timeout-minutes: 30
1818
steps:
19-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
with:
2121
ref: ${{ inputs.ref }}
2222
- uses: ./.github/actions/setup

0 commit comments

Comments
 (0)