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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick #20652 to 7.x: [Filebeat][auditd] Fix event types and categories to comply with ECS #20793

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Cherry-pick #20652 to 7.x: [Filebeat][auditd] Fix event types and categories to comply with ECS #20793

merged 1 commit into from
Aug 27, 2020

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Aug 26, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #20652 to 7.x branch. Original message:

What does this PR do?

Sets correct event.category and event.type fields where incorrect event.type fields were set.

Why is it important?

The auditd module was using several event.type values that are not in ECS.

https://www.elastic.co/guide/en/ecs/current/ecs-allowed-values-event-type.html

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

Closes #20411

@marc-gr
[Filebeat][auditd] Fix event types and categories to comply with ECS (e…
df0552b 
…lastic#20652)

* Fix event types and categories to comply with ECS

* Add CHANGELOG entry

* Regenerate test files

(cherry picked from commit 8d77c1c)
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Aug 26, 2020
@botelastic
Copy link

botelastic bot commented Aug 26, 2020

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

💔 Tests Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20793 opened]

  • Start Time: 2020-08-26T09:04:14.984+0000

  • Duration: 55 min 12 sec

Test stats 🧪

Test Results
Failed 1
Passed 5551
Skipped 830
Total 6382

Test errors

Expand to view the tests failures

  • Name: Build and Test / Filebeat oss / test_default_settings – filebeat.tests.system.test_autodiscover.TestAutodiscover

    • Age: 1
    • Duration: 90.003
    • Error Details: Failed: Timeout >90.0s

Steps errors

Expand to view the steps failures

  • Name: Mage build test

    • Description: mage build test

    • Duration: 29 min 59 sec

    • Start Time: 2020-08-26T09:28:22.719+0000

    • log

Log output

Expand to view the last 100 lines of log output 

