From 4eb3df901bed7c00938626320e47e0515f6ba91a Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Wed, 3 Nov 2021 12:00:10 +0100 Subject: [PATCH 1/3] Turn off the Agent 6.14 fix for Windows by default --- defaults/main.yml | 2 ++ tasks/pkg-windows.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c8d85e57..6864122c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -130,6 +130,8 @@ datadog_windows_versioned_url: "https://s3.amazonaws.com/ddagent-windows-stable/ # url of the 6.14 fix script. See https://dtdg.co/win-614-fix for more details. datadog_windows_614_fix_script_url: "https://s3.amazonaws.com/ddagent-windows-stable/scripts/fix_6_14.ps1" +# whether or not to download and apply the above fix +datadog_apply_windows_614_fix: false # Override to change the name of the windows user to create datadog_windows_ddagentuser_name: "" diff --git a/tasks/pkg-windows.yml b/tasks/pkg-windows.yml index 96566f4e..0c1a4733 100644 --- a/tasks/pkg-windows.yml +++ b/tasks/pkg-windows.yml @@ -8,13 +8,13 @@ win_get_url: url: "{{ datadog_windows_614_fix_script_url }}" dest: '%TEMP%\fix_6_14.ps1' - when: not datadog_skip_install + when: not datadog_skip_install and datadog_apply_windows_614_fix - name: Run 6.14.0/1 PowerShell fix win_shell: | Set-ExecutionPolicy Bypass -Scope Process -Force &$env:temp\fix_6_14.ps1 - when: not datadog_skip_install + when: not datadog_skip_install and datadog_apply_windows_614_fix - include_tasks: win_agent_latest.yml when: (not datadog_skip_install) and (datadog_agent_windows_version is not defined) From fabebb8eb6ef04de9b4447260a2cc4983a9fedcc Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Wed, 3 Nov 2021 12:24:09 +0100 Subject: [PATCH 2/3] Default to true instead of false, add docs --- README.md | 1 + defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 28268390..097da10f 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ To deploy the Datadog Agent on hosts, add the Datadog role and your API key to y | `datadog_additional_groups` | Either a list, or a string containing a comma-separated list of additional groups for the `datadog_user` (Linux only). | | `datadog_windows_ddagentuser_name` | The name of Windows user to create/use, in the format `\` (Windows only). | | `datadog_windows_ddagentuser_password` | The password used to create the user and/or register the service (Windows only). | +| `datadog_apply_windows_614_fix` | Whether or not to download and apply file referenced by `datadog_windows_614_fix_script_url` (Windows only). See https://dtdg.co/win-614-fix for more details. You can set this to `false` assuming your hosts aren't running Datadog Agent 6.14.\* and you're not planning to install that version either. | ### Integrations diff --git a/defaults/main.yml b/defaults/main.yml index 6864122c..55a0d5f2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -131,7 +131,7 @@ datadog_windows_versioned_url: "https://s3.amazonaws.com/ddagent-windows-stable/ # url of the 6.14 fix script. See https://dtdg.co/win-614-fix for more details. datadog_windows_614_fix_script_url: "https://s3.amazonaws.com/ddagent-windows-stable/scripts/fix_6_14.ps1" # whether or not to download and apply the above fix -datadog_apply_windows_614_fix: false +datadog_apply_windows_614_fix: true # Override to change the name of the windows user to create datadog_windows_ddagentuser_name: "" From 855697c170ae20f10d9e221ee46a2fb34af6ff3e Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Wed, 3 Nov 2021 12:37:09 +0100 Subject: [PATCH 3/3] Update README.md Co-authored-by: Pablo Baeyens --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 097da10f..22e25f0d 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ To deploy the Datadog Agent on hosts, add the Datadog role and your API key to y | `datadog_additional_groups` | Either a list, or a string containing a comma-separated list of additional groups for the `datadog_user` (Linux only). | | `datadog_windows_ddagentuser_name` | The name of Windows user to create/use, in the format `\` (Windows only). | | `datadog_windows_ddagentuser_password` | The password used to create the user and/or register the service (Windows only). | -| `datadog_apply_windows_614_fix` | Whether or not to download and apply file referenced by `datadog_windows_614_fix_script_url` (Windows only). See https://dtdg.co/win-614-fix for more details. You can set this to `false` assuming your hosts aren't running Datadog Agent 6.14.\* and you're not planning to install that version either. | +| `datadog_apply_windows_614_fix` | Whether or not to download and apply file referenced by `datadog_windows_614_fix_script_url` (Windows only). See https://dtdg.co/win-614-fix for more details. You can set this to `false` assuming your hosts aren't running Datadog Agent 6.14.\*. | ### Integrations