Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #23273 to 7.11: Reorder headers for infoblox module #23302

Merged
merged 2 commits into from
Dec 29, 2020

Conversation

adriansr
Copy link
Contributor

@adriansr adriansr commented Dec 28, 2020

Cherry-pick of PR #23273 to 7.11 branch. Original message:

What does this PR do?

This reorders the syslog headers parsers for the infoblox/nios dataset so that the simpler header is picked up first.

Why is it important?

Otherwise it will fail to parse logs in the default configuration.

Checklist

  • [ ] My code follows the style guidelines of this project
  • [ ] I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Fixes #23272

* Reorder headers for infoblox module

This reorders the syslog headers parsers for the infoblox/nios dataset
so that the simpler header is picked up first. Otherwise it will
fail to properly parse logs.

Fixes elastic#23272

* Changelog entry

(cherry picked from commit 27d0f08)
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 28, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 28, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 28, 2020

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #23302 updated

  • Start Time: 2020-12-29T10:41:47.120+0000

  • Duration: 10 min 32 sec

Steps errors 2

Expand to view the steps failures

Check for changes
  • Took 0 min 3 sec . View more details on here
  • Description: make check-no-changes
Error signal
  • Took 0 min 0 sec . View more details on here
  • Description: Error 'hudson.AbortException: script returned exit code 2'

Log output

Expand to view the last 100 lines of log output

