Skip to content

Commit 9b7e25c

Browse files
authored
docs(config): Remove tls.enabled flag from components that don't support it (#13925)
Whether some components use TLS or not is controlled by the scheme from the configured endpoint. Fixes: #12343 Signed-off-by: Jesse Szwedko <jesse@szwedko.me> Signed-off-by: Jesse Szwedko <jesse@szwedko.me>
1 parent 5465812 commit 9b7e25c

40 files changed

+69
-24
lines changed

website/cue/reference/components.cue

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ components: {
427427
can_verify_certificate: bool
428428
if Args.mode == "connect" {
429429
can_verify_hostname: bool
430+
enabled_by_scheme: bool
430431
}
431432
if Args.mode == "accept" {
432433
can_add_client_metadata: bool | *false
@@ -691,18 +692,23 @@ components: {
691692
can_verify_certificate: bool | *true
692693
can_verify_hostname: bool | *false
693694
enabled_default: bool
695+
enabled_by_scheme: bool
694696
}
695697
let Args = _args
696698

697699
common: false
698700
description: "Configures the TLS options for outgoing connections."
699701
required: false
700702
type: object: options: {
701-
enabled: {
702-
common: true
703-
description: "Enable TLS during connections to the remote."
704-
required: false
705-
type: bool: default: Args.enabled_default
703+
if Args.enabled_by_scheme != _|_ {
704+
if !Args.enabled_by_scheme {
705+
enabled: {
706+
common: true
707+
description: "Enable TLS during connections to the remote."
708+
required: false
709+
type: bool: default: Args.enabled_default
710+
}
711+
}
706712
}
707713

708714
ca_file: {

website/cue/reference/components/sinks/apex.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ components: sinks: apex: {
3737
enabled: true
3838
can_verify_certificate: true
3939
can_verify_hostname: true
40-
enabled_default: true
40+
enabled_default: false
41+
enabled_by_scheme: true
4142
}
4243
to: {
4344
service: services.apex

website/cue/reference/components/sinks/aws_cloudwatch_logs.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ components: sinks: aws_cloudwatch_logs: components._aws & {
4545
enabled: true
4646
can_verify_certificate: true
4747
can_verify_hostname: true
48-
enabled_default: false
48+
enabled_default: true
49+
enabled_by_scheme: true
4950
}
5051
to: {
5152
service: services.aws_cloudwatch_logs

website/cue/reference/components/sinks/aws_cloudwatch_metrics.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ components: sinks: aws_cloudwatch_metrics: components._aws & {
3535
enabled: true
3636
can_verify_certificate: true
3737
can_verify_hostname: true
38-
enabled_default: false
38+
enabled_default: true
39+
enabled_by_scheme: true
3940
}
4041
to: {
4142
service: services.aws_cloudwatch_metrics

website/cue/reference/components/sinks/aws_kinesis_firehose.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ components: sinks: aws_kinesis_firehose: components._aws & {
4545
enabled: true
4646
can_verify_certificate: true
4747
can_verify_hostname: true
48-
enabled_default: false
48+
enabled_default: true
49+
enabled_by_scheme: true
4950
}
5051
to: {
5152
service: services.aws_kinesis_firehose

website/cue/reference/components/sinks/aws_kinesis_streams.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ components: sinks: aws_kinesis_streams: components._aws & {
4545
enabled: true
4646
can_verify_certificate: true
4747
can_verify_hostname: true
48-
enabled_default: false
48+
enabled_default: true
49+
enabled_by_scheme: true
4950
}
5051
to: {
5152
service: services.aws_kinesis_data_streams

website/cue/reference/components/sinks/aws_s3.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ components: sinks: aws_s3: components._aws & {
4545
enabled: true
4646
can_verify_certificate: true
4747
can_verify_hostname: true
48-
enabled_default: false
48+
enabled_default: true
49+
enabled_by_scheme: true
4950
}
5051
to: {
5152
service: services.aws_s3

website/cue/reference/components/sinks/aws_sqs.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ components: sinks: aws_sqs: components._aws & {
3838
enabled: true
3939
can_verify_certificate: true
4040
can_verify_hostname: true
41-
enabled_default: false
41+
enabled_default: true
42+
enabled_by_scheme: true
4243
}
4344
to: {
4445
service: services.aws_sqs

website/cue/reference/components/sinks/axiom.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ components: sinks: axiom: {
3737
enabled: true
3838
can_verify_certificate: true
3939
can_verify_hostname: true
40-
enabled_default: false
40+
enabled_default: true
41+
enabled_by_scheme: true
4142
}
4243
to: {
4344
service: services.axiom

website/cue/reference/components/sinks/azure_monitor_logs.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ components: sinks: azure_monitor_logs: {
3333
enabled: true
3434
can_verify_certificate: true
3535
can_verify_hostname: true
36-
enabled_default: false
36+
enabled_default: true
37+
enabled_by_scheme: true
3738
}
3839
to: {
3940
service: services.azure_monitor_logs

0 commit comments

Comments
 (0)