-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
jsoriano
merged 5 commits into
elastic:master
from
jsoriano:metricbeat-modules-doc-http-ssl
Sep 20, 2018
Merged
Add a different doc helper for http and tls configurations #8159
jsoriano
merged 5 commits into
elastic:master
from
jsoriano:metricbeat-modules-doc-http-ssl
Sep 20, 2018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jsoriano
force-pushed
the
metricbeat-modules-doc-http-ssl
branch
from
August 30, 2018 09:21
9246411
to
fff01e8
Compare
jsoriano
added
the
needs_backport
PR is waiting to be backported to other branches.
label
Aug 30, 2018
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
force-pushed
the
metricbeat-modules-doc-http-ssl
branch
2 times, most recently
from
August 30, 2018 10:36
3581069
to
b2cf05b
Compare
exekias
approved these changes
Aug 30, 2018
exekias
previously requested changes
Aug 30, 2018
@@ -4,7 +4,7 @@ | |||
Apache HTTPD server metricsets collected from the Apache web server. | |||
short_config: false | |||
release: ga | |||
settings: ["ssl"] | |||
settings: ["ssl", "http""] |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ouch, fixed
jsoriano
force-pushed
the
metricbeat-modules-doc-http-ssl
branch
from
August 30, 2018 11:51
b2cf05b
to
5292ddf
Compare
jsoriano
dismissed
exekias’s stale review
September 6, 2018 10:13
Requested changes were addressed, this is ready for another review.
exekias
approved these changes
Sep 19, 2018
jsoriano
added a commit
to jsoriano/beats
that referenced
this pull request
Sep 20, 2018
) (cherry picked from commit 4db5f0a)
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
) (cherry picked from commit 4db5f0a)
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
) (elastic#8372) (cherry picked from commit 613cb6d)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some modules support TLS, but not HTTP (currently I think that only
mongodb
, butmysql
,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/orssl
.