Add SSL/TLS support to nginx input plugin #2883
Merged
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
Import required packages
bobmshannon
force-pushed
the
enhancement/nginx_ssl_config
branch
from
8ec7396
to
30ee576
Compare
|
Thanks the the PR, we need to make sure we don't create a new transport per interval. I recently fixed this in a few other plugin in #2782. |
bobmshannon
force-pushed
the
enhancement/nginx_ssl_config
branch
2 times, most recently
from
d54552c
to
9424e64
Compare
|
Hey @danielnelson, thanks for the feedback. I've updated this PR so that the transport is re-used, using the apache input plugin as an example for doing so. |
bobmshannon
force-pushed
the
enhancement/nginx_ssl_config
branch
from
9424e64
to
851493a
Compare
bobmshannon
force-pushed
the
enhancement/nginx_ssl_config
branch
from
851493a
to
5eb122f
Compare
danielnelson
suggested changes
Jun 7, 2017
plugins/inputs/nginx/nginx.go
Outdated
| ## An array of Nginx stub_status URI to gather stats. | ||
| urls = ["http://localhost/status"] | ||
| # Read Nginx's basic status information (ngx_http_stub_status_module) | ||
| [[inputs.nginx]] |
There was a problem hiding this comment.
Remove the toml table header here, it is added automatically when outputting the sample config.
plugins/inputs/nginx/nginx.go
Outdated
| # TLS/SSL configuration | ||
| ssl_ca = "var/security/ca.pem" | ||
| ssl_cert = "var/security/cert.cer" | ||
| ssl_key = "var/security/key.key" |
There was a problem hiding this comment.
Change the paths to /etc/telegraf/<file> to match other plugins.
plugins/inputs/nginx/nginx.go
Outdated
| insecure_skip_verify = false | ||
|
|
||
| # HTTP response timeout (default: 5s) | ||
| response_timeout = "10s" |
There was a problem hiding this comment.
Set this to 5s since that's the default
danielnelson
approved these changes
Jun 8, 2017
|
Thank you! This will be in 1.4. |
jeichorn
pushed a commit
to jeichorn/telegraf
that referenced
this pull request
Jul 24, 2017
maxunt
pushed a commit
that referenced
this pull request
Jun 26, 2018
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.
This PR adds support for an optional SSL/TLS config in the nginx input plugin.
Required for all PRs: