Increase version to 2.3.0p20

README.md

@@ -52,11 +52,11 @@ Similar modifications have been made to the `docker.cfg` default file.  Here, al
 
 | CheckMK Raw Edition Version | Role Version/Tag |
 | --------------------------- | ---------------- |
+| 2.3.0p20                    | 1.1.9            |
 | 2.3.0p19                    | 1.1.8            |
 | 2.3.0p18                    | 1.1.7            |
 | 2.3.0p17                    | 1.1.5 - 1.1.6    |
 | 2.3.0p16                    | 1.1.4            |
-| 2.3.0p15                    | 1.1.3            |
 
 ## Requirements
 
@@ -162,7 +162,7 @@ Some of these may be seem redundant but are specified so future users can overri
 | checkmk_agent_sudo_src | Filename of the "sudoers.d" file template | `99_cmkagent.j2` |
 | checkmk_agent_sudo_validate | Command used to validate the "sudoers.d" file; %s will be filled in with `checkmk_agent_sudo_dest` | `'visudo -cf %s'` |
 | checkmk_agent_user | Login name of the CheckMK Agent user | `cmkagent` |
-| checkmk_agent_version | Version of CheckMK Agent to install | `2.3.0p19` |
+| checkmk_agent_version | Version of CheckMK Agent to install | `2.3.0p20` |
 | checkmk_agent_win_config_dest | Full pathname of configuration file | `"{{ checkmk_agent_win_data_folder }}check_mk.user.yml"` |
 | checkmk_agent_win_config_optimize | Optimize the Windows agent by dropping some of the slower checks | `true` |
 | checkmk_agent_win_config_src | Filename of the configuration file template | `check_mk.user.yml.j2` |

defaults/main.yml

@@ -89,7 +89,7 @@ checkmk_agent_sudo_owner: root
 checkmk_agent_sudo_src: 99_cmkagent.j2
 checkmk_agent_sudo_validate: 'visudo -cf %s'
 checkmk_agent_user: cmkagent
-checkmk_agent_version: 2.3.0p19
+checkmk_agent_version: 2.3.0p20
 checkmk_agent_win_config_dest: "{{ checkmk_agent_win_data_folder }}check_mk.user.yml"
 checkmk_agent_win_config_optimize: true
 checkmk_agent_win_config_src: check_mk.user.yml.j2

templates/mk_inventory.vbs.j2

@@ -250,7 +250,7 @@ Sub SoftwareFromInstaller(fields)
                 idx = idx + 1
             Next
 
-            outPut(Join(values, "|"))
+            outPut(Join(values, Chr(0)))
         else
             'Products function
             Err.clear()
@@ -263,7 +263,7 @@ Sub SoftwareFromInstaller(fields)
                 idx = idx + 1
             Next
 
-            outPut(Join(values, "|"))
+            outPut(Join(values, Chr(0)))
         end if
     Next
 End Sub
@@ -322,7 +322,7 @@ Call startSection("win_ip_r",124,timeUntil)
 Call getRouteTable()
 
 ' Installed Software
-Call startSection("win_wmi_software",124,timeUntil)
+Call startSection("win_wmi_software",0,timeUntil)
 swVars = Array( "ProductName", "Publisher", "VersionString", "InstallDate", "Language")
 Call SoftwareFromInstaller(swVars)
 
@@ -336,7 +336,7 @@ Do While Not objExecObject.StdOut.AtEndOfStream
 Loop
 
 ' Search Registry
-Call startSection("win_reg_uninstall",124,timeUntil)
+Call startSection("win_reg_uninstall",0,timeUntil)
 Set rego = GetObject("WinMgmts:{impersonationLevel=impersonate}!\\.\root\default:StdRegProv")
 regVars = Array("DisplayName", "Publisher", "InstallLocation", "PSChildName", "DisplayVersion", "EstimatedSize", "InstallDate", "Language")
 
@@ -360,13 +360,13 @@ For Each path in regPaths
                 End If
                 ' Only allow vartypes which can be represented as a string
                 If VarType(value) <= 8 and VarType(value) > 1 Then
-                    strOut = strOut & "|" & CStr(value)
+                    strOut = strOut & Chr(0) & CStr(value)
                     ' Only print a line when more than only PSChildName is present
                     If var <> "PSChildName" Then
                         boleanContent = True
                     End If
                 Else
-                    strOut = strOut & "|"
+                    strOut = strOut & Chr(0)
                 End If
             Next
             If boleanContent Then