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

Give precedence to monitoring reporter hosts over output hosts #17991

Merged
merged 7 commits into from
May 5, 2020

Conversation

ycombinator
Copy link
Contributor

@ycombinator ycombinator commented Apr 25, 2020

What does this PR do?

Ensures that monitoring reporter hosts, if set, get total precedence over their corresponding output reporter hosts.

Why is it important?

When monitoring reporter hosts are configured, they should get precedence over their corresponding output hosts. The two lists of hosts should not be merged.

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

@ycombinator ycombinator added bug needs_backport PR is waiting to be backported to other branches. Feature:Stack Monitoring v8.0.0 Team:Services (Deprecated) Label for the former Integrations-Services team v7.8.0 v7.7.1 labels Apr 25, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/stack-monitoring (Stack monitoring)

@elasticmachine
Copy link
Collaborator

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

@urso
Copy link

urso commented Apr 30, 2020

Change looks ok. But pleaes check changelog and the intake job failing.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 30, 2020

💔 Build Failed

Pipeline View Test View Changes Artifacts preview stats

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 7611
Skipped 1201
Total 8812

Log output

Expand to view the last 100 lines of log output

[2020-05-04T23:28:38.341Z] 	at org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution.access$100(TimeoutStepExecution.java:38)
[2020-05-04T23:28:38.341Z] 	at org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution$1.run(TimeoutStepExecution.java:134)
[2020-05-04T23:28:38.341Z] 	at jenkins.security.ImpersonatingScheduledExecutorService$1.run(ImpersonatingScheduledExecutorService.java:58)
[2020-05-04T23:28:38.341Z] 	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
[2020-05-04T23:28:38.341Z] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-05-04T23:28:38.342Z] 	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180)
[2020-05-04T23:28:38.342Z] 	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293)
[2020-05-04T23:28:38.342Z] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-05-04T23:28:38.342Z] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-05-04T23:28:38.342Z] 	at java.lang.Thread.run(Thread.java:748)
[2020-05-04T23:28:38.342Z] 
[2020-05-04T23:28:38.475Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats
[2020-05-04T23:28:38.834Z] + find . -type f -name TEST*.xml -path */build/* -delete
[2020-05-04T23:28:39.129Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Lint
[2020-05-04T23:28:39.441Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Winlogbeat-oss
[2020-05-04T23:28:39.726Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Elastic-Agent-x-pack
[2020-05-04T23:28:40.039Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Elastic-Agent-x-pack-Windows
[2020-05-04T23:28:40.329Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Dockerlogbeat
[2020-05-04T23:28:40.661Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Journalbeat-oss
[2020-05-04T23:28:40.917Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Generators-Metricbeat-Linux
[2020-05-04T23:28:41.174Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Functionbeat-x-pack
[2020-05-04T23:28:41.541Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-05-04T23:28:41.884Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-05-04T23:28:42.186Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Winlogbeat-Windows-x-pack
[2020-05-04T23:28:42.473Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Heartbeat-oss
[2020-05-04T23:28:42.793Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Auditbeat-x-pack
[2020-05-04T23:28:43.076Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Filebeat-Windows
[2020-05-04T23:28:43.355Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Libbeat-x-pack
[2020-05-04T23:28:43.604Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Auditbeat-Linux
[2020-05-04T23:28:43.842Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Packetbeat-oss
[2020-05-04T23:28:44.031Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-Windows
[2020-05-04T23:28:44.290Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Elastic-Agent-Mac-OS-X
[2020-05-04T23:28:44.540Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Filebeat-x-pack
[2020-05-04T23:28:44.891Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-05-04T23:28:45.125Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-05-04T23:28:45.361Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Auditbeat-crosscompile
[2020-05-04T23:28:45.585Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Filebeat-oss
[2020-05-04T23:28:45.874Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests
[2020-05-04T23:28:46.063Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Winlogbeat-Windows
[2020-05-04T23:28:46.255Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-Python-integration-tests
[2020-05-04T23:28:46.500Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Libbeat-oss
[2020-05-04T23:28:46.665Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Generators-Beat-Linux
[2020-05-04T23:28:46.841Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Heartbeat-Mac-OS-X
[2020-05-04T23:28:46.999Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Libbeat-crosscompile
[2020-05-04T23:28:47.170Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Functionbeat-Mac-OS-X-x-pack
[2020-05-04T23:28:47.309Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Libbeat-stress-tests
[2020-05-04T23:28:47.518Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Auditbeat-Mac-OS-X
[2020-05-04T23:28:47.683Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Heartbeat-Windows
[2020-05-04T23:28:47.856Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Generators-Metricbeat-Mac-OS-X
[2020-05-04T23:28:48.058Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Functionbeat-Windows
[2020-05-04T23:28:48.255Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-05-04T23:28:48.444Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Auditbeat-Windows
[2020-05-04T23:28:48.963Z] + cat
[2020-05-04T23:28:48.963Z] + /usr/local/bin/runbld ./runbld-script
[2020-05-04T23:28:48.963Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-05-04T23:28:55.590Z] runbld>>> runbld started
[2020-05-04T23:28:55.590Z] runbld>>> 1.6.11/a66728ff8f4356963772e6e6d2069392fa06acbe
[2020-05-04T23:28:56.983Z] runbld>>> The following profiles matched the job 'Beats/beats-beats-mbp/PR-17991' in order of occurrence in the config (last value wins).
[2020-05-04T23:28:58.371Z] runbld>>> Debug logging enabled.
[2020-05-04T23:28:58.371Z] runbld>>> Storing result
[2020-05-04T23:28:58.371Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-05-04T23:28:58.371Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200504232857-564EEB33
[2020-05-04T23:28:58.371Z] runbld>>> Adding system facts.
[2020-05-04T23:28:59.320Z] runbld>>> Adding vcs info for the latest commit:  d850fd2fb204c396640528114b4dd6c1536b7799
[2020-05-04T23:28:59.320Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-05-04T23:28:59.320Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-05-04T23:28:59.320Z] Processing JUnit reports with runbld...
[2020-05-04T23:28:59.320Z] + echo 'Processing JUnit reports with runbld...'
[2020-05-04T23:28:59.900Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-05-04T23:28:59.900Z] runbld>>> DURATION: 12ms
[2020-05-04T23:28:59.900Z] runbld>>> STDOUT: 40 bytes
[2020-05-04T23:28:59.900Z] runbld>>> STDERR: 49 bytes
[2020-05-04T23:28:59.900Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-05-04T23:28:59.900Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats
[2020-05-04T23:29:00.844Z] runbld>>> Storing build metadata: 
[2020-05-04T23:29:00.844Z] runbld>>> Adding test report.
[2020-05-04T23:29:00.844Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats
[2020-05-04T23:29:02.243Z] runbld>>> Found 98 test output files
[2020-05-04T23:29:02.842Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-05-04T23:29:02.842Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-05-04T23:29:02.842Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-05-04T23:29:02.842Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-05-04T23:29:02.842Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-05-04T23:29:02.842Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-cloudfoundry.xml
[2020-05-04T23:29:03.414Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests/metricbeat/build/TEST-go-integration-windows.xml
[2020-05-04T23:29:03.414Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests/metricbeat/build/TEST-go-integration-graphite.xml
[2020-05-04T23:29:03.987Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 8662 Skipped: 1001
[2020-05-04T23:29:03.987Z] runbld>>> Storing result
[2020-05-04T23:29:03.987Z] runbld>>> FAILURES: 0
[2020-05-04T23:29:04.249Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-05-04T23:29:04.249Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200504232857-564EEB33
[2020-05-04T23:29:04.249Z] runbld>>> Email notification disabled by environment variable.
[2020-05-04T23:29:04.249Z] runbld>>> Slack notification disabled by environment variable.
[2020-05-04T23:29:09.978Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-17991
[2020-05-04T23:29:10.205Z] [INFO] getVaultSecret: Getting secrets
[2020-05-04T23:29:10.311Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-05-04T23:29:11.236Z] + chmod 755 generate-build-data.sh
[2020-05-04T23:29:11.237Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-17991/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-17991/runs/10 ABORTED 7435093
[2020-05-04T23:29:11.787Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-17991/runs/10/steps/?limit=10000 -o steps-info.json
[2020-05-04T23:29:13.131Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-17991/runs/10/tests/?status=FAILED -o tests-errors.json

@ycombinator
Copy link
Contributor Author

CI failures are unrelated. Merging.

@ycombinator ycombinator removed the needs_backport PR is waiting to be backported to other branches. label May 5, 2020
ycombinator added a commit that referenced this pull request May 6, 2020
… (#18301)

* Give precedence to monitoring reporter hosts over output hosts

* Add CHANGELOG entry

* Removing debugging statements

* No delete

* Helper function

* Make new config if nil

* Formatting code
ycombinator added a commit that referenced this pull request May 6, 2020
… (#18215)

* Give precedence to monitoring reporter hosts over output hosts

* Add CHANGELOG entry

* Removing debugging statements

* No delete

* Helper function

* Make new config if nil

* Formatting code
ycombinator added a commit that referenced this pull request May 7, 2020
…17991) (#18216)

* Give precedence to monitoring reporter hosts over output hosts (#17991)

* Give precedence to monitoring reporter hosts over output hosts

* Add CHANGELOG entry

* Removing debugging statements

* No delete

* Helper function

* Make new config if nil

* Formatting code

* Clean up CHANGELOG
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…lastic#17991) (elastic#18216)

* Give precedence to monitoring reporter hosts over output hosts (elastic#17991)

* Give precedence to monitoring reporter hosts over output hosts

* Add CHANGELOG entry

* Removing debugging statements

* No delete

* Helper function

* Make new config if nil

* Formatting code

* Clean up CHANGELOG
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.

Monitoring data sent to the wrong endpoint (internal collection)
4 participants