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

Add new fields to HAProxy module of Metricbeat #18523

Merged
merged 6 commits into from
Jun 2, 2020

Conversation

kvch
Copy link
Contributor

@kvch kvch commented May 14, 2020

What does this PR do?

This PR adds missing HAProxy metrics to Metricbeat.

Why is it important?

With new releases HAProxy exposed more metrics, previously not available in Metricbeat.

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.

@kvch kvch added Metricbeat Metricbeat [zube]: In Progress Team:Services (Deprecated) Label for the former Integrations-Services team labels May 14, 2020
@elasticmachine
Copy link
Collaborator

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

@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 May 14, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 14, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

Test stats 🧪

Test Results
Failed 0
Passed 3966
Skipped 935
Total 4901

@kvch kvch force-pushed the feature-metricbeat-haproxy2 branch from 56fbbe7 to e7c2361 Compare June 2, 2020 10:44
@elasticmachine
Copy link
Collaborator

💔 Build Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #18523 updated]

  • Start Time: 2020-06-02T10:44:53.755+0000

  • Duration: 70 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 3504
Skipped 813
Total 4317

Steps errors

Expand to view the steps failures

  • Name: Mage build test
    • Description: mage build test

    • Duration: 10 min 35 sec

    • Start Time: 2020-06-02T11:11:26.693+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-06-02T11:50:08.064Z] + FILE=libbeat/build/coverage/full.cov
