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

Allow TLS settings to be specified inline #472

Merged
merged 3 commits into from May 11, 2023

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Apr 11, 2023

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

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.
@rfratto
Copy link
Member Author

rfratto commented May 9, 2023

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 roidelapluie merged commit 085fa47 into prometheus:main May 11, 2023
7 checks passed
@roidelapluie
Copy link
Member

Thanks!

@rfratto rfratto deleted the inline-ca-strings branch May 16, 2023 14:45
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support custom io/fs.FS for HTTP clients
2 participants