Skip to content

Commit d82e92c

Browse files
committed
Merge branch 'og/max_merged_line_bytes' of https://github.com/ganelo/vector into og/max_merged_line_bytes
2 parents 7ca79d0 + af11a17 commit d82e92c

File tree

218 files changed

+8299
-2348
lines changed

Some content is hidden

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

218 files changed

+8299
-2348
lines changed

.github/CODEOWNERS

+9-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,12 @@
33
.github/workflows/regression.yml @vectordotdev/vector @vectordotdev/single-machine-performance
44
regression/config.yaml @vectordotdev/vector @vectordotdev/single-machine-performance
55
docs/ @vectordotdev/ux-team @vectordotdev/documentation
6-
website/ @vectordotdev/ux-team @vectordotdev/documentation
6+
website/ @vectordotdev/ux-team
7+
website/content @vectordotdev/documentation
8+
website/cue/reference/remap @vectordotdev/documentation
9+
10+
website/js @vectordotdev/vector-website
11+
website/layouts @vectordotdev/vector-website
12+
website/scripts @vectordotdev/vector-website
13+
website/data @vectordotdev/vector-website
14+
website/* @vectordotdev/vector-website

.github/PULL_REQUEST_TEMPLATE.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,21 @@ Providing this information upfront will facilitate a smoother review process. --
4141
- [ ] Yes. Please add a changelog fragment based on our [guidelines](https://github.com/vectordotdev/vector/blob/master/changelog.d/README.md).
4242
- [ ] No. A maintainer will apply the "no-changelog" label to this PR.
4343

44-
## Checklist
45-
- [ ] Please read our [Vector contributor resources](https://github.com/vectordotdev/vector/tree/master/docs#getting-started).
44+
## Notes
45+
- Please read our [Vector contributor resources](https://github.com/vectordotdev/vector/tree/master/docs#getting-started).
46+
- Do not hesitate to use `@vectordotdev/vector` to reach out to us regarding this PR.
47+
- The CI checks run only after we manually approve them. To minimize round-trips see the following local checks:
4648
- `make check-all` is a good command to run locally. This check is
4749
defined [here](https://github.com/vectordotdev/vector/blob/1ef01aeeef592c21d32ba4d663e199f0608f615b/Makefile#L450-L454). Some of these
4850
checks might not be relevant to your PR. For Rust changes, at the very least you should run:
4951
- `cargo fmt --all`
5052
- `cargo clippy --workspace --all-targets -- -D warnings`
5153
- `cargo nextest run --workspace` (alternatively, you can run `cargo test --all`)
52-
- [ ] If this PR introduces changes Vector dependencies (modifies `Cargo.lock`), please
53-
run `dd-rust-license-tool write` to regenerate the [license inventory](https://github.com/vectordotdev/vrl/blob/main/LICENSE-3rdparty.csv) and commit the changes (if any). More details [here](https://crates.io/crates/dd-rust-license-tool).
54+
- After a review is requested, please avoid force pushes to help us review incrementally.
55+
- Feel free to push as many commits as you want. They will be squashed into one before merging.
56+
- For example, you can run `git merge origin master` and `git push`.
57+
- If this PR introduces changes Vector dependencies (modifies `Cargo.lock`), please
58+
run `cargo vdev build licenses` to regenerate the [license inventory](https://github.com/vectordotdev/vrl/blob/main/LICENSE-3rdparty.csv) and commit the changes (if any). More details [here](https://crates.io/crates/dd-rust-license-tool).
5459

5560
## References
5661

.github/actions/spelling/expect.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ bytesize
7878
califrag
7979
califragilistic
8080
CAROOT
81-
cbor
8281
cddl
8382
cdylib
8483
cef
@@ -256,7 +255,6 @@ hostpath
256255
hoverable
257256
hoverbear
258257
httpdeliveryrequestresponse
259-
httpdump
260258
httpevent
261259
hugepages
262260
hugops
@@ -467,6 +465,7 @@ rcode
467465
rdkafka
468466
rdparty
469467
readnone
468+
recordset
470469
rediss
471470
redoctober
472471
regexes
@@ -541,6 +540,7 @@ spencergilbert
541540
spinlock
542541
SPOF
543542
spog
543+
sqlx
544544
srcaddr
545545
srcport
546546
SREs
@@ -592,6 +592,7 @@ threatmanager
592592
Throughputs
593593
Tiltfile
594594
timberio
595+
TIMESTAMPTZ
595596
TKEY
596597
tlh
597598
tmpfs
@@ -672,7 +673,6 @@ wtimeout
672673
WTS
673674
xact
674675
xlarge
675-
XMODEM
676676
xxs
677677
YAMLs
678678
YBv

.github/audit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
security_audit:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- uses: actions/checkout@v1
1515
- uses: actions-rs/audit-check@v1

.github/dependabot.yml

+19-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ updates:
33
- package-ecosystem: "cargo"
44
directory: "/"
55
schedule:
6-
interval: "weekly"
6+
interval: "monthly"
77
time: "04:00" # UTC
88
labels:
99
- "domain: deps"
@@ -73,7 +73,7 @@ updates:
7373
- package-ecosystem: "docker"
7474
directory: "/distribution/docker/"
7575
schedule:
76-
interval: "daily"
76+
interval: "monthly"
7777
time: "04:00" # UTC
7878
labels:
7979
- "domain: releasing"
@@ -84,7 +84,7 @@ updates:
8484
- package-ecosystem: "github-actions"
8585
directory: "/"
8686
schedule:
87-
interval: "weekly"
87+
interval: "monthly"
8888
labels:
8989
- "domain: ci"
9090
- "no-changelog"
@@ -95,3 +95,19 @@ updates:
9595
patterns:
9696
- "actions/download-artifact"
9797
- "actions/upload-artifact"
98+
- package-ecosystem: "npm"
99+
directory: "website/"
100+
schedule:
101+
interval: "monthly"
102+
time: "05:00" # UTC
103+
labels:
104+
- "dependencies"
105+
- "javascript"
106+
- "no-changelog"
107+
commit-message:
108+
prefix: "chore(website deps)"
109+
open-pull-requests-limit: 50
110+
groups:
111+
npm_and_yarn:
112+
patterns:
113+
- "*"

.github/workflows/build_preview_sites.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- completed
88

99
permissions:
10+
actions: read
1011
issues: write
1112
pull-requests: write
1213
statuses: write

.github/workflows/changes.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ on:
129129
jobs:
130130
# Detects changes that are not specific to integration tests
131131
source:
132-
runs-on: ubuntu-20.04
132+
runs-on: ubuntu-24.04
133133
timeout-minutes: 5
134134
if: ${{ inputs.source }}
135135
outputs:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
integration-tests:
8686
needs: prep-pr
87-
runs-on: ubuntu-20.04
87+
runs-on: ubuntu-24.04
8888
timeout-minutes: 90
8989
strategy:
9090
matrix:
@@ -117,7 +117,7 @@ jobs:
117117

118118
e2e-tests:
119119
needs: prep-pr
120-
runs-on: ubuntu-20.04-8core
120+
runs-on: ubuntu-24.04-8core
121121
timeout-minutes: 30
122122
steps:
123123
- uses: actions/checkout@v4

.github/workflows/cli.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
jobs:
1010
test-cli:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
timeout-minutes: 30
1313
env:
1414
CARGO_INCREMENTAL: 0
@@ -44,7 +44,7 @@ jobs:
4444
restore-keys: |
4545
${{ runner.os }}-cargo-
4646
47-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
47+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
4848
- run: bash scripts/environment/prepare.sh
4949
- run: echo "::add-matcher::.github/matchers/rust.json"
5050
- run: make test-cli

.github/workflows/compilation-timings.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ env:
1313
jobs:
1414
release-build-optimized:
1515
name: "Release Build (optimized)"
16-
runs-on: ubuntu-20.04-8core
16+
runs-on: ubuntu-24.04-8core
1717
steps:
1818
- uses: colpal/actions-clean@v1
1919
- uses: actions/checkout@v4
20-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
20+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
2121
- run: bash scripts/environment/prepare.sh
2222
- run: cargo clean
2323
- run: cargo build --release
2424

2525
release-build-normal:
2626
name: "Release Build (normal)"
27-
runs-on: ubuntu-20.04-8core
27+
runs-on: ubuntu-24.04-8core
2828
env:
2929
# We're not actually doing a debug build, we're just turning off the logic
3030
# in release-flags.sh so that we don't override the Cargo "release" profile
@@ -33,29 +33,29 @@ jobs:
3333
steps:
3434
- uses: colpal/actions-clean@v1
3535
- uses: actions/checkout@v4
36-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
36+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
3737
- run: bash scripts/environment/prepare.sh
3838
- run: cargo clean
3939
- run: cargo build --release
4040

4141
debug-build:
4242
name: "Debug Build"
43-
runs-on: ubuntu-20.04-8core
43+
runs-on: ubuntu-24.04-8core
4444
steps:
4545
- uses: colpal/actions-clean@v1
4646
- uses: actions/checkout@v4
47-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
47+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
4848
- run: bash scripts/environment/prepare.sh
4949
- run: cargo clean
5050
- run: cargo build
5151

5252
debug-rebuild:
5353
name: "Debug Rebuild"
54-
runs-on: ubuntu-20.04-8core
54+
runs-on: ubuntu-24.04-8core
5555
steps:
5656
- uses: colpal/actions-clean@v1
5757
- uses: actions/checkout@v4
58-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
58+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
5959
- run: bash scripts/environment/prepare.sh
6060
- run: cargo clean
6161
- run: cargo build
@@ -64,11 +64,11 @@ jobs:
6464

6565
check:
6666
name: "Cargo Check"
67-
runs-on: ubuntu-20.04-8core
67+
runs-on: ubuntu-24.04-8core
6868
steps:
6969
- uses: colpal/actions-clean@v1
7070
- uses: actions/checkout@v4
71-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
71+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
7272
- run: bash scripts/environment/prepare.sh
7373
- run: cargo clean
7474
- run: cargo check

.github/workflows/component_features.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
jobs:
2323
check-component-features:
2424
# use free tier on schedule and 8 core to expedite results on demand invocation
25-
runs-on: ${{ github.event_name == 'schedule' && 'ubuntu-20.04' || 'ubuntu-20.04-8core' }}
25+
runs-on: ${{ github.event_name == 'schedule' && 'ubuntu-24.04' || 'ubuntu-24.04-8core' }}
2626
if: github.event_name == 'pull_request_review' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
2727
steps:
2828
- name: (PR review) Set latest commit status as pending
@@ -44,7 +44,7 @@ jobs:
4444
if: github.event_name != 'pull_request_review'
4545
uses: actions/checkout@v4
4646

47-
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-20.04.sh
47+
- run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
4848
- run: bash scripts/environment/prepare.sh
4949
- run: echo "::add-matcher::.github/matchers/rust.json"
5050
- run: make check-component-features

0 commit comments

Comments
 (0)