[2020-08-26T09:57:54.999Z]  Built:             Mon Jun 22 15:45:36 2020
[2020-08-26T09:57:54.999Z]  OS/Arch:           linux/amd64
[2020-08-26T09:57:54.999Z]  Experimental:      false
[2020-08-26T09:57:54.999Z] 
[2020-08-26T09:57:54.999Z] Server: Docker Engine - Community
[2020-08-26T09:57:54.999Z]  Engine:
[2020-08-26T09:57:54.999Z]   Version:          19.03.12
[2020-08-26T09:57:54.999Z]   API version:      1.40 (minimum version 1.12)
[2020-08-26T09:57:54.999Z]   Go version:       go1.13.10
[2020-08-26T09:57:54.999Z]   Git commit:       48a66213fe
[2020-08-26T09:57:54.999Z]   Built:            Mon Jun 22 15:44:07 2020
[2020-08-26T09:57:54.999Z]   OS/Arch:          linux/amd64
[2020-08-26T09:57:54.999Z]   Experimental:     false
[2020-08-26T09:57:54.999Z]  containerd:
[2020-08-26T09:57:54.999Z]   Version:          1.2.13
[2020-08-26T09:57:54.999Z]   GitCommit:        7ad184331fa3e55e52b890ea95e65ba581ae3429
[2020-08-26T09:57:54.999Z]  runc:
[2020-08-26T09:57:54.999Z]   Version:          1.0.0-rc10
[2020-08-26T09:57:54.999Z]   GitCommit:        dc9208a3303feef5b3839f4323d9beb36df0a9dd
[2020-08-26T09:57:54.999Z]  docker-init:
[2020-08-26T09:57:54.999Z]   Version:          0.18.0
[2020-08-26T09:57:54.999Z]   GitCommit:        fec3683
[2020-08-26T09:57:54.999Z] Unable to find image 'alpine:3.4' locally
[2020-08-26T09:57:55.571Z] 3.4: Pulling from library/alpine
[2020-08-26T09:57:55.571Z] c1e54eec4b57: Pulling fs layer
[2020-08-26T09:57:55.833Z] c1e54eec4b57: Verifying Checksum
[2020-08-26T09:57:55.833Z] c1e54eec4b57: Download complete
[2020-08-26T09:57:56.093Z] c1e54eec4b57: Pull complete
[2020-08-26T09:57:56.093Z] Digest: sha256:b733d4a32c4da6a00a84df2ca32791bb03df95400243648d8c539e7b4cce329c
[2020-08-26T09:57:56.093Z] Status: Downloaded newer image for alpine:3.4
[2020-08-26T09:57:58.337Z] + python .ci/scripts/pre_archive_test.py
[2020-08-26T09:57:59.729Z] Copy ./x-pack/filebeat/build into build/x-pack/filebeat/build
[2020-08-26T09:57:59.755Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/build
[2020-08-26T09:57:59.810Z] Recording test results
[2020-08-26T09:58:02.361Z] Stashed 4 file(s)
[2020-08-26T09:58:02.405Z] Archiving artifacts
[2020-08-26T09:58:03.286Z] + python .ci/scripts/search_system_tests.py
[2020-08-26T09:58:03.320Z] [INFO] system-tests='build/x-pack/filebeat/build/system-tests'. If no empty then let's create a tarball
[2020-08-26T09:58:03.705Z] + tar --version
[2020-08-26T09:58:04.097Z] + tar --exclude=x-pack-filebeat--system-tests-linux.tgz -czf x-pack-filebeat--system-tests-linux.tgz build/x-pack/filebeat/build/system-tests
[2020-08-26T09:58:19.054Z] Archiving artifacts
[2020-08-26T09:58:38.356Z] [INFO] unstashV2: JOB_GCS_BUCKET is set. bucket param got precedency instead.
[2020-08-26T09:58:38.401Z] [INFO] unstashV2: JOB_GCS_CREDENTIALS is set. credentialsId param got precedency instead.
[2020-08-26T09:58:38.478Z] [Google Cloud Storage Plugin] Found 1 files to download from pattern: gs://beats-ci-temp/Beats/beats/PR-20793-1/source/source.tgz
[2020-08-26T09:58:38.505Z] [Google Cloud Storage Plugin] Downloading: Beats/beats/PR-20793-1/source/source.tgz to local path: /var/lib/jenkins/workspace/Beats_beats_PR-20793/source.tgz
[2020-08-26T09:58:53.005Z] + tar --version
[2020-08-26T09:58:53.321Z] + tar -xpf source.tgz
[2020-08-26T09:59:03.678Z] + rm source.tgz
[2020-08-26T09:59:03.702Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats
[2020-08-26T09:59:03.758Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Lint
[2020-08-26T09:59:03.928Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-08-26T09:59:04.093Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Filebeat-Windows
[2020-08-26T09:59:04.254Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Filebeat-x-pack-Windows
[2020-08-26T09:59:04.417Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-08-26T09:59:04.593Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Filebeat-oss
[2020-08-26T09:59:04.758Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats/Filebeat-x-pack
[2020-08-26T09:59:05.284Z] + cat
[2020-08-26T09:59:05.284Z] + /usr/local/bin/runbld ./runbld-script --job-name elastic+beats+pull-request
[2020-08-26T09:59:05.284Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-08-26T09:59:11.876Z] runbld>>> runbld started
[2020-08-26T09:59:11.876Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-08-26T09:59:12.817Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-08-26T09:59:13.129Z] runbld>>> Matches in the system config:
[2020-08-26T09:59:13.129Z] runbld>>> - Matched ^elastic\+beats
[2020-08-26T09:59:13.129Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-08-26T09:59:14.069Z] runbld>>> Debug logging enabled.
[2020-08-26T09:59:14.329Z] runbld>>> Storing result
[2020-08-26T09:59:14.661Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-08-26T09:59:14.661Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200826095914-6B0A90CE
[2020-08-26T09:59:14.661Z] runbld>>> Adding system facts.
[2020-08-26T09:59:15.232Z] runbld>>> Adding vcs info for the latest commit:  df0552bdc6542d1568feb4b9fd77e64deb344825
[2020-08-26T09:59:15.232Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-08-26T09:59:15.491Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-08-26T09:59:15.491Z] + echo 'Processing JUnit reports with runbld...'
[2020-08-26T09:59:15.491Z] Processing JUnit reports with runbld...
[2020-08-26T09:59:15.750Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-08-26T09:59:15.750Z] runbld>>> DURATION: 48ms
[2020-08-26T09:59:15.750Z] runbld>>> STDOUT: 40 bytes
[2020-08-26T09:59:15.750Z] runbld>>> STDERR: 49 bytes
[2020-08-26T09:59:15.750Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-08-26T09:59:15.750Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-20793
[2020-08-26T09:59:16.691Z] runbld>>> Storing build metadata: 
[2020-08-26T09:59:16.691Z] runbld>>> Adding test report.
[2020-08-26T09:59:16.691Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-20793/src/github.com/elastic/beats
[2020-08-26T09:59:17.629Z] runbld>>> Found 16 test output files
[2020-08-26T09:59:19.014Z] runbld>>> Test output logs contained: Errors: 0 Failures: 1 Tests: 6382 Skipped: 804
[2020-08-26T09:59:19.014Z] runbld>>> Storing result
[2020-08-26T09:59:19.014Z] runbld>>> FAILURES: 1
[2020-08-26T09:59:19.274Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-08-26T09:59:19.274Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200826095914-6B0A90CE
[2020-08-26T09:59:19.534Z] runbld>>> Email notification disabled by environment variable.
[2020-08-26T09:59:19.534Z] runbld>>> Slack notification disabled by environment variable.
[2020-08-26T09:59:25.667Z] Running on worker-1244230 in /var/lib/jenkins/workspace/Beats_beats_PR-20793
[2020-08-26T09:59:25.809Z] [INFO] getVaultSecret: Getting secrets
[2020-08-26T09:59:25.893Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-08-26T09:59:28.242Z] + chmod 755 generate-build-data.sh
[2020-08-26T09:59:28.242Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20793/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20793/runs/1 FAILURE 3311845
[2020-08-26T09:59:28.242Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20793/runs/1/steps/?limit=10000 -o steps-info.json
[2020-08-26T09:59:29.692Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20793/runs/1/tests/?status=FAILED -o tests-errors.json
[2020-08-26T09:59:30.396Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20793/runs/1/log/ -o pipeline-log.txt

@marc-gr marc-gr merged commit 328e8a5 into elastic:7.x Aug 27, 2020
@marc-gr marc-gr deleted the backport_20652_7.x branch August 27, 2020 08:13
@zube zube bot removed the [zube]: Done label Nov 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marc-gr @elasticmachine @kaiyan-sheng