[2020-12-29T10:49:46.233Z]   REVIEWDOG: null
[2020-12-29T10:49:46.233Z]   REVIEWDOG_OPTIONS: null
[2020-12-29T10:49:46.233Z]   REVIEWDOG_REPO: null
[2020-12-29T10:49:46.233Z]   STRESS_TESTS: null
[2020-12-29T10:49:46.233Z]   STRESS_TEST_OPTIONS: null
[2020-12-29T10:49:46.233Z]   SYSTEM_TESTS: null
[2020-12-29T10:49:46.233Z]   TESTIFY_TOOL_REPO: null
[2020-12-29T10:49:46.233Z]   TEST_ENVIRONMENT: null
[2020-12-29T10:49:46.233Z]   TEST_TAGS: null,oracle
[2020-12-29T10:49:46.233Z]   TESTING_ENVIRONMENT: null
[2020-12-29T10:49:46.233Z]   TIMEOUT: null
[2020-12-29T10:49:46.233Z]   USERPROFILE: null
[2020-12-29T10:49:46.233Z]   VENV_PARAMS: null
[2020-12-29T10:49:46.233Z]   XPACK_SUFFIX: null
[2020-12-29T10:49:46.233Z]   ### END ENV DUMP ###
[2020-12-29T10:49:46.233Z]   
[2020-12-29T10:49:46.511Z] + make get-version
[2020-12-29T10:49:47.390Z] + make check-python
[2020-12-29T10:51:09.102Z] + make check-go
[2020-12-29T10:51:09.960Z] + make check-no-changes
[2020-12-29T10:51:11.332Z] diff --git a/go.mod b/go.mod
[2020-12-29T10:51:11.332Z] index fb2c671fc1..34f206052a 100644
[2020-12-29T10:51:11.332Z] --- a/go.mod
[2020-12-29T10:51:11.332Z] +++ b/go.mod
[2020-12-29T10:51:11.332Z] @@ -111,7 +111,7 @@ require (
[2020-12-29T10:51:11.332Z]  	github.com/kardianos/service v1.1.0
[2020-12-29T10:51:11.332Z]  	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
[2020-12-29T10:51:11.332Z]  	github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01
[2020-12-29T10:51:11.332Z] -	github.com/magefile/mage v1.10.0
[2020-12-29T10:51:11.332Z] +	github.com/magefile/mage v1.11.0
[2020-12-29T10:51:11.332Z]  	github.com/mailru/easyjson v0.7.1 // indirect
[2020-12-29T10:51:11.332Z]  	github.com/mattn/go-colorable v0.0.8
[2020-12-29T10:51:11.332Z]  	github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe // indirect
[2020-12-29T10:51:11.332Z] diff --git a/go.sum b/go.sum
[2020-12-29T10:51:11.332Z] index a27f2222cb..6434e16d26 100644
[2020-12-29T10:51:11.332Z] --- a/go.sum
[2020-12-29T10:51:11.332Z] +++ b/go.sum
[2020-12-29T10:51:11.332Z] @@ -504,8 +504,8 @@ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
[2020-12-29T10:51:11.332Z]  github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01 h1:EPw7R3OAyxHBCyl0oqh3lUZqS5lu3KSxzzGasE0opXQ=
[2020-12-29T10:51:11.332Z]  github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
[2020-12-29T10:51:11.332Z]  github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
[2020-12-29T10:51:11.332Z] -github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
[2020-12-29T10:51:11.332Z] -github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
[2020-12-29T10:51:11.332Z] +github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls=
[2020-12-29T10:51:11.332Z] +github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
[2020-12-29T10:51:11.332Z]  github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
[2020-12-29T10:51:11.332Z]  github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
[2020-12-29T10:51:11.332Z]  github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
[2020-12-29T10:51:12.266Z] go.mod: needs update
[2020-12-29T10:51:12.266Z] go.sum: needs update
[2020-12-29T10:51:12.266Z] Makefile:116: recipe for target 'check-no-changes' failed
[2020-12-29T10:51:12.266Z] make: *** [check-no-changes] Error 1
[2020-12-29T10:51:12.579Z] Client: Docker Engine - Community
[2020-12-29T10:51:12.579Z]  Version:           20.10.1
[2020-12-29T10:51:12.579Z]  API version:       1.41
[2020-12-29T10:51:12.579Z]  Go version:        go1.13.15
[2020-12-29T10:51:12.579Z]  Git commit:        831ebea
[2020-12-29T10:51:12.579Z]  Built:             Tue Dec 15 04:34:59 2020
[2020-12-29T10:51:12.579Z]  OS/Arch:           linux/amd64
[2020-12-29T10:51:12.579Z]  Context:           default
[2020-12-29T10:51:12.579Z]  Experimental:      true
[2020-12-29T10:51:12.579Z] 
[2020-12-29T10:51:12.580Z] Server: Docker Engine - Community
[2020-12-29T10:51:12.580Z]  Engine:
[2020-12-29T10:51:12.580Z]   Version:          20.10.1
[2020-12-29T10:51:12.580Z]   API version:      1.41 (minimum version 1.12)
[2020-12-29T10:51:12.580Z]   Go version:       go1.13.15
[2020-12-29T10:51:12.580Z]   Git commit:       f001486
[2020-12-29T10:51:12.580Z]   Built:            Tue Dec 15 04:32:40 2020
[2020-12-29T10:51:12.580Z]   OS/Arch:          linux/amd64
[2020-12-29T10:51:12.580Z]   Experimental:     false
[2020-12-29T10:51:12.580Z]  containerd:
[2020-12-29T10:51:12.580Z]   Version:          1.4.3
[2020-12-29T10:51:12.580Z]   GitCommit:        269548fa27e0089a8b8278fc4fc781d7f65a939b
[2020-12-29T10:51:12.580Z]  runc:
[2020-12-29T10:51:12.580Z]   Version:          1.0.0-rc92
[2020-12-29T10:51:12.580Z]   GitCommit:        ff819c7e9184c13b7c2607fe6c30ae19403a7aff
[2020-12-29T10:51:12.580Z]  docker-init:
[2020-12-29T10:51:12.580Z]   Version:          0.19.0
[2020-12-29T10:51:12.580Z]   GitCommit:        de40ad0
[2020-12-29T10:51:12.580Z] Unable to find image 'alpine:3.4' locally
[2020-12-29T10:51:13.512Z] 3.4: Pulling from library/alpine
[2020-12-29T10:51:13.770Z] c1e54eec4b57: Pulling fs layer
[2020-12-29T10:51:14.027Z] c1e54eec4b57: Verifying Checksum
[2020-12-29T10:51:14.027Z] c1e54eec4b57: Download complete
[2020-12-29T10:51:14.027Z] c1e54eec4b57: Pull complete
[2020-12-29T10:51:14.286Z] Digest: sha256:b733d4a32c4da6a00a84df2ca32791bb03df95400243648d8c539e7b4cce329c
[2020-12-29T10:51:14.286Z] Status: Downloaded newer image for alpine:3.4
[2020-12-29T10:51:18.307Z] Stage "Build&Test" skipped due to earlier failure(s)
[2020-12-29T10:51:18.330Z] Stage "Packaging" skipped due to earlier failure(s)
[2020-12-29T10:51:18.374Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-23302/src/github.com/elastic/beats
[2020-12-29T10:51:18.751Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-23302
[2020-12-29T10:51:18.905Z] [INFO] getVaultSecret: Getting secrets
[2020-12-29T10:51:18.962Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-12-29T10:51:19.659Z] + chmod 755 generate-build-data.sh
[2020-12-29T10:51:19.660Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-23302/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-23302/runs/2 FAILURE 572281
[2020-12-29T10:51:20.210Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-23302/runs/2/steps/?limit=10000 -o steps-info.json
[2020-12-29T10:51:20.761Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-23302/runs/2/tests/?status=FAILED -o tests-errors.json
[2020-12-29T10:51:20.761Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2020-12-29T10:51:22.103Z] Retry 2/3 exited 22, retrying in 2 seconds...

❕ Flaky test report

No test was executed to be analysed.

@adriansr adriansr merged commit 174e37e into elastic:7.11 Dec 29, 2020
@adriansr adriansr deleted the backport_23273_7.11 branch December 29, 2020 11:05
@zube zube bot removed the [zube]: Done label Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants