Skip to content

Commit 986c031

Browse files
authored
Config template and component fixes (#44064)
### What does this PR do? Fix two config issues: - remove `kublet_api_client_read_timeout` from template since it's not used in the code (not even declared in the config) - `network_devices.autodiscovery.collect_vpn` is documented in the template but not declared in the config (resulting in warnings) ### Motivation Fix issues with those configs. ### Describe how you validated your changes ### Additional Notes Co-authored-by: pierre.gimalac <[email protected]>
1 parent 45d4156 commit 986c031

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

pkg/config/config_template.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,12 +1224,6 @@ api_key:
12241224
#
12251225
# integrations_logs_total_usage: 100
12261226

1227-
# # @param kublet_api_client_read_timeout - duration - optional - default: 30s
1228-
# # @env DD_LOGS_CONFIG_KUBELET_API_CLIENT_READ_TIMEOUT - duration - optional - default: 30s
1229-
# # Configure the kubelet API client's timeout used while streaming logs.
1230-
#
1231-
# kublet_api_client_read_timeout: 30
1232-
12331227
# # @param k8s_container_use_kubelet_api - boolean - optional - default: false
12341228
# # @env DD_LOGS_CONFIG_K8S_CONTAINER_USE_KUBELET_API - boolean - optional - default: false
12351229
# # Enable container log collection via the kubelet API, typically used for EKS Fargate

pkg/config/setup/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ func InitConfig(config pkgconfigmodel.Setup) {
484484
config.SetKnown("network_devices.autodiscovery.ping.timeout") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
485485
config.SetKnown("network_devices.autodiscovery.ping.linux.use_raw_socket") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
486486
config.SetKnown("network_devices.autodiscovery.use_deduplication") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
487+
config.SetKnown("network_devices.autodiscovery.collect_vpn") //nolint:forbidigo // TODO: replace by 'SetDefaultAndBindEnv'
487488

488489
bindEnvAndSetLogsConfigKeys(config, "network_devices.snmp_traps.forwarder.")
489490
config.BindEnvAndSetDefault("network_devices.snmp_traps.enabled", false)

0 commit comments

Comments
 (0)