feat: Merge with upstream v0.30.0

Merge upstream vector v0.30.0. Ref: LOG-17997
aholmberg · Sep 13, 2023 · 6b93177 · 6b93177
2 parents d104e58 + 6ace1e6
commit 6b93177
Show file tree

Hide file tree

Showing 569 changed files with 11,766 additions and 5,357 deletions.
diff --git a/.github/ISSUE_TEMPLATE/patch-release.md b/.github/ISSUE_TEMPLATE/patch-release.md
@@ -10,6 +10,7 @@ Before the release:
 - [ ] Create a new release preparation branch from the current release branch
   - `git fetch && git checkout v0.<current minor version> && git checkout -b prepare-v0.<new version number>`
 - [ ] Cherry-pick in all commits to be released from the associated release milestone
+  - If any merge conflicts occur, attempt to solve them and if needed enlist the aid of those familiar with the conflicting commits.
 - [ ] Run `cargo vdev build release-cue` to generate a new cue file for the release
 - [ ] Add `changelog` key to generated cue file
   - [ ] `git log --no-merges --cherry-pick --right-only <last release tag>...`
@@ -29,20 +30,24 @@ Before the release:
 
 On the day of release:
 
+- [ ] Ensure release date in cue matches current date.
 - [ ] Rebase the release preparation branch on the release branch
-    - [ ] Ensure release date in cue matches current date.
-    - [ ] Squash the release preparation commits (but not the cherry-picked commits!) to a single
-        commit. This makes it easier to cherry-pick to master after the release. 
+  - Squash the release preparation commits (but not the cherry-picked commits!) to a single
+    commit. This makes it easier to cherry-pick to master after the release.
+  - `git checkout prepare-v0.<new version number> && git rebase -i v0.<current minor version>`
 - [ ] Merge release preparation branch into the release branch
-    - `git co v0.<current minor version> && git merge --ff-only prepare-v0.<current minor version>.<patch>`
+  - `git co v0.<current minor version> && git merge --ff-only prepare-v0.<current minor version>.<patch>`
 - [ ] Tag new release
   - [ ] `git tag v0.<minor>.<patch> -a -m v0.<minor>.<patch>`
   - [ ] `git push origin v0.<minor>.<patch>`
 - [ ] Wait for release workflow to complete
   - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
+- [ ] Push the release branch to update the remote (This should close the preparation branch PR).
+  - `git checkout v0.<current minor version> && git push`
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
 - [ ] Once Helm chart is released, updated Vector manifests
-    - Run `cargo vdev build manifests` and open a PR with changes
+  - Run `cargo vdev build manifests` and open a PR with changes
 - [ ] Add docker images to [https://github.com/DataDog/images](https://github.com/DataDog/images/tree/master/vector) to have them available internally.
+  - Follow the [instructions at the top of the mirror.yaml file](https://github.com/DataDog/images/blob/fbf12868e90d52e513ebca0389610dea8a3c7e1a/mirror.yaml#L33-L49).
 - [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`
 - [ ] Kick-off post-mortems for any regressions resolved by the release
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -368,6 +368,7 @@ nixpkgs
 nokia
 nslookup
 nsupdate
+ntapi
 ntfs
 opendal
 opensearch

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -445,6 +445,7 @@ flamegraph
 Flatbuffers
 flate
 flatmaps
+flattenings
 fleep
 flork
 florp
@@ -722,6 +723,7 @@ MAINPID
 majorly
 MAKECMDGOALS
 Makefiles
+markability
 markdownify
 markdownlintrc
 marketo
@@ -866,6 +868,7 @@ norg
 norgle
 norknoog
 norknork
+no_run
 nosync
 notext
 notls
@@ -1011,6 +1014,7 @@ rawconfig
 rawstring
 rbaz
 rdkafka
+rdparty
 rdr
 readnone
 rebuffer
@@ -1135,7 +1139,6 @@ sinkbuilder
 sinknetworkbytessent
 sizecache
 Sizefor
-skaffold
 skinparam
 SKIPDATA
 skywalking
@@ -1342,6 +1345,7 @@ unevictable
 ungrokkable
 unioning
 unitdir
+unmark
 unmarshaler
 unnests
 unstructuredlogentries

diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
@@ -218,3 +218,6 @@ k8s
 
 # ignore comment in package-msi.sh
 [#].*custom\.a28ecdc.*
+
+# ignore specific user:password string containing special chars for unit testing
+user:P@ssw0rd
diff --git a/.github/workflows/baseline.yml.upstream b/.github/workflows/baseline.yml.upstream
@@ -1,9 +1,11 @@
+# Executes various builds of vector to time the results in order to track build times.
+#
+# This workflow is unrelated to the Regression workflow.
+
 name: Baseline Timings
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: "0 */2 * * *"
 
 env:
   CI: true

diff --git a/.github/workflows/environment.yml.upstream b/.github/workflows/environment.yml.upstream
@@ -29,7 +29,7 @@ jobs:
           password: ${{ secrets.CI_DOCKER_PASSWORD }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
+        uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e
         with:
           images: timberio/vector-dev
           flavor: |

diff --git a/.github/workflows/install-sh.yml.upstream b/.github/workflows/install-sh.yml.upstream
@@ -12,10 +12,9 @@ on:
 
 jobs:
   sync-install:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - run: sudo apt-get install --yes python3-setuptools python3.6-dev
       - run: pip3 install awscli --upgrade --user
       - env:
           AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"

diff --git a/.github/workflows/integration-test-mezmo.yml b/.github/workflows/integration-test-mezmo.yml
@@ -74,7 +74,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: git config --global url."https://${GITHUB_TOKEN}@github.com".insteadOf ssh://git@github.com
-      - run: make ci-sweep
       - run: make test-integration-${{ matrix.test }}
         env:
           SPLUNK_VERSION: ${{ matrix.env.SPLUNK_VERSION }}

diff --git a/.github/workflows/integration-test.yml.upstream b/.github/workflows/integration-test.yml.upstream
@@ -12,7 +12,6 @@ on:
       - "lib/**"
       - "proto/**"
       - "scripts/**"
-      - "skaffold/**"
       - "src/**"
       - "tests/**"
       - "build.rs"
@@ -88,10 +87,9 @@ jobs:
           - test: 'shutdown'
           - test: 'splunk'
           - test: 'webhdfs'
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3
-      - run: make ci-sweep
       - run: sudo npm -g install @datadog/datadog-ci
       - run: make test-integration-${{ matrix.test }}
         env:

diff --git a/.github/workflows/k8s_e2e.yml.upstream b/.github/workflows/k8s_e2e.yml.upstream
@@ -12,7 +12,6 @@ on:
       - "lib/**"
       - "proto/**"
       - "scripts/**"
-      - "skaffold/**"
       - "src/**"
       - "tests/**"
       - "build.rs"
@@ -57,7 +56,6 @@ jobs:
       CARGO_INCREMENTAL: 0
     steps:
       - uses: actions/checkout@v3
-      - run: make ci-sweep
       - uses: actions/cache@v3
         with:
           path: |

diff --git a/.github/workflows/test.yml.upstream b/.github/workflows/test.yml.upstream
@@ -52,7 +52,6 @@ jobs:
               - "lib/**"
               - "proto/**"
               - "scripts/**"
-              - "skaffold/**"
               - "src/**"
               - "tests/**"
               - "build.rs"

diff --git a/.gitignore b/.gitignore
@@ -5,8 +5,6 @@ cargo-timing*.html
 *~
 **/*.rs.bk
 .DS_Store
-.idea/
-.vscode/
 .dir-locals.el
 checkpoints/*
 miniodat
-Original file line number
+Diff line change
@@ Expand Up / @@ -368,6 +368,7 @@ nixpkgs @@
     nokia
     nslookup
     nsupdate
+    ntapi
     ntfs
     opendal
     opensearch
@@ Expand Down @@