Skip to content

Commit 6451184

Browse files
Support ES exporter translation for curve_types and renegotiation. (#46750) (#46769)
(cherry picked from commit 3d4a152) Co-authored-by: Craig MacKenzie <[email protected]>
1 parent 670495b commit 6451184

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

libbeat/otelbeat/oteltranslate/tls_otel.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ var tlsVersions = map[uint16]string{
4343
func validateUnsupportedConfig(output *config.C) error {
4444

4545
if sslConfig, err := output.Child("ssl", -1); err == nil {
46-
if sslConfig.HasField("curve_type") {
47-
return fmt.Errorf("ssl.curve_types is currently not supported: %w", errors.ErrUnsupported)
48-
} else if sslConfig.HasField("renegotiation") {
49-
return fmt.Errorf("ssl.renegotiation is currently not supported: %w", errors.ErrUnsupported)
50-
}
51-
5246
if reloadCfg, err := sslConfig.Child("restart_on_cert_change", -1); err == nil {
5347
if reloadCfg.HasField("enabled") {
5448
return fmt.Errorf("ssl.restart_on_cert_change.enabled is currently not supported: %w", errors.ErrUnsupported)

libbeat/otelbeat/oteltranslate/tls_otel_test.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,6 @@ ssl:
7878

7979
})
8080

81-
t.Run("when unsupported configuration renegotiation is used", func(t *testing.T) {
82-
input := `
83-
ssl:
84-
verification_mode: none
85-
renegotiation: never
86-
`
87-
cfg := config.MustNewConfigFrom(input)
88-
_, err := TLSCommonToOTel(cfg, logger)
89-
require.Error(t, err)
90-
require.ErrorIs(t, err, errors.ErrUnsupported)
91-
92-
})
93-
9481
t.Run("when unsupported configuration restart_on_cert_change.enabled is used", func(t *testing.T) {
9582
input := `
9683
ssl:
@@ -108,7 +95,7 @@ ssl:
10895
input := `
10996
ssl:
11097
verification_mode: none
111-
supported_protocols:
98+
supported_protocols:
11299
- TLSv1.4
113100
`
114101
cfg := config.MustNewConfigFrom(input)

0 commit comments

Comments
 (0)