19505 FIX Windows agent command compatibility

alecmkandro · alecmkandro · commit 73e69a4e54be · 2026-03-24T14:18:55.000+01:00
The commands to download and register the Windows agent in the agent
registration slide-out were not compatible with both CMD and Powershell.

Avoid compatibility problems with older versions of Powershell that
don't support `&amp;&amp;` by splitting the Windows download and installation
command into two: one for download and a second one for installation.

Additionally, avoid compatibility problems with Powershell by not
splitting the registration command into multiple lines using `^`.

CMK-32105

Change-Id: Iefcaa56f154f9293d59a834f849aac3686765d8d
diff --git a/.werks/19505.md b/.werks/19505.md
@@ -0,0 +1,22 @@
+[//]: # (werk v3)
+# Fix Windows agent command compatibility issues
+
+key        | value
+---------- | ---
+date       | 2026-03-20T12:14:08.081364+00:00
+version    | 2.5.0b2
+class      | fix
+edition    | community
+component  | wato
+level      | 1
+compatible | yes
+
+The commands to download and register the Windows agent in the agent
+registration slide-out were not compatible with both CMD and Powershell.
+
+Avoid compatibility problems with older versions of Powershell that
+don't support `&&` by splitting the Windows download and installation
+command into two: one for download and a second one for installation.
+
+Additionally, avoid compatibility problems with Powershell by not
+splitting the registration command into multiple lines using `^`.
diff --git a/cmk/gui/utils/agent_commands.py b/cmk/gui/utils/agent_commands.py
@@ -29,15 +29,16 @@
 from cmk.shared_typing.setup import AgentRegistrationCmds as SetupAgentRegistrationCmds
 from cmk.shared_typing.setup import AgentSlideout as SetupAgentSlideout
 
-WINDOWS_AGENT_INSTALL_CMD = (
+WINDOWS_AGENT_DOWNLOAD_CMD = (
     "curl.exe -o check-mk-agent_{version}.msi"
     ' "{{{{SERVER}}}}/{{{{SITE}}}}/check_mk/api/internal/domain-types/agent/actions/download_by_token/invoke"'
     ' --header "Accept: application/octet-stream"'
     ' --header "Authorization: CMK-TOKEN 0:[AGENT_DOWNLOAD_OTT]"'
     ' --data-urlencode "os_type=windows_msi"'
-    " && msiexec /i check-mk-agent_{version}.msi"
 )
 
+WINDOWS_AGENT_INSTALL_CMD = "msiexec /i check-mk-agent_{version}.msi"
+
 LINUX_DEBIAN_AGENT_INSTALL_CMD = """curl -o check-mk-agent_{version}-1_all.deb -fJG \\
     '{{{{SERVER}}}}/{{{{SITE}}}}/check_mk/api/internal/domain-types/agent/actions/download_by_token/invoke' \\
     --header 'Accept: application/octet-stream' \\
@@ -58,17 +59,20 @@ def build_agent_install_cmds(
     hostname: HostName,
 ) -> AgentInstallCmds:
     return AgentInstallCmds(
+        windows_download=WINDOWS_AGENT_DOWNLOAD_CMD.format(version=version),
         windows=WINDOWS_AGENT_INSTALL_CMD.format(version=version),
         linux_deb=LINUX_DEBIAN_AGENT_INSTALL_CMD.format(version=version),
         linux_rpm=LINUX_RPM_AGENT_INSTALL_CMD.format(version=version),
     )
 
 
-WINDOWS_AGENT_REGISTRATION_CMD = """\"C:\\Program Files (x86)\\checkmk\\service\\cmk-agent-ctl.exe\" register ^
-    --hostname {{HOSTNAME}} ^
-    --server {{SERVER}} ^
-    --site {{SITE}} ^
-    --user agent_registration"""
+WINDOWS_AGENT_REGISTRATION_CMD = (
+    '"C:\\Program Files (x86)\\checkmk\\service\\cmk-agent-ctl.exe" register'
+    " --hostname {{HOSTNAME}}"
+    " --server {{SERVER}}"
+    " --site {{SITE}}"
+    " --user agent_registration"
+)
 
 LINUX_REGISTRATION_CMD = """sudo cmk-agent-ctl register \\
     --hostname {{HOSTNAME}} \\
diff --git a/packages/cmk-frontend-vue/src/mode-host/agent-connection-test/components/AgentSlideOut.vue b/packages/cmk-frontend-vue/src/mode-host/agent-connection-test/components/AgentSlideOut.vue
@@ -203,14 +203,31 @@ function getInitStep() {
                     <GenerateToken
                       v-model="ott"
                       token-generation-endpoint-uri="domain-types/agent_download_token/collections/all"
-                      :description="_t('This requires the generation of a download token.')"
+                      :description="
+                        _t(
+                          'To securely fetch the latest agent package via the command line, you must first generate a temporary authentication token. ' +
+                            'This token is valid for 7 days and is used solely for the download process'
+                        )
+                      "
                       :expires-in-seconds="604800"
                       :token-generation-body="{}"
                     />
                   </div>
                   <template v-if="ott !== null">
+                    <template v-if="tab.installDownloadCmd">
+                      <CmkCode
+                        :title="_t('Download agent')"
+                        :code_txt="installCmdWithToken(tab.installDownloadCmd)"
+                        class="code"
+                      />
+                      <CmkCode
+                        :title="_t('Install agent')"
+                        :code_txt="tab.installCmd || ''"
+                        class="code"
+                      />
+                    </template>
                     <CmkCode
-                      v-if="tab.installMsg && tab.installCmd"
+                      v-else-if="tab.installMsg && tab.installCmd"
                       :code_txt="installCmdWithToken(tab.installCmd)"
                       class="code"
                     />
diff --git a/packages/cmk-frontend-vue/src/mode-host/agent-connection-test/components/AgentSlideOutContent.vue b/packages/cmk-frontend-vue/src/mode-host/agent-connection-test/components/AgentSlideOutContent.vue
@@ -85,8 +85,9 @@ const tabs = computed<AgentSlideOutTabs[]>(() => [
     id: 'windows',
     title: _t('Windows'),
     installMsg: _t(
-      'Run this command on your Windows host to download and install the Checkmk agent. Please make sure to run this command with sufficient permissions (e.g. "Run as Administrator")'
+      'Run these commands on your Windows host to download and install the Checkmk agent. Please make sure to run these commands with sufficient permissions (e.g. "Run as Administrator")'
     ),
+    installDownloadCmd: replaceMacros(props.agentInstallCmds.windows_download, false),
     installCmd: replaceMacros(props.agentInstallCmds.windows, false),
     registrationMsg: _t(
       'After you have downloaded the agent, run this command on your Windows host to register the Checkmk agent controller. Please make sure to run this command with sufficient permissions (e.g. "Run as Administrator").'
diff --git a/packages/cmk-frontend-vue/src/mode-host/agent-connection-test/lib/type_def.ts b/packages/cmk-frontend-vue/src/mode-host/agent-connection-test/lib/type_def.ts
@@ -18,6 +18,7 @@ export interface AgentSlideOutTabs {
   title: string
   installMsg?: TranslatedString
   installCmd?: string | undefined
+  installDownloadCmd?: string
   installDebCmd?: string
   installRpmCmd?: string
   installTgzCmd?: string | undefined
diff --git a/packages/cmk-shared-typing/source/agent_slideout.json b/packages/cmk-shared-typing/source/agent_slideout.json
@@ -26,14 +26,15 @@
     "agent_install_cmds": {
       "type": "object",
       "properties": {
+        "windows_download": { "type": "string" },
         "windows": { "type": "string" },
         "linux_deb": { "type": "string" },
         "linux_rpm": { "type": "string" },
         "linux_tgz": { "type": "string" },
         "solaris": { "type": "string" },
         "aix": { "type": "string" }
       },
-      "required": ["windows", "linux_deb", "linux_rpm"]
+      "required": ["windows_download", "windows", "linux_deb", "linux_rpm"]
     },
     "agent_registration_cmds": {
       "type": "object",
