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 a different doc helper for http and tls configurations #8159

Merged
merged 5 commits into from
Sep 20, 2018

Conversation

jsoriano
Copy link
Member

Some modules support TLS, but not HTTP (currently I think that only mongodb, but mysql, postgresql and others may need to be revisited), but we use the same doc text for both.
This change adds the possibility of using the TLS text separatedly by using two different settings tags: http and/or ssl.

@jsoriano jsoriano force-pushed the metricbeat-modules-doc-http-ssl branch from 9246411 to fff01e8 Compare August 30, 2018 09:21
@jsoriano jsoriano added the needs_backport PR is waiting to be backported to other branches. label Aug 30, 2018
@jsoriano jsoriano changed the title Added a different doc helper for http and tls configurations Add a different doc helper for http and tls configurations Aug 30, 2018
@jsoriano jsoriano force-pushed the metricbeat-modules-doc-http-ssl branch 2 times, most recently from 3581069 to b2cf05b Compare August 30, 2018 10:36
@@ -4,7 +4,7 @@
Apache HTTPD server metricsets collected from the Apache web server.
short_config: false
release: ga
settings: ["ssl"]
settings: ["ssl", "http""]
Copy link
Contributor

Choose a reason for hiding this comment

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

There is an extra " here

Copy link
Member Author

Choose a reason for hiding this comment

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

Ouch, fixed

@jsoriano jsoriano force-pushed the metricbeat-modules-doc-http-ssl branch from b2cf05b to 5292ddf Compare August 30, 2018 11:51
@jsoriano jsoriano dismissed exekias’s stale review September 6, 2018 10:13

Requested changes were addressed, this is ready for another review.

@jsoriano jsoriano merged commit 4db5f0a into elastic:master Sep 20, 2018
jsoriano added a commit to jsoriano/beats that referenced this pull request Sep 20, 2018
@jsoriano jsoriano added v6.5.0 and removed needs_backport PR is waiting to be backported to other branches. labels Sep 20, 2018
jsoriano added a commit to jsoriano/beats that referenced this pull request Sep 20, 2018
jsoriano added a commit that referenced this pull request Sep 20, 2018
jsoriano added a commit that referenced this pull request Sep 20, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants