Merge remote-tracking branch 'upstream/7.17' into v1v-patch-1

* upstream/7.17: (30 commits) [7.17](backport elastic#29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (elastic#30000) [Heartbeat] Change size of data on ICMP packet (elastic#29948) (elastic#29978) Add clarification about enableing dashboard loading (elastic#29985) (elastic#29989) Improve aws-s3 gzip file detection to avoid false negatives (elastic#29969) (elastic#29974) ci: docker login step for pulling then pushing (elastic#29960) (elastic#29963) x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (elastic#29410) (elastic#29958) [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (elastic#29956) [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (elastic#29938) [7.17](backport elastic#29913) [Metricbeat] gcp.gke: fix overview dashboard (elastic#29914) [7.17](backport elastic#29605) Fix annotation enrichment (elastic#29834) [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (elastic#29922) [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (elastic#29904) [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport elastic#29413) (elastic#29896) Merge pull request from GHSA-rj4h-hqvq-cc6q [7.17](backport elastic#29681) Change docker image from CentOS 7 to Ubuntu 20.04 (elastic#29817) Fix YAML indentation in `parsers` examples (elastic#29663) (elastic#29894) [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (elastic#29864) Fix Filebeat dissect processor field tokenization in documentation (elastic#29680) (elastic#29883) Enable require_alias for Bulk requests for all actions when target is a write alias (elastic#29879) Update Index template loading guide to use the correct endpoint (elastic#29869) (elastic#29877) ...
leweafan · Jan 26, 2022 · 82291ab · 82291ab
2 parents f447196 + daf13cf
commit 82291ab
Show file tree

Hide file tree

Showing 90 changed files with 1,925 additions and 592 deletions.
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -307,8 +307,6 @@ def tagAndPush(Map args = [:]) {
     tagName = "pr-${env.CHANGE_ID}"
   }
 
-  dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
-
   // supported tags
   def tags = [tagName, "${env.GIT_BASE_COMMIT}"]
   if (!isPR() && aliasVersion != "") {
@@ -380,6 +378,7 @@ def release(){
     withEnv([
       "DEV=true"
     ]) {
+      dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
       dir("${env.BEATS_FOLDER}") {
         sh(label: "Release ${env.BEATS_FOLDER} ${env.PLATFORMS}", script: 'mage package')
       }

diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh
@@ -21,7 +21,7 @@ function dockerPullCommonImages() {
   docker.elastic.co/observability-ci/database-enterprise:12.2.0.1
   docker.elastic.co/beats-dev/fpm:1.11.0
   golang:1.14.12-stretch
-  centos:7
+  ubuntu:20.04
   "
   for image in ${DOCKER_IMAGES} ; do
     (retry 2 docker pull ${image}) || echo "Error pulling ${image} Docker image. Continuing."

diff --git a/.github/workflows/macos-auditbeat.yml b/.github/workflows/macos-auditbeat.yml
@@ -0,0 +1,31 @@
+name: auditbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-auditbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'auditbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-filebeat.yml b/.github/workflows/macos-filebeat.yml
@@ -0,0 +1,31 @@
+name: filebeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-filebeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'filebeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-heartbeat.yml b/.github/workflows/macos-heartbeat.yml
@@ -0,0 +1,31 @@
+name: heartbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-heartbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'heartbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-metricbeat.yml b/.github/workflows/macos-metricbeat.yml
@@ -0,0 +1,31 @@
+name: metricbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-metricbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'metricbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && echo "See https://github.com/elastic/beats/issues/29038"
diff --git a/.github/workflows/macos-packetbeat.yml b/.github/workflows/macos-packetbeat.yml
@@ -0,0 +1,31 @@
+name: packetbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-packetbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'packetbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-xpack-auditbeat.yml b/.github/workflows/macos-xpack-auditbeat.yml
@@ -0,0 +1,31 @@
+name: x-pack-auditbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-xpack-auditbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'x-pack/auditbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-xpack-filebeat.yml b/.github/workflows/macos-xpack-filebeat.yml
@@ -0,0 +1,31 @@
+name: x-pack-filebeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-xpack-filebeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'x-pack/filebeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-xpack-functionbeat.yml b/.github/workflows/macos-xpack-functionbeat.yml
@@ -0,0 +1,31 @@
+name: x-pack-functionbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-xpack-functionbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'x-pack/functionbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-xpack-heartbeat.yml b/.github/workflows/macos-xpack-heartbeat.yml
@@ -0,0 +1,31 @@
+name: x-pack-heartbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-xpack-heartbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'x-pack/heartbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-xpack-metricbeat.yml b/.github/workflows/macos-xpack-metricbeat.yml
@@ -0,0 +1,31 @@
+name: x-pack-metricbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-xpack-metricbeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'x-pack/metricbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest
diff --git a/.github/workflows/macos-xpack-osquerybeat.yml b/.github/workflows/macos-xpack-osquerybeat.yml
@@ -0,0 +1,31 @@
+name: x-pack-heartbeat
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/macos-xpack-osquerybeat.yml'
+  push:
+    branches:
+      - master
+      - 7.1*
+      - 8.*
+
+env:
+  BEAT_MODULE: 'x-pack/heartbeat'
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetch Go version from .go-version
+      run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+    - uses: actions/setup-go@v2
+      with:
+        go-version: ${{ env.GO_VERSION }}
+    - name: Install dependencies
+      run:  go get -u github.com/magefile/mage
+    - name: Run build
+      run: cd ${{ env.BEAT_MODULE }} && mage build
+    - name: Run test
+      run: cd ${{ env.BEAT_MODULE }} && mage unitTest