[mq] [skip ddci] working branch - merge 5c58b8b on top of main at ae6a3ba

{"baseBranch":"main","baseCommit":"ae6a3ba41a1eba4cf1f37e9c35488c9352c423e7","createdAt":"2026-07-13T22:40:22.429819Z","headSha":"5c58b8b6e8b6eb12e83ebc874cfc1751d741f9dd","id":"19f14a44-47a8-4f83-94b3-1248f98b1cbe","priority":"200","pullRequestNumber":"53332","queuedAt":"2026-07-13T22:40:22.428362Z","retryAttempt":"1","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

docs/public/agent-schema/examples.md

@@ -105,7 +105,8 @@ apm_config:
 6. **`default: false`** — a simple boolean default on a regular cross-platform setting node.
 7. **`platform_default`** — used instead of `default` when the correct default depends on the operating system. Here,
    Linux uses a Unix socket path while all other platforms default to an empty string. The special key `other` acts as a
-   fallback for any platform not explicitly listed.
+   fallback for any platform not explicitly listed. As much as possible, avoid assuming the full list of supported platforms
+   is known, eg. setting a value for `other` which is Darwin specific when you already have a value for Linux and Windows.
 
 ---
 

docs/public/agent-schema/keywords.md

@@ -70,24 +70,28 @@ default but could be change by the users. For example, the default configuration
 
 Path are all express using `/` and will be translated to the correct OS version.
 
-Existing variagbles:
+Existing variables:
 
 - Configuration directory (`${conf_path}`):
   - `windows`: `c:/programdata/datadog`
-  - `linux`; `/etc/datadog-agent`
+  - `linux`: `/etc/datadog-agent`
   - `darwin`: `/opt/datadog-agent/etc`
+  - `aix`: `/etc/datadog-agent`
 - Installation directory (`${install_path}`):
   - `windows`: `c:/program files/datadog/datadog agent`
-  - `linux`; `/opt/datadog-agent`
+  - `linux`: `/opt/datadog-agent`
   - `darwin`: `/opt/datadog-agent`
+  - `aix`: `/opt/datadog-agent`
 - Log directory (`${log_path}`):
   - `windows`: `c:/programdata/datadog/logs`
-  - `linux`; `/var/log/datadog`
+  - `linux`: `/var/log/datadog`
   - `darwin`: `/opt/datadog-agent/logs`
+  - `aix`: `/var/log/datadog`
 - Run directory, where the Agent starts from (`${run_path}`):
-  - `windows`: `/opt/datadog-agent/run`
-  - `linux`; `c:/programdata/datadog/run`
+  - `windows`: `c:/programdata/datadog/run`
+  - `linux`: `/opt/datadog-agent/run`
   - `darwin`: `/opt/datadog-agent/run`
+  - `aix`: `/opt/datadog-agent/run`
 
 
 The above variables are available for `default` and `platform_default` keywords.
@@ -318,10 +322,13 @@ Sets per-platform default value overrides. Mutually exclusive with `default` (On
 
 - **Available on:** setting nodes only.
 - **Mandatory:** yes, unless `default` is specified. `platform_default` must cover every platform — either by listing
-  `linux`, `windows`, and `darwin` explicitly, or by including an `other` catch-all.
+  `linux`, `windows`, `darwin`, and `aix` explicitly, or by including an `other` catch-all.
 - **Validation:** values must match the `type` of the setting.
 
-Supported platform keys: `linux`, `windows`, `darwin`, `container`, 'fargate', `other`.
+Supported platform keys: `linux`, `windows`, `darwin`, `aix`, `container`, `fargate`, `other`.
+
+As much as possible, avoid assuming all platforms are known, and don't use `other` for a value which is specific to
+a given OS just because the other OSes have been set explicitly.
 
 **Container fallback logic:** because container environments currently share many
 defaults with Linux, `container`/`fargate` is optional. When resolving the default for a
@@ -341,15 +348,17 @@ confd_path:
     windows: "C:\\ProgramData\\Datadog\\conf.d"
     linux: "/etc/datadog-agent/conf.d"
     darwin: "/opt/datadog-agent/etc/conf.d"
+    aix: "/etc/datadog-agent/conf.d"
     container: "/conf.d"
 
 # Using 'other' as a catch-all:
 gui_port:
   node_type: setting
   type: number
   platform_default:
-    linux: -1
-    other: 5002             # covers windows and darwin
+    darwin: 5002
+    windows: 5002
+    other: -1             # currently covers linux and aix
 ```
 
 > **Note**: [Relative Path](keywords.md#relative-defaults) is also available for `platform_default`.

pkg/config/BUILD.bazel

@@ -15,6 +15,7 @@ _OS_TARGET = select({
     "@platforms//os:linux": "linux",
     "@platforms//os:windows": "windows",
     "@platforms//os:macos": "darwin",
+    "@platforms//os:aix": "aix",
 })
 
 schema_template_config(

pkg/config/config_template.yaml

@@ -886,19 +886,19 @@ api_key:
 ## Advanced Configuration ##
 ############################
 
-## @param confd_path - string - optional - default: {{ if (eq .OS "linux") }}"/etc/datadog-agent/conf.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\conf.d"{{else}}"/opt/datadog-agent/etc/conf.d"{{ end }}
-## @env DD_CONFD_PATH - string - optional - default: {{ if (eq .OS "linux") }}"/etc/datadog-agent/conf.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\conf.d"{{else}}"/opt/datadog-agent/etc/conf.d"{{ end }}
+## @param confd_path - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/etc/datadog-agent/conf.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\conf.d"{{else}}"/opt/datadog-agent/etc/conf.d"{{ end }}
+## @env DD_CONFD_PATH - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/etc/datadog-agent/conf.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\conf.d"{{else}}"/opt/datadog-agent/etc/conf.d"{{ end }}
 ## The path containing check configuration files. By default, uses the conf.d folder
 ## located in the Agent configuration folder.
 #
-# confd_path: {{ if (eq .OS "linux") }}"/etc/datadog-agent/conf.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\conf.d"{{else}}"/opt/datadog-agent/etc/conf.d"{{ end }}
+# confd_path: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/etc/datadog-agent/conf.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\conf.d"{{else}}"/opt/datadog-agent/etc/conf.d"{{ end }}
 
-## @param additional_checksd - string - optional - default: {{ if (eq .OS "linux") }}"/etc/datadog-agent/checks.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\checks.d"{{else}}"/opt/datadog-agent/etc/checks.d"{{ end }}
-## @env DD_ADDITIONAL_CHECKSD - string - optional - default: {{ if (eq .OS "linux") }}"/etc/datadog-agent/checks.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\checks.d"{{else}}"/opt/datadog-agent/etc/checks.d"{{ end }}
+## @param additional_checksd - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/etc/datadog-agent/checks.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\checks.d"{{else}}"/opt/datadog-agent/etc/checks.d"{{ end }}
+## @env DD_ADDITIONAL_CHECKSD - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/etc/datadog-agent/checks.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\checks.d"{{else}}"/opt/datadog-agent/etc/checks.d"{{ end }}
 ## Additional path indicating where to search for Python checks. By default, uses the checks.d folder
 ## located in the Agent configuration folder.
 #
-# additional_checksd: {{ if (eq .OS "linux") }}"/etc/datadog-agent/checks.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\checks.d"{{else}}"/opt/datadog-agent/etc/checks.d"{{ end }}
+# additional_checksd: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/etc/datadog-agent/checks.d"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\checks.d"{{else}}"/opt/datadog-agent/etc/checks.d"{{ end }}
 
 ## @param expvar_port - integer - optional - default: 5000
 ## @env DD_EXPVAR_PORT - integer - optional - default: 5000
@@ -912,15 +912,15 @@ api_key:
 #
 # cmd_port: 5001
 
-## @param GUI_port - integer - optional - default: {{ if (eq .OS "linux") }}-1{{ else }}5002{{end}}
-## @env DD_GUI_PORT - integer - optional - default: {{ if (eq .OS "linux") }}-1{{ else }}5002{{end}}
+## @param GUI_port - integer - optional - default: {{ if (or (eq .OS "darwin") (eq .OS "windows")) }}5002{{else}}-1{{end}}
+## @env DD_GUI_PORT - integer - optional - default: {{ if (or (eq .OS "darwin") (eq .OS "windows")) }}5002{{else}}-1{{end}}
 ## The port for the browser GUI to be served.
 ## Setting 'GUI_port: -1' turns off the GUI completely
 ## Default is:
 ##  * Windows & macOS : `5002`
 ##  * Linux: `-1`
 #
-# GUI_port: {{ if (eq .OS "linux") }}-1{{ else }}5002{{end}}
+# GUI_port: {{ if (or (eq .OS "darwin") (eq .OS "windows")) }}5002{{else}}-1{{end}}
 
 ## @param GUI_session_expiration - integer - optional - default: 0
 ## @env DD_GUI_SESSION_EXPIRATION - integer - optional - default: 0
@@ -1401,15 +1401,15 @@ api_key:
 #
 #   streaming:
 
-#     # @param streamlogs_log_file - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/streamlogs_info/streamlogs.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log"{{else}}"/opt/datadog-agent/logs/streamlogs_info/streamlogs.log"{{ end }}
-#     # @env DD_LOGS_CONFIG_STREAMING_STREAMLOGS_LOG_FILE - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/streamlogs_info/streamlogs.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log"{{else}}"/opt/datadog-agent/logs/streamlogs_info/streamlogs.log"{{ end }}
+#     # @param streamlogs_log_file - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/streamlogs_info/streamlogs.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log"{{else}}"/opt/datadog-agent/logs/streamlogs_info/streamlogs.log"{{ end }}
+#     # @env DD_LOGS_CONFIG_STREAMING_STREAMLOGS_LOG_FILE - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/streamlogs_info/streamlogs.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log"{{else}}"/opt/datadog-agent/logs/streamlogs_info/streamlogs.log"{{ end }}
 #     # Path to the file containing the streamlogs log file.
 #     # Default paths:
 #     #   * Windows: c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log
 #     #   * Darwin: /opt/datadog-agent/logs/streamlogs_info/streamlogs.log
 #     #   * Linux: /var/log/datadog/streamlogs_info/streamlogs.log
 #
-#     streamlogs_log_file: {{ if (eq .OS "linux") }}"/var/log/datadog/streamlogs_info/streamlogs.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log"{{else}}"/opt/datadog-agent/logs/streamlogs_info/streamlogs.log"{{ end }}
+#     streamlogs_log_file: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/streamlogs_info/streamlogs.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\streamlogs_info\\streamlogs.log"{{else}}"/opt/datadog-agent/logs/streamlogs_info/streamlogs.log"{{ end }}
 
 {{- end -}}
 {{- if .TraceAgent }}
@@ -1448,15 +1448,15 @@ api_key:
 #
 #   receiver_port: 8126
 
-#   # @param receiver_socket - string - optional - default: {{ if (eq .OS "linux") }}"/var/run/datadog/apm.socket"{{else}}""{{end}}
-#   # @env DD_APM_RECEIVER_SOCKET - string - optional - default: {{ if (eq .OS "linux") }}"/var/run/datadog/apm.socket"{{else}}""{{end}}
+#   # @param receiver_socket - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/apm.socket"{{else}}""{{end}}
+#   # @env DD_APM_RECEIVER_SOCKET - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/apm.socket"{{else}}""{{end}}
 #   # Accept traces through Unix Domain Sockets.
 #   # Set to "" to disable the UDS receiver.
 #   #
 #   # Please note that UDS receiver is not available in Windows.
 #   # Enabling this setting may result in unexpected behavior.
 #
-#   receiver_socket: {{ if (eq .OS "linux") }}"/var/run/datadog/apm.socket"{{else}}""{{end}}
+#   receiver_socket: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/apm.socket"{{else}}""{{end}}
 
 #   # @param apm_non_local_traffic - boolean - optional - default: false
 #   # @env DD_APM_NON_LOCAL_TRAFFIC - boolean - optional - default: false
@@ -2107,11 +2107,11 @@ api_key:
 #
 #   cmd_port: 6162
 
-#   # @param log_file - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/process-agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\process-agent.log"{{else}}"/opt/datadog-agent/logs/process-agent.log"{{ end }}
-#   # @env DD_PROCESS_CONFIG_LOG_FILE - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/process-agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\process-agent.log"{{else}}"/opt/datadog-agent/logs/process-agent.log"{{ end }}
+#   # @param log_file - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/process-agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\process-agent.log"{{else}}"/opt/datadog-agent/logs/process-agent.log"{{ end }}
+#   # @env DD_PROCESS_CONFIG_LOG_FILE - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/process-agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\process-agent.log"{{else}}"/opt/datadog-agent/logs/process-agent.log"{{ end }}
 #   # The full path to the file where process Agent logs are written.
 #
-#   log_file: {{ if (eq .OS "linux") }}"/var/log/datadog/process-agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\process-agent.log"{{else}}"/opt/datadog-agent/logs/process-agent.log"{{ end }}
+#   log_file: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/process-agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\process-agent.log"{{else}}"/opt/datadog-agent/logs/process-agent.log"{{ end }}
 
 #   # @param intervals - custom object - optional
 #   # The interval, in seconds, at which the Agent runs each check. If you want consistent
@@ -2231,7 +2231,7 @@ api_key:
 #   # Disable realtime process and container checks
 #
 #   disable_realtime_checks: false
-{{- if (ne .OS "darwin") }}
+{{- if (or (eq .OS "windows") (eq .OS "linux")) }}
 
 #############################################
 ## Network Path Dynamic Test Configuration ##
@@ -2490,16 +2490,16 @@ api_key:
 #
 # bind_host: localhost
 
-## @param dogstatsd_socket - string - optional - default: {{ if (eq .OS "linux") }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
-## @env DD_DOGSTATSD_SOCKET - string - optional - default: {{ if (eq .OS "linux") }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
+## @param dogstatsd_socket - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
+## @env DD_DOGSTATSD_SOCKET - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
 ## Listen for Dogstatsd metrics on a Unix Socket (*nix only).
 ## Set to a valid and existing filesystem path to enable.
 ## Set to "" to disable this feature.
 ##
 ## Please note that UDS receiver is not available in Windows.
 ## Enabling this setting may result in unexpected behavior.
 #
-# dogstatsd_socket: {{ if (eq .OS "linux") }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
+# dogstatsd_socket: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
 
 ## @param dogstatsd_origin_detection - boolean - optional - default: false
 ## @env DD_DOGSTATSD_ORIGIN_DETECTION - boolean - optional - default: false
@@ -2742,11 +2742,11 @@ api_key:
 #
 # jmx_max_ram_percentage: 25
 
-## @param jmx_log_file - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/jmxfetch.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\jmxfetch.log"{{else}}"/opt/datadog-agent/logs/jmxfetch.log"{{ end }}
-## @env DD_JMX_LOG_FILE - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/jmxfetch.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\jmxfetch.log"{{else}}"/opt/datadog-agent/logs/jmxfetch.log"{{ end }}
+## @param jmx_log_file - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/jmxfetch.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\jmxfetch.log"{{else}}"/opt/datadog-agent/logs/jmxfetch.log"{{ end }}
+## @env DD_JMX_LOG_FILE - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/jmxfetch.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\jmxfetch.log"{{else}}"/opt/datadog-agent/logs/jmxfetch.log"{{ end }}
 ## Path of the log file where JMXFetch logs are written.
 #
-# jmx_log_file: {{ if (eq .OS "linux") }}"/var/log/datadog/jmxfetch.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\jmxfetch.log"{{else}}"/opt/datadog-agent/logs/jmxfetch.log"{{ end }}
+# jmx_log_file: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/jmxfetch.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\jmxfetch.log"{{else}}"/opt/datadog-agent/logs/jmxfetch.log"{{ end }}
 
 ## @param jmx_max_restarts - integer - optional - default: 3
 ## @env DD_JMX_MAX_RESTARTS - integer - optional - default: 3
@@ -2830,12 +2830,12 @@ api_key:
 #
 # log_level: "info"
 
-## @param log_file - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\agent.log"{{else}}"/opt/datadog-agent/logs/agent.log"{{ end }}
-## @env DD_LOG_FILE - string - optional - default: {{ if (eq .OS "linux") }}"/var/log/datadog/agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\agent.log"{{else}}"/opt/datadog-agent/logs/agent.log"{{ end }}
+## @param log_file - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\agent.log"{{else}}"/opt/datadog-agent/logs/agent.log"{{ end }}
+## @env DD_LOG_FILE - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\agent.log"{{else}}"/opt/datadog-agent/logs/agent.log"{{ end }}
 ## Path of the log file for the Datadog Agent.
 ## See https://docs.datadoghq.com/agent/guide/agent-log-files/
 #
-# log_file: {{ if (eq .OS "linux") }}"/var/log/datadog/agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\agent.log"{{else}}"/opt/datadog-agent/logs/agent.log"{{ end }}
+# log_file: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/log/datadog/agent.log"{{ else if ((eq .OS "windows")) }}"c:\\programdata\\datadog\\logs\\agent.log"{{else}}"/opt/datadog-agent/logs/agent.log"{{ end }}
 
 ## @param log_format_json - boolean - optional - default: false
 ## @env DD_LOG_FORMAT_JSON - boolean - optional - default: false

pkg/config/render_config/render_config.go

@@ -137,7 +137,7 @@ func renderAll(destFolder string, tplFolder string) {
 		"dcacf":        "config_template.yaml",
 		"system-probe": "system-probe_template.yaml",
 	} {
-		for _, osName := range []string{"windows", "darwin", "linux"} {
+		for _, osName := range []string{"windows", "darwin", "linux", "aix"} {
 			destFile := filepath.Join(destFolder, component+"_"+osName+".yaml")
 			render(destFile, filepath.Join(tplFolder, templateName), component, osName)
 			fmt.Println("Successfully wrote", destFile)

pkg/config/schema/yaml/apm_config.yaml

@@ -56,6 +56,7 @@ properties:
       Enabling this setting may result in unexpected behavior.
     platform_default:
       linux: /var/run/datadog/apm.socket
+      aix: /var/run/datadog/apm.socket
       other: ''
   apm_non_local_traffic:
     node_type: setting

pkg/config/schema/yaml/core_schema.yaml

@@ -1266,8 +1266,9 @@ properties:
     tags:
     - template_section:Agent
     platform_default:
-      linux: -1
-      other: 5002
+      darwin: 5002
+      windows: 5002
+      other: -1
     comment: Agent GUI access port
   GUI_session_expiration:
     node_type: setting
@@ -2222,6 +2223,7 @@ properties:
     - template_section:Dogstatsd
     platform_default:
       linux: /var/run/datadog/dsd.socket
+      aix: /var/run/datadog/dsd.socket
       other: ''
   dogstatsd_origin_detection:
     node_type: setting

pkg/config/schema/yaml/process_config.yaml

@@ -240,6 +240,7 @@ properties:
     platform_default:
       linux: ${install_path}/bin/agent/agent
       darwin: ${install_path}/bin/agent/agent
+      aix: ${install_path}/bin/agent/agent
       windows: ${install_path}/bin/agent.exe
   dd_agent_env:
     node_type: setting

pkg/config/schema/yaml/system-probe_schema.yaml

@@ -26,6 +26,7 @@ properties:
         platform_default:
           linux: ${run_path}/sysprobe.sock
           darwin: ${run_path}/sysprobe.sock
+          aix: ${run_path}/sysprobe.sock
           windows: \\.\pipe\dd_system_probe
       log_file:
         node_type: setting