Skip to content

Commit

Permalink
Merge pull request vectordotdev#390 from answerbook/feature/LOG-18931
Browse files Browse the repository at this point in the history
Bump: Merge upstream 0.33.1
  • Loading branch information
darinspivey authored Jan 9, 2024
2 parents 17cc681 + e8a7404 commit 0ce8b8d
Show file tree
Hide file tree
Showing 2,608 changed files with 20,283 additions and 10,502 deletions.
5 changes: 5 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
[alias]
vdev = "run --quiet --package vdev --"

[env]
# Build with large pages so that Vector runs on systems with 64k pages or less (e.g. 4k) to support
# CentOS 7, 8, and a few other Linux distributions.
JEMALLOC_SYS_WITH_LG_PAGE = "16"

[target.'cfg(all())']
rustflags = [
"-Dclippy::print_stdout",
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Makefile linguist-detectable=false

distribution/helm/*/charts/*.tgz filter=lfs diff=lfs merge=lfs -text

lib/codecs/tests/data/** linguist-generated=true
tests/helm-snapshots/**/snapshot.yaml linguist-generated=true
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/minor-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ labels: "domain: releasing"

The week before the release:

- [ ] Check for any outstanding deprecation actions in [DEPRECATIONS.md](docs/DEPRECATIONS.md) and
take them (or have someone help you take them)
- [ ] Create a new release branch from master to freeze commits
- `git fetch && git checkout origin/master && git checkout -b v0.<new version number> && git push -u`
- [ ] Create a new release preparation branch from `master`
Expand Down
5 changes: 5 additions & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ Podcast
Podkicker
Positivo
Prestigio
pront
Proscan
Qmobilevn
RPZ
Expand Down Expand Up @@ -249,6 +250,7 @@ corejs
coreutils
curta
daemonset
dalek
databend
datacenter
datadog
Expand Down Expand Up @@ -403,9 +405,12 @@ rootfs
roundrobin
rpmbuild
rpms
rstest
rsyslog
rsyslogd
security-tab
servlet
sublocation
snyk
socketaddr
solarwinds
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
(?:^|/)(?i)COPYRIGHT
(?:^|/)(?i)LICEN[CS]E
(?:^|/)3rdparty/
(?:^|/)amplify\.yml$
(?:^|/)go\.sum$
(?:^|/)package(?:-lock|)\.json$
(?:^|/)Pipfile$
Expand Down Expand Up @@ -76,6 +77,9 @@
^\Qbenches/transform/route.rs\E$
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf.desc\E$
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc\E$
^\Qlib/codecs/tests/data/protobuf/test.desc\E$
^\Qlib/codecs/tests/data/protobuf/test_protobuf.desc\E$
^\Qlib/codecs/tests/data/protobuf/test_protobuf3.desc\E$
^\Qlib/dnsmsg-parser/benches/benches.rs\E$
^\Qlib/dnsmsg-parser/src/dns_message_parser.rs\E$
^\Qlib/lookup/tests/fixtures/lookup/quoted\E$
Expand Down
12 changes: 12 additions & 0 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ autodiscovered
autodiscovery
autogen
autoinstalling
AUTOPULL
autospawn
autospawning
autotools
Expand Down Expand Up @@ -185,6 +186,7 @@ composability
concating
concats
condrestart
conffiles
configkey
configmap
confl
Expand Down Expand Up @@ -347,6 +349,7 @@ exitcodes
exprhere
extendedstatus
extendee
extglob
extr
extralight
extrepo
Expand Down Expand Up @@ -374,6 +377,7 @@ filecontents
filterlist
finalizable
fingerprinter
fipsmodule
fizzaxbbuzz
fizzbuzz
fkn
Expand Down Expand Up @@ -522,6 +526,7 @@ ingesters
ingestor
initdb
initech
installdeb
Instrumentable
interpolatedstring
interpretervm
Expand Down Expand Up @@ -791,6 +796,7 @@ opinsights
oplog
optimizable
orgid
OSSL
ostype
otel
otelcol
Expand Down Expand Up @@ -834,6 +840,7 @@ posttrunc
prebuild
precpu
preds
prefs
preinst
preread
prereqs
Expand Down Expand Up @@ -982,6 +989,7 @@ skywalking
slashin
slf
slideover
slugified
smallvec
smartphone
Smol
Expand Down Expand Up @@ -1067,6 +1075,7 @@ Takeaways
targetgroup
tarpit
tcmalloc
teconsent
telecom
templatable
templateable
Expand Down Expand Up @@ -1126,6 +1135,8 @@ tripwires
Trivago
trivy
Troutwine
trustarc
truste
TRUSTSTORE
TSDB
Tsvg
Expand Down Expand Up @@ -1164,6 +1175,7 @@ userpass
uucp
UVY
uwtable
Uyuni
valfoo
validpaths
Varda
Expand Down
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ updates:
commit-message:
prefix: "chore(deps)"
open-pull-requests-limit: 100
groups:
azure:
patterns:
- "azure_*"
prost:
patterns:
- "prost"
- "prost-*"
tonic:
patterns:
- "tonic"
- "tonic-*"
- package-ecosystem: "docker"
directory: "/distribution/docker/"
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cli.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: (PR comment) Set latest commit status as pending
if: ${{ github.event_name == 'issue_comment' }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
if: always()

- name: (PR comment) Set latest commit status as ${{ job.status }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
if: always() && github.event_name == 'issue_comment'
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment-trigger.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
steps:
- name: Generate authentication token
id: generate_token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
with:
app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/component_features.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: (PR comment) Set latest commit status as pending
if: github.event_name == 'issue_comment'
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -53,7 +53,7 @@ jobs:

- name: (PR comment) Set latest commit status as ${{ job.status }}
if: always() && github.event_name == 'issue_comment'
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cross.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: (PR comment) Set latest commit status as pending
if: ${{ github.event_name == 'issue_comment' }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
path: "./target/${{ matrix.target }}/debug/vector"

- name: (PR comment) Set latest commit status as failed
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
if: failure() && github.event_name == 'issue_comment'
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
Expand All @@ -87,7 +87,7 @@ jobs:
id: comment-branch

- name: (PR comment) Submit PR result as success
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/environment.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: (PR comment) Set latest commit status as pending
if: ${{ github.event_name == 'issue_comment' }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -40,18 +40,18 @@ jobs:
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.0.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2.9.1
uses: docker/setup-buildx-action@v3.0.0
- name: Login to DockerHub
uses: docker/login-action@v2.1.0
uses: docker/login-action@v3
if: github.ref == 'refs/heads/master'
with:
username: ${{ secrets.CI_DOCKER_USERNAME }}
password: ${{ secrets.CI_DOCKER_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
with:
images: timberio/vector-dev
flavor: |
Expand All @@ -63,7 +63,7 @@ jobs:
org.opencontainers.image.title=Vector development environment
org.opencontainers.image.url=https://github.com/vectordotdev/vector
- name: Build and push
uses: docker/build-push-action@v4.1.1
uses: docker/build-push-action@v5.0.0
with:
context: .
file: ./scripts/environment/Dockerfile
Expand All @@ -72,7 +72,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}

- name: (PR comment) Set latest commit status as ${{ job.status }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
if: always() && github.event_name == 'issue_comment'
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gardener_open_pr.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Generate authentication token
id: generate_token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
with:
app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/install-sh.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: (PR comment) Set latest commit status as pending
if: ${{ github.event_name == 'issue_comment' }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -40,7 +40,7 @@ jobs:
run: make sync-install

- name: (PR comment) Set latest commit status as failed
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
if: failure() && github.event_name == 'issue_comment'
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
Expand All @@ -63,7 +63,7 @@ jobs:

- name: (PR comment) Set latest commit status as ${{ job.status }}
if: github.event_name == 'issue_comment'
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-comment.yml.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
steps:
- name: Generate authentication token
id: generate_token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
with:
app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
Expand All @@ -70,7 +70,7 @@ jobs:
id: comment-branch

- name: (PR comment) Set latest commit status as pending
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -381,7 +381,7 @@ jobs:
steps:
- name: Generate authentication token
id: generate_token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
with:
app_id: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_ID }}
private_key: ${{ secrets.GH_APP_DATADOG_VECTOR_CI_APP_PRIVATE_KEY }}
Expand All @@ -398,7 +398,7 @@ jobs:
id: comment-branch

- name: (PR comment) Submit PR result as ${{ needs.integration-tests.result }}
uses: myrotvorets/set-commit-status-action@v1.1.7
uses: myrotvorets/set-commit-status-action@v2.0.0
with:
sha: ${{ steps.comment-branch.outputs.head_sha }}
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
Loading

0 comments on commit 0ce8b8d

Please sign in to comment.