feat: add new TLS configuration options #133
Merged
Conversation
This file contains hidden or 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
joemiller
commented
Oct 31, 2020
joemiller
force-pushed
the
mtls-client-certs
branch
2 times, most recently
from
fbd7a2d to
514ebad
Compare
|
Ping. Any feedback on this that I can address? |
* ``tls_key`` - (Optional) Client TLS key file to use to authenticate to the Grafana server. May alternatively be set via the ``GRAFANA_TLS_KEY`` environment variable. * ``tls_cert`` - (Optional) Client TLS certificate file to use to authenticate to the Grafana server. May alternatively be set via the ``GRAFANA_TLS_CERT`` environment variable. * ``ca_cert`` - (Optional) Certificate CA bundle to use to verify the Grafana server's certifiate.. May alternatively be set via the ``GRAFANA_CA_CERT`` environment variable. * ``insecure_skip_verify`` - (Optional) Bool. Disable verification of the Grafana Server's certificate. May alternatively be set via the ``GRAFANA_INSECURE_SKIP_VERIFY`` environment variable.
joemiller
force-pushed
the
mtls-client-certs
branch
from
1fe35dc to
87a9916
Compare
joemiller
force-pushed
the
mtls-client-certs
branch
from
87a9916 to
a9316e9
Compare
|
Updated to resolve conflicts with the current main branch |
There was a problem hiding this comment.
@joemiller this is great. There's now a docker-compose.yml file in master though. Could we rename your's to docker-compose.tls.yml and target it with -f flag in the test-serve-tls target?
|
@trotttrotttrott Hi, Thanks for picking this up. I'd be happy to rename the file but it looks like you already took care of that. Anything else I can do to help? |
|
@joemiller no prob! I was just going to comment. I think it's ready to go. I was going to merge it as soon as CI passes. Thanks! |
trotttrotttrott
approved these changes
Feb 18, 2021
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.
tls_key- (Optional) Client TLS key file to use to authenticate to theGrafana server. May alternatively be set via the
GRAFANA_TLS_KEYenvironment variable.
tls_cert- (Optional) Client TLS certificate file to use to authenticateto the Grafana server. May alternatively be set via the
GRAFANA_TLS_CERTenvironment variable.
ca_cert- (Optional) Certificate CA bundle to use to verify theGrafana server's certifiate.. May alternatively be set via the
GRAFANA_CA_CERTenvironment variable.insecure_skip_verify- (Optional) Bool. Disable verification of theGrafana Server's certificate. May alternatively be set via the
GRAFANA_INSECURE_SKIP_VERIFYenvironment variable.closes #107
closes #53