Merge branch 'master' into neuronull/fix_datadog_metrics_sink_integra…

…tion_tests
vectordotdev · Oct 4, 2023 · 715cf22 · 715cf22
2 parents 597305d + 2b15c63
commit 715cf22
Show file tree

Hide file tree

Showing 28 changed files with 212 additions and 121 deletions.
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
@@ -2,13 +2,13 @@
 (?:^|/)(?i)COPYRIGHT
 (?:^|/)(?i)LICEN[CS]E
 (?:^|/)3rdparty/
+(?:^|/)amplify\.yml$
 (?:^|/)go\.sum$
 (?:^|/)package(?:-lock|)\.json$
 (?:^|/)Pipfile$
 (?:^|/)pyproject.toml
 (?:^|/)requirements(?:-dev|-doc|-test|)\.txt$
 (?:^|/)vendor/
-(?:^|/)amplify\.yml$
 \.a$
 \.ai$
 \.all-contributorsrc$
@@ -78,6 +78,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$
@@ -105,4 +108,3 @@
 ^\Qwebsite/layouts/shortcodes/config/unit-tests.html\E$
 ^lib/codecs/tests/data/native_encoding/
 ignore$
-
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -840,6 +840,7 @@ posttrunc
 prebuild
 precpu
 preds
+prefs
 preinst
 preread
 prereqs
@@ -1074,6 +1075,7 @@ Takeaways
 targetgroup
 tarpit
 tcmalloc
+teconsent
 telecom
 templatable
 templateable
@@ -1133,6 +1135,8 @@ tripwires
 Trivago
 trivy
 Troutwine
+trustarc
+truste
 TRUSTSTORE
 TSDB
 Tsvg
@@ -1224,7 +1228,6 @@ wktpointer
 wmem
 woooooow
 woothee
-wor
 wordlist
 workdir
 workstreams

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -316,14 +316,9 @@ jobs:
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
-      - name: First install of DEB package.
+      - name: Verify install of DEB package.
         run: |
-          dpkg -i target/artifacts/vector_${{ env.VECTOR_VERSION }}-1_amd64.deb
-          ./scripts/verify-install.sh
-      - name: Second install of DEB package.
-        run: |
-          dpkg -i target/artifacts/vector_${{ env.VECTOR_VERSION }}-1_amd64.deb
-          ./scripts/verify-install.sh
+          ./scripts/verify-install.sh target/artifacts/vector_${{ env.VECTOR_VERSION }}-1_amd64.deb
 
   rpm-verify:
     name: Verify RPM Packages
@@ -372,14 +367,9 @@ jobs:
         with:
           name: vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-gnu
           path: target/artifacts
-      - name: First install of RPM package.
-        run: |
-          rpm -i --replacepkgs target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm
-          ./scripts/verify-install.sh
-      - name: Second install of RPM package.
+      - name: Verify install of RPM package.
         run: |
-          rpm -i --replacepkgs target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm
-          ./scripts/verify-install.sh
+          ./scripts/verify-install.sh target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm
 
   macos-verify:
     name: Verify macOS Package

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -402,7 +402,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Docker Login to ECR
         uses: docker/login-action@v3
@@ -440,7 +440,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Docker Login to ECR
         uses: docker/login-action@v3
@@ -486,7 +486,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Download SMP binary
         run: |

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
@@ -86,7 +86,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.22
+      uses: check-spelling/check-spelling@v0.0.21
       with:
         suppress_push_for_open_pull_request: 1
         checkout: true

diff --git a/.github/workflows/workload_checks.yml b/.github/workflows/workload_checks.yml
@@ -104,7 +104,7 @@ jobs:
 
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Download SMP binary
         run: |