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 #19401 to 7.x: Input v2 compatibility layer #19728

Merged
merged 1 commit into from
Jul 8, 2020

Conversation

urso
Copy link

@urso urso commented Jul 8, 2020

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

  • Enhancement

What does this PR do?

This change introduces the input/v2/compat package, that provides a
compatibility layer for integration the input v2 API into existing beats
functionality.
The package provides a function for wrapping v2 inputs into a
cfgfile.RunnerFactory (used by autodiscovery, filebet module loading,
config file reloading, ....).

The current state of the full implementation can be seen here and sample inputs based on the new API.

The full list of changes will include:

Test coverage report:

gocov test ./... | gocov report
ok  	github.com/elastic/beats/v7/filebeat/input/v2/compat	0.009s	coverage: 94.6% of statements

github.com/elastic/beats/v7/filebeat/input/v2/compat/composed.go composeFactory.Create		 100.00% (11/11)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 factory.CheckConfig		 100.00% (4/4)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 factory.Create			 100.00% (4/4)
github.com/elastic/beats/v7/filebeat/input/v2/compat/composed.go composeFactory.CheckConfig	 100.00% (4/4)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 runner.Stop			 100.00% (3/3)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 runner.Start			 100.00% (3/3)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 RunnerFactory			 100.00% (1/1)
github.com/elastic/beats/v7/filebeat/input/v2/compat/composed.go Combine			 100.00% (1/1)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 @99:5				 80.00% (4/5)
github.com/elastic/beats/v7/filebeat/input/v2/compat/compat.go	 runner.String			 0.00% (0/1)
github.com/elastic/beats/v7/filebeat/input/v2/compat		 --------------------------	 94.59% (35/37)

Why is it important?

This PR only introduces the compatiblity layer which will allow use to use new input with existing Beats functionality, but also run new and old architecture in parallel.

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

@urso urso added [zube]: In Review backport Team:Services (Deprecated) Label for the former Integrations-Services team labels Jul 8, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 8, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-services (Team:Services)

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

💔 Build Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19728 opened]

  • Start Time: 2020-07-08T10:37:17.145+0000

  • Duration: 123 min 20 sec

Test stats 🧪

Test Results
Failed 0
Passed 3572
Skipped 677
Total 4249

Steps errors

Expand to view the steps failures

  • Name: Recursively delete the current directory from the workspace
    • Description: java.nio.channels.ClosedChannelException

    • Duration: 6 min 49 sec

    • Start Time: 2020-07-08T11:06:19.941+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-07-08T12:40:09.806Z] 		at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:265)
