Allow TLS settings to be specified inline#472
Merged
roidelapluie merged 3 commits intoprometheus:mainfrom May 11, 2023
grafana:inline-ca-strings
Merged
Allow TLS settings to be specified inline#472roidelapluie merged 3 commits intoprometheus:mainfrom grafana:inline-ca-strings
roidelapluie merged 3 commits intoprometheus:mainfrom
grafana:inline-ca-strings
Conversation
This permits TLS data to be provided inline rather than by specifying a file on disk. Signed-off-by: Robert Fratto <robertfratto@gmail.com>
Signed-off-by: Robert Fratto <robertfratto@gmail.com>
Signed-off-by: Robert Fratto <robertfratto@gmail.com>
rfratto
added a commit
to rfratto/agent
that referenced
this pull request
Apr 12, 2023
…ents This updates the prometheus/common dependency to use a fork until prometheus/common#472 is merged. Components which use the prometheus/common dependency for TLS configs will automatically support inline TLS settings. Some components, particularly loki.source.kafka and loki.source.syslog had to be updated as they build their own TLS configs.
rfratto
added a commit
to rfratto/agent
that referenced
this pull request
Apr 12, 2023
…ents This updates the prometheus/common dependency to use a fork until prometheus/common#472 is merged. Components which use the prometheus/common dependency for TLS configs will automatically support inline TLS settings. Some components, particularly loki.source.kafka and loki.source.syslog had to be updated as they build their own TLS configs.
rfratto
added a commit
to grafana/agent
that referenced
this pull request
Apr 13, 2023
…ents (#3524) This updates the prometheus/common dependency to use a fork until prometheus/common#472 is merged. Components which use the prometheus/common dependency for TLS configs will automatically support inline TLS settings. Some components, particularly loki.source.kafka and loki.source.syslog had to be updated as they build their own TLS configs.
Contributor
Author
|
ping @roidelapluie @SuperQ This is something we started using in grafana/agent with our release last month. Is this something we can still get merged upstream? |
roidelapluie
approved these changes
May 11, 2023
Member
|
Thanks! |
rfratto
added a commit
to rfratto/agent
that referenced
this pull request
May 16, 2023
The replace directive can be removed now that prometheus/common#472 was merged.
rfratto
added a commit
to grafana/agent
that referenced
this pull request
May 22, 2023
* go.mod: remove replace directive for prometheus/common The replace directive can be removed now that prometheus/common#472 was merged. * `go mod tidy` * update code for breaking API changes in prometheus/common
clayton-cornell
pushed a commit
to grafana/agent
that referenced
this pull request
Aug 14, 2023
…ents (#3524) This updates the prometheus/common dependency to use a fork until prometheus/common#472 is merged. Components which use the prometheus/common dependency for TLS configs will automatically support inline TLS settings. Some components, particularly loki.source.kafka and loki.source.syslog had to be updated as they build their own TLS configs.
clayton-cornell
pushed a commit
to grafana/agent
that referenced
this pull request
Aug 14, 2023
* go.mod: remove replace directive for prometheus/common The replace directive can be removed now that prometheus/common#472 was merged. * `go mod tidy` * update code for breaking API changes in prometheus/common
clayton-cornell
pushed a commit
to grafana/agent
that referenced
this pull request
Aug 14, 2023
…ents (#3524) This updates the prometheus/common dependency to use a fork until prometheus/common#472 is merged. Components which use the prometheus/common dependency for TLS configs will automatically support inline TLS settings. Some components, particularly loki.source.kafka and loki.source.syslog had to be updated as they build their own TLS configs.
clayton-cornell
pushed a commit
to grafana/agent
that referenced
this pull request
Aug 14, 2023
* go.mod: remove replace directive for prometheus/common The replace directive can be removed now that prometheus/common#472 was merged. * `go mod tidy` * update code for breaking API changes in prometheus/common
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 extends TLS settings to allow for the TLS CA, TLS certificate, and TLS key to be specified inline. Inline settings are expected to the same content as the files; PEM-encoded sequences of bytes as a string.
Closes #434, as specifying inline TLS settings supersedes the need for passing a custom io/fs.FS instance for files.
cc @roidelapluie