promtail: add support for TLS/mTLS in syslog receiver #3907
Conversation
|
|
| @@ -91,15 +94,58 @@ func (t *SyslogTarget) run() error { | |||
| if err != nil { | |||
| return fmt.Errorf("error setting up syslog target %w", err) | |||
| } | |||
|
|
|||
| tlsEnabled := len(t.config.TLSConfig.CertFile) > 0 || len(t.config.TLSConfig.CertFile) > 0 || len(t.config.TLSConfig.CAFile) > 0 | |||
There was a problem hiding this comment.
Not sure if this is the best way to check if tls_config is set.
|
|
||
| t.openConnections.Add(1) | ||
| go t.acceptConnections() | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func newTLSConfig(certFile string, keyFile string, caFile string) (*tls.Config, error) { |
There was a problem hiding this comment.
This is inspired by NewTLSConfig from github.com/prometheus/common/config.
johanfleury
force-pushed
the
feature/promtail-syslog-tls
branch
from
0329e14 to
7b16ffc
Compare
johanfleury
force-pushed
the
feature/promtail-syslog-tls
branch
from
7b16ffc to
f926c1d
Compare
johanfleury
force-pushed
the
feature/promtail-syslog-tls
branch
2 times, most recently
from
b7848c3 to
1ff6b8e
Compare
johanfleury
force-pushed
the
feature/promtail-syslog-tls
branch
from
1ff6b8e to
cd52cf5
Compare
|
@KMiller-Grafana I'll need your approval to merge this one please, thanks ! |
|
This issue has been automatically marked as stale because it has not had any activity in the past 30 days. It will be closed in 7 days if no further activity occurs. Thank you for your contributions. |
|
Can we merge this if everybody’s happy with it? |
stale
bot
removed
the
stale
|
Hi! This issue has been automatically marked as stale because it has not had any We use a stalebot among other tools to help manage the state of issues in this project. Stalebots are also emotionless and cruel and can close issues which are still very relevant. If this issue is important to you, please add a comment to keep it open. More importantly, please add a thumbs-up to the original issue entry. We regularly sort for closed issues which have a We may also:
We are doing our best to respond, organize, and prioritize all issues but it can be a challenging task, |
|
These bots are awful. |
stale
bot
removed
the
stale
What this PR does / why we need it:
Add support for TLS and mTLS in promtail's syslog receiver.
Which issue(s) this PR fixes:
Fixes #3898
Special notes for your reviewer:
Go is not my main language (and I don’t really like it) so there might be some coding-style issue or some bad patterns.
I successfully tested this change using rsyslog and I got the following results:
level=warn ts=2021-06-25T17:34:09.985034229Z caller=syslogtarget.go:207 msg="error initializing syslog stream" err="tls: first record does not look like a TLS handshake"level=warn ts=2021-06-25T17:28:22.787523967Z caller=syslogtarget.go:207 msg="error initializing syslog stream" err="tls: client didn't provide a certificate"Checklist: