From 2923e008aa2e87366d68df7e833f940deb686631 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 22 Aug 2022 16:47:06 +0100 Subject: [PATCH 1/4] action: checks for metricbeat and x-pack/metricbeat --- .github/workflows/check-metricbeat.yml | 28 ++++++++++++++++++++ .github/workflows/check-xpack-metricbeat.yml | 27 +++++++++++++++++++ .github/workflows/opentelemetry.yml | 4 ++- metricbeat/Jenkinsfile.yml | 8 ------ x-pack/metricbeat/Jenkinsfile.yml | 8 ------ 5 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/check-metricbeat.yml create mode 100644 .github/workflows/check-xpack-metricbeat.yml diff --git a/.github/workflows/check-metricbeat.yml b/.github/workflows/check-metricbeat.yml new file mode 100644 index 00000000000..36d470647d4 --- /dev/null +++ b/.github/workflows/check-metricbeat.yml @@ -0,0 +1,28 @@ +name: check-metricbeat + +on: + pull_request: + paths: + - '.github/workflows/check-metricbeat.yml' + - 'metricbeat/**' + - 'x-pack/metricbeat/**' + +env: + BEAT_MODULE: 'metricbeat' + +jobs: + check: + runs-on: ubuntu-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: Run check/update + run: | + export PATH=$PATH:$(go env GOPATH)/bin + go install github.com/magefile/mage@latest + make -C ${{ env.BEAT_MODULE }} check update + make check-no-changes diff --git a/.github/workflows/check-xpack-metricbeat.yml b/.github/workflows/check-xpack-metricbeat.yml new file mode 100644 index 00000000000..c46d3cc164f --- /dev/null +++ b/.github/workflows/check-xpack-metricbeat.yml @@ -0,0 +1,27 @@ +name: check-x-pack-metricbeat + +on: + pull_request: + paths: + - '.github/workflows/check-xpack-metricbeat.yml' + - 'x-pack/metricbeat/**' + - 'metricbeat/**' + +env: + BEAT_MODULE: 'x-pack/metricbeat' + +jobs: + check: + runs-on: ubuntu-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: Run check/update + uses: magefile/mage-action@v2 + with: + args: check update + workdir: "${{ env.BEAT_MODULE }}" diff --git a/.github/workflows/opentelemetry.yml b/.github/workflows/opentelemetry.yml index 5e48b49ff8b..4c7984e6ba2 100644 --- a/.github/workflows/opentelemetry.yml +++ b/.github/workflows/opentelemetry.yml @@ -3,8 +3,10 @@ name: OpenTelemetry Export Trace on: workflow_run: workflows: - - check-x-pack-packetbeat + - check-metricbeat - check-packetbeat + - check-x-pack-metricbeat + - check-x-pack-packetbeat - golangci-lint - auditbeat - filebeat diff --git a/metricbeat/Jenkinsfile.yml b/metricbeat/Jenkinsfile.yml index 8832fe259fc..29736ea8c42 100644 --- a/metricbeat/Jenkinsfile.yml +++ b/metricbeat/Jenkinsfile.yml @@ -13,14 +13,6 @@ when: tags: true ## for all the tags platform: "immutable && ubuntu-18" ## default label for all the stages stages: - checks: - make: | - make -C metricbeat check; - make -C metricbeat update; - make -C x-pack/metricbeat check; - make -C x-pack/metricbeat update; - make check-no-changes; - stage: checks unitTest: mage: "mage build unitTest" stage: mandatory diff --git a/x-pack/metricbeat/Jenkinsfile.yml b/x-pack/metricbeat/Jenkinsfile.yml index fd3e5fb347b..a61132526c8 100644 --- a/x-pack/metricbeat/Jenkinsfile.yml +++ b/x-pack/metricbeat/Jenkinsfile.yml @@ -13,14 +13,6 @@ when: tags: true ## for all the tags platform: "immutable && ubuntu-18" ## default label for all the stages stages: - checks: - make: | - make -C x-pack/metricbeat check; - make -C x-pack/metricbeat update; - make -C metricbeat check; - make -C metricbeat update; - make check-no-changes; - stage: checks unitTest: mage: "mage build unitTest" stage: mandatory From 577845ad9dfb89941bcc92b9315d7c191e673491 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 23 Aug 2022 10:16:39 +0100 Subject: [PATCH 2/4] As stated in the code review use v3 and avoid latest in favour of go.sum --- .github/workflows/check-metricbeat.yml | 6 +++--- .github/workflows/check-xpack-metricbeat.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-metricbeat.yml b/.github/workflows/check-metricbeat.yml index 36d470647d4..75ea5f6cc57 100644 --- a/.github/workflows/check-metricbeat.yml +++ b/.github/workflows/check-metricbeat.yml @@ -14,15 +14,15 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Fetch Go version from .go-version run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} - name: Run check/update run: | export PATH=$PATH:$(go env GOPATH)/bin - go install github.com/magefile/mage@latest + go install github.com/magefile/mage make -C ${{ env.BEAT_MODULE }} check update make check-no-changes diff --git a/.github/workflows/check-xpack-metricbeat.yml b/.github/workflows/check-xpack-metricbeat.yml index c46d3cc164f..e6f50581ae1 100644 --- a/.github/workflows/check-xpack-metricbeat.yml +++ b/.github/workflows/check-xpack-metricbeat.yml @@ -14,10 +14,10 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Fetch Go version from .go-version run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: ${{ env.GO_VERSION }} - name: Run check/update From bddfd96d7fd6cf4c060376c24da5f89590280a46 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 23 Aug 2022 14:46:08 +0100 Subject: [PATCH 3/4] Apply suggestions from code review --- .github/workflows/check-metricbeat.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/check-metricbeat.yml b/.github/workflows/check-metricbeat.yml index 75ea5f6cc57..54f4753531d 100644 --- a/.github/workflows/check-metricbeat.yml +++ b/.github/workflows/check-metricbeat.yml @@ -22,7 +22,6 @@ jobs: go-version: ${{ env.GO_VERSION }} - name: Run check/update run: | - export PATH=$PATH:$(go env GOPATH)/bin go install github.com/magefile/mage make -C ${{ env.BEAT_MODULE }} check update make check-no-changes From ba3705ecfaa449ec1cfa1dd40d8f43ab413aecaf Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 23 Aug 2022 14:49:25 +0100 Subject: [PATCH 4/4] Update .github/workflows/check-xpack-metricbeat.yml --- .github/workflows/check-xpack-metricbeat.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-xpack-metricbeat.yml b/.github/workflows/check-xpack-metricbeat.yml index e6f50581ae1..e3bd576c386 100644 --- a/.github/workflows/check-xpack-metricbeat.yml +++ b/.github/workflows/check-xpack-metricbeat.yml @@ -21,7 +21,7 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - name: Run check/update - uses: magefile/mage-action@v2 - with: - args: check update - workdir: "${{ env.BEAT_MODULE }}" + run: | + go install github.com/magefile/mage + make -C ${{ env.BEAT_MODULE }} check update + make check-no-changes