[2020-06-02T11:50:08.064Z] + '[' -f libbeat/build/coverage/full.cov ']'
[2020-06-02T11:50:08.064Z] + for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat
[2020-06-02T11:50:08.064Z] + FILE=metricbeat/build/coverage/full.cov
[2020-06-02T11:50:08.064Z] + '[' -f metricbeat/build/coverage/full.cov ']'
[2020-06-02T11:50:08.064Z] + for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat
[2020-06-02T11:50:08.064Z] + FILE=packetbeat/build/coverage/full.cov
[2020-06-02T11:50:08.064Z] + '[' -f packetbeat/build/coverage/full.cov ']'
[2020-06-02T11:50:08.064Z] + for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat
[2020-06-02T11:50:08.064Z] + FILE=winlogbeat/build/coverage/full.cov
[2020-06-02T11:50:08.064Z] + '[' -f winlogbeat/build/coverage/full.cov ']'
[2020-06-02T11:50:08.064Z] + for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat
[2020-06-02T11:50:08.064Z] + FILE=journalbeat/build/coverage/full.cov
[2020-06-02T11:50:08.064Z] + '[' -f journalbeat/build/coverage/full.cov ']'
[2020-06-02T11:50:09.365Z] Post stage
[2020-06-02T11:50:09.374Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats
[2020-06-02T11:50:11.405Z] Starting "default"...
[2020-06-02T11:50:16.175Z] Machine "default" is already running.
[2020-06-02T11:50:17.744Z] Client:
[2020-06-02T11:50:17.744Z]  Version:      18.03.1-ce
[2020-06-02T11:50:17.744Z]  API version:  1.37
[2020-06-02T11:50:17.744Z]  Go version:   go1.9.5
[2020-06-02T11:50:17.744Z]  Git commit:   9ee9f40
[2020-06-02T11:50:17.744Z]  Built:        Thu Apr 26 07:13:02 2018
[2020-06-02T11:50:17.744Z]  OS/Arch:      darwin/amd64
[2020-06-02T11:50:17.744Z]  Experimental: false
[2020-06-02T11:50:17.744Z]  Orchestrator: swarm
[2020-06-02T11:50:17.744Z] 
[2020-06-02T11:50:17.744Z] Server: Docker Engine - Community
[2020-06-02T11:50:17.744Z]  Engine:
[2020-06-02T11:50:17.744Z]   Version:      19.03.5
[2020-06-02T11:50:17.744Z]   API version:  1.40 (minimum version 1.12)
[2020-06-02T11:50:17.744Z]   Go version:   go1.12.12
[2020-06-02T11:50:17.744Z]   Git commit:   633a0ea838
[2020-06-02T11:50:17.744Z]   Built:        Wed Nov 13 07:28:45 2019
[2020-06-02T11:50:17.744Z]   OS/Arch:      linux/amd64
[2020-06-02T11:50:17.744Z]   Experimental: false
[2020-06-02T11:50:17.744Z]  containerd:
[2020-06-02T11:50:17.744Z]   Version:     v1.2.10
[2020-06-02T11:50:17.744Z]   GitCommit:                  b34a5c8af56e510852c35414db4c1f4fa6172339
[2020-06-02T11:50:17.744Z]  runc:
[2020-06-02T11:50:17.744Z]   Version:     1.0.0-rc8+dev
[2020-06-02T11:50:17.744Z]   GitCommit:                  3e425f80a8c931f88e6d94a8c831b9d5aa481657
[2020-06-02T11:50:17.744Z]  docker-init:
[2020-06-02T11:50:17.744Z]   Version:     0.18.0
[2020-06-02T11:50:17.744Z]   GitCommit:                  fec3683
[2020-06-02T11:54:41.302Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats
[2020-06-02T11:54:41.615Z] + find . -type f -name TEST*.xml -path */build/* -delete
[2020-06-02T11:54:41.627Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Lint
[2020-06-02T11:54:41.703Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-06-02T11:54:41.780Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests
[2020-06-02T11:54:41.859Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-06-02T11:54:41.933Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-06-02T11:54:42.006Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-06-02T11:54:42.076Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-06-02T11:54:42.149Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-Windows
[2020-06-02T11:54:42.245Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-06-02T11:54:42.324Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-Python-integration-tests
[2020-06-02T11:54:42.412Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats/Metricbeat-x-pack-Mac-OS-X
[2020-06-02T11:54:42.768Z] + cat
[2020-06-02T11:54:42.768Z] + /usr/local/bin/runbld ./runbld-script
[2020-06-02T11:54:42.768Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-06-02T11:54:49.356Z] runbld>>> runbld started
[2020-06-02T11:54:49.356Z] runbld>>> 1.6.11/a66728ff8f4356963772e6e6d2069392fa06acbe
[2020-06-02T11:54:51.279Z] runbld>>> The following profiles matched the job 'Beats/beats-beats-mbp/PR-18523' in order of occurrence in the config (last value wins).
[2020-06-02T11:54:52.664Z] runbld>>> Debug logging enabled.
[2020-06-02T11:54:52.664Z] runbld>>> Storing result
[2020-06-02T11:54:52.664Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-06-02T11:54:52.664Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200602115452-FB4EBA96
[2020-06-02T11:54:52.664Z] runbld>>> Adding system facts.
[2020-06-02T11:54:53.608Z] runbld>>> Adding vcs info for the latest commit:  e7c2361a4141f8102d9bb1134e55b8cf4d6d364f
[2020-06-02T11:54:53.608Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-06-02T11:54:53.608Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-06-02T11:54:53.608Z] Processing JUnit reports with runbld...
[2020-06-02T11:54:53.608Z] + echo 'Processing JUnit reports with runbld...'
[2020-06-02T11:54:54.181Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-06-02T11:54:54.181Z] runbld>>> DURATION: 11ms
[2020-06-02T11:54:54.181Z] runbld>>> STDOUT: 40 bytes
[2020-06-02T11:54:54.181Z] runbld>>> STDERR: 49 bytes
[2020-06-02T11:54:54.181Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-06-02T11:54:54.181Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats
[2020-06-02T11:54:55.572Z] runbld>>> Storing build metadata: 
[2020-06-02T11:54:55.572Z] runbld>>> Adding test report.
[2020-06-02T11:54:55.572Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523/src/github.com/elastic/beats
[2020-06-02T11:54:56.513Z] runbld>>> Found 16 test output files
[2020-06-02T11:54:57.455Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 4317 Skipped: 729
[2020-06-02T11:54:57.715Z] runbld>>> Storing result
[2020-06-02T11:54:57.715Z] runbld>>> FAILURES: 0
[2020-06-02T11:54:57.975Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-06-02T11:54:57.975Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200602115452-FB4EBA96
[2020-06-02T11:54:57.975Z] runbld>>> Email notification disabled by environment variable.
[2020-06-02T11:54:57.975Z] runbld>>> Slack notification disabled by environment variable.
[2020-06-02T11:55:03.641Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18523
[2020-06-02T11:55:03.786Z] [INFO] getVaultSecret: Getting secrets
[2020-06-02T11:55:03.845Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-06-02T11:55:04.593Z] + chmod 755 generate-build-data.sh
[2020-06-02T11:55:04.593Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18523/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18523/runs/2 FAILURE 4210575
[2020-06-02T11:55:04.593Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18523/runs/2/steps/?limit=10000 -o steps-info.json
[2020-06-02T11:55:05.504Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18523/runs/2/tests/?status=FAILED -o tests-errors.json
[2020-06-02T11:55:05.754Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18523/runs/2/log/ -o pipeline-log.txt

@kvch kvch merged commit 153caaf into elastic:master Jun 2, 2020
kvch added a commit to kvch/beats that referenced this pull request Jun 2, 2020
## What does this PR do?

This PR adds missing HAProxy metrics to Metricbeat.

## Why is it important?

With new releases HAProxy exposed more metrics, previously not available in Metricbeat.
(cherry picked from commit 153caaf)
@kvch kvch added the v7.9.0 label Jun 2, 2020
kvch added a commit that referenced this pull request Jun 2, 2020
## What does this PR do?

This PR adds missing HAProxy metrics to Metricbeat.

## Why is it important?

With new releases HAProxy exposed more metrics, previously not available in Metricbeat.
(cherry picked from commit 153caaf)
v1v added a commit to v1v/beats that referenced this pull request Jun 2, 2020
…-stage-level

* upstream/master:
  [CI] Fix permissions should not fail (elastic#18899)
  Revert "Allow the Docker image to be run with a random user id (elastic#12905)" (elastic#18872)
  Add new fields to HAProxy module of Metricbeat (elastic#18523)
  Avoid duplicate names in dynamic_templates (elastic#18849)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Metricbeat Metricbeat Team:Services (Deprecated) Label for the former Integrations-Services team v7.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants