Skip to content

Commit

Permalink
enable ecs by default (#33689)
Browse files Browse the repository at this point in the history
Co-authored-by: maxime mouial <[email protected]>
Co-authored-by: Pierre Margueritte <[email protected]>
  • Loading branch information
3 people authored Feb 5, 2025
1 parent 9be1339 commit 281ac36
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pkg/config/config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3314,12 +3314,12 @@ api_key:
#
# ecs_metadata_timeout: 500

## @param ecs_task_collection_enabled - boolean - optional - default: false
## @env DD_ECS_TASK_COLLECTION_ENABLED - boolean - optional - default: false
## @param ecs_task_collection_enabled - boolean - optional - default: true
## @env DD_ECS_TASK_COLLECTION_ENABLED - boolean - optional - default: true
## The Agent can collect detailed task information from the metadata API exposed by the ECS Agent,
## which is used for the orchestrator ECS check.
#
# ecs_task_collection_enabled: false
# ecs_task_collection_enabled: true

{{ end -}}
{{- if .CRI }}
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/setup/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ func InitConfig(config pkgconfigmodel.Setup) {
config.BindEnvAndSetDefault("ecs_metadata_retry_initial_interval", 100*time.Millisecond)
config.BindEnvAndSetDefault("ecs_metadata_retry_max_elapsed_time", 3000*time.Millisecond)
config.BindEnvAndSetDefault("ecs_metadata_retry_timeout_factor", 3)
config.BindEnvAndSetDefault("ecs_task_collection_enabled", false)
config.BindEnvAndSetDefault("ecs_task_collection_enabled", true)
config.BindEnvAndSetDefault("ecs_task_cache_ttl", 3*time.Minute)
config.BindEnvAndSetDefault("ecs_task_collection_rate", 35)
config.BindEnvAndSetDefault("ecs_task_collection_burst", 60)
Expand Down
3 changes: 3 additions & 0 deletions releasenotes/notes/releasenotes-bac55ded540c6e83.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
upgrade:
- |
ECS task collection is now enabled by default (see `ecs_task_collection_enabled` in the datadog.yaml configuration).

0 comments on commit 281ac36

Please sign in to comment.