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

[Metricbeat] haproxy: Add support for stats exposed over HTTPS #16333

Merged
merged 11 commits into from
Feb 18, 2020
Merged

[Metricbeat] haproxy: Add support for stats exposed over HTTPS #16333

merged 11 commits into from
Feb 18, 2020

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Feb 14, 2020

This PR enables support for stats exposed via HTTPS for haproxy module.

Also, dedicated system test using real certs added.

Issue: #14579

@mtojek mtojek requested a review from a team February 14, 2020 15:39
@mtojek mtojek self-assigned this Feb 14, 2020
@mtojek mtojek changed the title [Metricbeat] haproxy: Add support for stats exposed over HTTPS WIP [Metricbeat] haproxy: Add support for stats exposed over HTTPS Feb 15, 2020
@mtojek mtojek changed the title WIP [Metricbeat] haproxy: Add support for stats exposed over HTTPS [Metricbeat] haproxy: Add support for stats exposed over HTTPS Feb 15, 2020
jsoriano
jsoriano reviewed Feb 16, 2020
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a couple of doubts, and please update the docs to mention the support of SSL and common HTTP options.

metricbeat/module/haproxy/_meta/certs/generate.sh Show resolved Hide resolved
metricbeat/module/haproxy/stat/stat.go Outdated Show resolved Hide resolved
metricbeat/module/haproxy/haproxy.go Show resolved Hide resolved
metricbeat/module/haproxy/info/info.go Outdated Show resolved Hide resolved
@jsoriano
Copy link
Member

Btw, would it make sense to add TLS support for the TCP socket too?

@mtojek
Copy link
Contributor Author

mtojek commented Feb 18, 2020

Btw, would it make sense to add TLS support for the TCP socket too?

Honestly I would wait for a customer asking for such feature, unless you think this is a basic use case.

@mtojek mtojek requested review from AleBElastic, a team and jsoriano and removed request for AleBElastic February 18, 2020 12:01
jsoriano
jsoriano approved these changes Feb 18, 2020
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WFG

@mtojek
Copy link
Contributor Author

mtojek commented Feb 18, 2020

Jenkins CI errors unrelated, so merging.

@mtojek mtojek merged commit ba3f0b0 into elastic:master Feb 18, 2020
mtojek added a commit to mtojek/beats that referenced this pull request Feb 18, 2020
@mtojek
[Metricbeat] haproxy: Add support for stats exposed over HTTPS (elast…
e3b2143 
…ic#16333)

* Prepare tests first

* Add support for stats exposed over HTTPS

* Fix

* Update CHANGELOG

* Fix: https

* Try: sleep

* Fix

* Fix: don't verify hostname in tests

* Add information to docs about SSL, HTTP

* Adjust code after review

(cherry picked from commit ba3f0b0)
@mtojek mtojek mentioned this pull request Feb 18, 2020
Merged
@mtojek mtojek added the v7.7.0 label Feb 18, 2020
mtojek added a commit that referenced this pull request Feb 18, 2020
@mtojek
Cherry-pick #16333 to 7.x: [Metricbeat] haproxy: Add support for stat…
dedf521 
…s exposed over HTTPS (#16387)

* [Metricbeat] haproxy: Add support for stats exposed over HTTPS (#16333)
kvch pushed a commit to kvch/beats that referenced this pull request Feb 20, 2020
@mtojek @kvch
[Metricbeat] haproxy: Add support for stats exposed over HTTPS (elast…
9164c1d 
…ic#16333)

* Prepare tests first

* Add support for stats exposed over HTTPS

* Fix

* Update CHANGELOG

* Fix: https

* Try: sleep

* Fix

* Fix: don't verify hostname in tests

* Add information to docs about SSL, HTTP

* Adjust code after review
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@mtojek mtojek

Labels
Metricbeat Metricbeat skip-test-plan v7.7.0 [zube]: In Progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mtojek @jsoriano