Increase version to 2.3.0p2

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.0p2                     | 1.0.90           |
 | 2.3.0p1                     | 1.0.89           |
 | 2.3.0                       | 1.0.88           |
 | 2.2.0p25                    | 1.0.87           |
 | 2.2.0p24                    | 1.0.86           |
-| 2.2.0p23                    | 1.0.85           |
 
 ## 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.0p1` |
+| checkmk_agent_version | Version of CheckMK Agent to install | `2.3.0p2` |
 | 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` |
@@ -222,6 +222,10 @@ Example that purges the `plugin` folder before re-creating it:
 
 [GNU General Public License version 2](https://www.gnu.org/licenses/gpl-2.0.txt)
 
+## Contributing
+
+If you have any suggestions or ideas, please feel free to open an issue, or fork the repository and submit an merge request.
+
 ## Author Information
 
 - [@kso512](https://github.com/kso512)

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.0p1
+checkmk_agent_version: 2.3.0p2
 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/check_mk_agent.linux.j2

@@ -694,6 +694,8 @@ section_zfs() {
 }
 
 section_nfs_mounts() {
+    proc_mounts_file=${1}
+
     if inpath waitmax; then
         STAT_VERSION=$(stat --version | head -1 | cut -d" " -f4)
         STAT_BROKE="5.3.0"
@@ -707,9 +709,10 @@ section_nfs_mounts() {
 
         echo '<<<nfsmounts_v2:sep(0)>>>'
 
-        sed -n '/ nfs4\? /s/\([^ ]*\) \([^ ]*\) .*/\1 \2/p' </proc/mounts |
-            sed 's/\\040/ /g' |
+        sed -n '/ nfs4\? /s/\([^ ]*\) \([^ ]*\) .*/\1 \2/p' <"${proc_mounts_file}" |
             while read -r MD MP; do
+                MD="$(printf "%s" "${MD}" | sed 's/\\040/ /g')"
+                MP="$(printf "%s" "${MP}" | sed 's/\\040/ /g')"
                 if [ "${STAT_VERSION}" != "${STAT_BROKE}" ]; then
                     waitmax -s 9 5 stat -f -c "$(json_templ "${MP}" "${MD}")" "${MP}" ||
                         json_templ_empty "${MP}" "${MD}"
@@ -720,9 +723,9 @@ section_nfs_mounts() {
             done
 
         echo '<<<cifsmounts>>>'
-        sed -n -e '/ cifs /s/.*\ \([^ ]*\)\ cifs\ .*/\1/p' </proc/mounts |
-            sed 's/\\040/ /g' |
+        sed -n -e '/ cifs /s/.*\ \([^ ]*\)\ cifs\ .*/\1/p' <"${proc_mounts_file}" |
             while read -r MP; do
+                MP="$(printf "%s" "${MP}" | sed 's/\\040/ /g')"
                 if [ ! -r "${MP}" ]; then
                     echo "${MP} Permission denied"
                 elif [ "${STAT_VERSION}" != "${STAT_BROKE}" ]; then
@@ -2052,7 +2055,7 @@ run_purely_synchronous_sections() {
     # Check NFS mounts by accessing them with stat -f (System
     # call statfs()). If this lasts more then 2 seconds we
     # consider it as hanging. We need waitmax.
-    [ -z "${MK_SKIP_NFS_MOUNTS}" ] && _log_section_time section_nfs_mounts
+    [ -z "${MK_SKIP_NFS_MOUNTS}" ] && _log_section_time section_nfs_mounts "/proc/mounts"
 
     # Check mount options. Filesystems may switch to 'ro' in case
     # of a read error.

templates/mk_docker.py.j2

@@ -727,7 +727,6 @@ def _call_single_containers_sections(client, config, container_id):
 
 
 def main():
-
     args = parse_arguments()
     config = get_config(args.config_file)
 

templates/mk_inventory.vbs.j2

@@ -299,8 +299,8 @@ Call getWMIObject("Win32_ComputerSystem",systemVars)
 
 ' ComputerSystemProduct
 Call startSection("win_computersystemproduct",58,timeUntil)
-systemVars = Array( "IdentifyingNumber","Name","UUID","Vendor" )
-Call getWMIObject("Win32_ComputerSystemProduct",systemVars)
+computerSystemProductVars = Array( "UUID" )
+Call getWMIObject("Win32_ComputerSystemProduct",computerSystemProductVars)
 
 ' Hard-Disk
 Call startSection("win_disks",58,timeUntil)