[2020-07-08T12:40:09.806Z] 		at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:80)
[2020-07-08T12:40:09.806Z] 		at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:67)
[2020-07-08T12:40:09.806Z] 		at org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47)
[2020-07-08T12:40:09.806Z] 		at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
[2020-07-08T12:40:09.806Z] 		at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-07-08T12:40:09.806Z] 		at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-07-08T12:40:09.806Z] 		at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-07-08T12:40:09.806Z] Caused: hudson.FilePath$TunneledInterruptedException
[2020-07-08T12:40:09.806Z] 	at hudson.FilePath$FileCallableWrapper.call(FilePath.java:3075)
[2020-07-08T12:40:09.806Z] 	at hudson.remoting.UserRequest.perform(UserRequest.java:212)
[2020-07-08T12:40:09.806Z] 	at hudson.remoting.UserRequest.perform(UserRequest.java:54)
[2020-07-08T12:40:09.806Z] 	at hudson.remoting.Request$2.run(Request.java:369)
[2020-07-08T12:40:09.806Z] 	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
[2020-07-08T12:40:09.806Z] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-07-08T12:40:09.806Z] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-07-08T12:40:09.806Z] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-07-08T12:40:09.806Z] 	at hudson.remoting.Engine$1.lambda$newThread$0(Engine.java:93)
[2020-07-08T12:40:09.806Z] Caused: java.lang.InterruptedException: java.lang.InterruptedException: no matches found within 10000
[2020-07-08T12:40:09.806Z] 	at hudson.FilePath.act(FilePath.java:1071)
[2020-07-08T12:40:09.806Z] 	at hudson.FilePath.act(FilePath.java:1058)
[2020-07-08T12:40:09.806Z] 	at hudson.FilePath.validateAntFileMask(FilePath.java:2684)
[2020-07-08T12:40:09.806Z] 	at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:265)
[2020-07-08T12:40:09.806Z] 	at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:80)
[2020-07-08T12:40:09.807Z] 	at org.jenkinsci.plugins.workflow.steps.CoreStep$Execution.run(CoreStep.java:67)
[2020-07-08T12:40:09.807Z] 	at org.jenkinsci.plugins.workflow.steps.SynchronousNonBlockingStepExecution.lambda$start$0(SynchronousNonBlockingStepExecution.java:47)
[2020-07-08T12:40:09.807Z] 	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
[2020-07-08T12:40:09.807Z] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-07-08T12:40:09.807Z] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-07-08T12:40:09.807Z] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-07-08T12:40:09.807Z] 	at java.lang.Thread.run(Thread.java:748)
[2020-07-08T12:40:09.807Z] No artifacts found that match the file pattern "**/build/TEST*.out". Configuration error?
[2020-07-08T12:40:10.288Z] Failed in branch Filebeat x-pack
[2020-07-08T12:40:10.323Z] + curl -sSLo codecov https://codecov.io/bash
[2020-07-08T12:40:10.590Z] + FILE=auditbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f auditbeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=filebeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f filebeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=heartbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f heartbeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=libbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f libbeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=metricbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f metricbeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=packetbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f packetbeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=winlogbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f winlogbeat/build/coverage/full.cov ]
[2020-07-08T12:40:10.590Z] + FILE=journalbeat/build/coverage/full.cov
[2020-07-08T12:40:10.590Z] + [ -f journalbeat/build/coverage/full.cov ]
[2020-07-08T12:40:12.106Z] Failed in branch Filebeat oss
[2020-07-08T12:40:13.891Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats
[2020-07-08T12:40:14.228Z] + find . -type f -name TEST*.xml -path */build/* -delete
[2020-07-08T12:40:14.252Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Lint
[2020-07-08T12:40:14.409Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-07-08T12:40:14.570Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-07-08T12:40:14.725Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Filebeat-Windows
[2020-07-08T12:40:14.878Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Filebeat-x-pack-Windows
[2020-07-08T12:40:15.035Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Filebeat-x-pack
[2020-07-08T12:40:15.197Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats/Filebeat-oss
[2020-07-08T12:40:15.647Z] + cat
[2020-07-08T12:40:15.647Z] + /usr/local/bin/runbld ./runbld-script
[2020-07-08T12:40:15.647Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-07-08T12:40:22.264Z] runbld>>> runbld started
[2020-07-08T12:40:22.264Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-07-08T12:40:24.830Z] runbld>>> The following profiles matched the job 'Beats/beats-beats-mbp/PR-19728' in order of occurrence in the config (last value wins).
[2020-07-08T12:40:25.772Z] runbld>>> Debug logging enabled.
[2020-07-08T12:40:25.772Z] runbld>>> Storing result
[2020-07-08T12:40:26.033Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-07-08T12:40:26.034Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200708124025-4D4433EC
[2020-07-08T12:40:26.034Z] runbld>>> Adding system facts.
[2020-07-08T12:40:26.991Z] runbld>>> Adding vcs info for the latest commit:  10b9d3dd9750e9f749d8760cb0a72920ba3f636c
[2020-07-08T12:40:26.992Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-07-08T12:40:26.992Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-07-08T12:40:26.992Z] Processing JUnit reports with runbld...
[2020-07-08T12:40:26.992Z] + echo 'Processing JUnit reports with runbld...'
[2020-07-08T12:40:27.566Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-07-08T12:40:27.566Z] runbld>>> DURATION: 27ms
[2020-07-08T12:40:27.566Z] runbld>>> STDOUT: 40 bytes
[2020-07-08T12:40:27.566Z] runbld>>> STDERR: 49 bytes
[2020-07-08T12:40:27.566Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-07-08T12:40:27.566Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats
[2020-07-08T12:40:28.513Z] runbld>>> Storing build metadata: 
[2020-07-08T12:40:28.513Z] runbld>>> Adding test report.
[2020-07-08T12:40:28.513Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728/src/github.com/elastic/beats
[2020-07-08T12:40:29.086Z] runbld>>> Found 11 test output files
[2020-07-08T12:40:30.484Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 4249 Skipped: 653
[2020-07-08T12:40:30.484Z] runbld>>> Storing result
[2020-07-08T12:40:30.484Z] runbld>>> FAILURES: 0
[2020-07-08T12:40:30.745Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-07-08T12:40:30.745Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200708124025-4D4433EC
[2020-07-08T12:40:30.745Z] runbld>>> Email notification disabled by environment variable.
[2020-07-08T12:40:30.745Z] runbld>>> Slack notification disabled by environment variable.
[2020-07-08T12:40:36.376Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19728
[2020-07-08T12:40:36.553Z] [INFO] getVaultSecret: Getting secrets
[2020-07-08T12:40:36.629Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-07-08T12:40:37.694Z] + chmod 755 generate-build-data.sh
[2020-07-08T12:40:37.694Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19728/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19728/runs/1 FAILURE 7400277
[2020-07-08T12:40:37.694Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19728/runs/1/steps/?limit=10000 -o steps-info.json
[2020-07-08T12:40:38.605Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19728/runs/1/tests/?status=FAILED -o tests-errors.json

@urso urso merged commit e6547fb into elastic:7.x Jul 8, 2020
@urso urso deleted the backport_19401_7.x branch July 8, 2020 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Services (Deprecated) Label for the former Integrations-Services team [zube]: Done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants