From bb69d2d25432aeca3658e07b9d91e520a644ec81 Mon Sep 17 00:00:00 2001
From: Chris Lindbergh <chrislindbergh@gmail.com>
Date: Fri, 10 Nov 2023 14:28:02 -0700
Subject: [PATCH] Increase version to 2.2.0p12

---
 README.md                         |   4 +--
 defaults/main.yml                 |   2 +-
 files/check_mk_agent.msi          | Bin 13021184 -> 13021184 bytes
 templates/check_mk_agent.linux.j2 |  39 +++++++++++++++---------------
 templates/mk_postgres.py.j2       |  27 +++++++++++++--------
 5 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 1340b02..20b7eef 100644
--- a/README.md
+++ b/README.md
@@ -49,11 +49,11 @@ Create your own "check_mk.user.yml.j2" and override `checkmk_agent_win_config_sr
 
 | CheckMK Raw Edition Version | Role Version/Tag |
 | --------------------------- | ---------------- |
+| 2.2.0p12                    | 1.0.75           |
 | 2.2.0p11                    | 1.0.74           |
 | 2.2.0p10                    | 1.0.73           |
 | 2.2.0p9                     | 1.0.72           |
 | 2.2.0p8                     | 1.0.71           |
-| 2.2.0p7                     | 1.0.69 - 1.0.70  |
 
 ## Requirements
 
@@ -158,7 +158,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.2.0p11"` |
+| checkmk_agent_version | Version of CheckMK Agent to install | `"2.2.0p12"` |
 | checkmk_agent_win_config_dest | Full pathname of configuration file | `"{{ checkmk_agent_win_data_folder }}check_mk.user.yml"` |
 | checkmk_agent_win_config_src | Filename of the configuration file template | `"check_mk.user.yml.j2"` |
 | checkmk_agent_win_data_folder | Full pathname of the CheckMK Agent data folder | `"C:\\ProgramData\\checkmk\\agent\\"` |
diff --git a/defaults/main.yml b/defaults/main.yml
index 9e12dd3..4ea593f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -88,7 +88,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.2.0p11"
+checkmk_agent_version: "2.2.0p12"
 checkmk_agent_win_config_dest: "{{ checkmk_agent_win_data_folder }}check_mk.user.yml"
 checkmk_agent_win_config_src: "check_mk.user.yml.j2"
 checkmk_agent_win_data_folder: "C:\\ProgramData\\checkmk\\agent\\"
diff --git a/files/check_mk_agent.msi b/files/check_mk_agent.msi
index d1c52fb079ae31ec2363f9b08c8b402fc3eccc59..9aa6dd5cfc66505b3b781798fd938476ecaedb73 100644
GIT binary patch
delta 7050
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
VaGvtr&BIK#z*v|odcjRE`G2JKT*CkW

delta 7090
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

diff --git a/templates/check_mk_agent.linux.j2 b/templates/check_mk_agent.linux.j2
index d1e5d84..0360bcd 100755
--- a/templates/check_mk_agent.linux.j2
+++ b/templates/check_mk_agent.linux.j2
@@ -1620,17 +1620,19 @@ run_cached() {
     fi
 
     # ideally, these should be independent parameters:
-    TIMEOUT=$((MAXAGE * 2))
+    CREATION_TIMEOUT=$((MAXAGE * 2))
+    OUTPUT_TIMEOUT=$((MAXAGE * 3))
 
     [ -d "${MK_VARDIR}/cache" ] || mkdir -p "${MK_VARDIR}/cache"
     CACHEFILE="${MK_VARDIR}/cache/${NAME}.cache"
+    FAIL_REPORT_FILE="${SPOOLDIR}/${NAME}.cachefail"
 
     NOW="$(get_epoch)"
     MTIME="$(get_file_mtime "${CACHEFILE}" 2>/dev/null)" || MTIME=0
 
     if ${MK_RUN_SYNC_PARTS}; then
-        if [ -s "${CACHEFILE}" ]; then
-            # Output the file (even if it is outdated)
+        if [ -s "${CACHEFILE}" ] && [ $((NOW - MTIME)) -le "${OUTPUT_TIMEOUT}" ]; then
+            # Output the file (if it is not too outdated)
             CACHE_INFO="cached(${MTIME},${MAXAGE})"
             # prefix or insert cache info, unless already present.
             # WATCH OUT: AIX does not allow us to pass this as a single '-e' option!
@@ -1641,33 +1643,32 @@ run_cached() {
             fi
         fi
 
-        # Error information about plugin, if available.
-        # Output independent of cachefile existance
-        [ -s "${CACHEFILE}.fail" ] && cat "${CACHEFILE}.fail"
     fi
 
     if ${MK_RUN_ASYNC_PARTS}; then
-        # Kill the process if it is running too long (cache file not accessed for more than TIMEOUT seconds).
+        # Kill the process if it is running too long (cache file not accessed for more than CREATION_TIMEOUT seconds).
         # If killing succeeds, remove CACHFILE.new.PID.
-        # Remove CACHEFILE unconditionally.
-        # Write info about the timed out process and the kill attempt to CACHEFILE.fail.
-        # It will be reported to the Check_MK agent service later on, by the sync part.
-        # CACHEFILE.fail will be deleted as soon as the plugin/local check is functional again.
+        # Write info about the timed out process and the kill attempt to the SPOOLDIR.
+        # It will be reported to the server in the next (synchronous) agent execution.
+        # The file will be deleted as soon as the plugin/local check is functional again.
+        # Do not output the file here, it will interrupt the local and mrpe sections, as well as any other
+        # partially cached section.
         for cfile in "${CACHEFILE}.new."*; do
             [ -e "${cfile}" ] || break # no match
-            if [ $((NOW - $(get_file_atime "${cfile}"))) -ge "${TIMEOUT}" ]; then
+            TRYING_SINCE="$(get_file_atime "${cfile}")"
+            [ -n "${TRYING_SINCE}" ] || break # race condition: file vanished
+            if [ $((NOW - TRYING_SINCE)) -ge "${CREATION_TIMEOUT}" ]; then
                 {
-                    echo "<<<checkmk_cached_plugins:sep(124)>>>"
+                    printf "<<<checkmk_cached_plugins:sep(124)>>>\n"
                     pid="${cfile##*.new.}"
-                    printf "timeout|%s|%s|%s\n" "${NAME}" "${TIMEOUT}" "${pid}"
+                    printf "timeout|%s|%s|%s\n" "${NAME}" "${CREATION_TIMEOUT}" "${pid}"
                     kill -9 "${pid}" >/dev/null 2>&1 && sleep 2 # TODO: what about child processes?
                     if [ -n "$(ps -o args= -p "${pid}")" ]; then
-                        printf "killfailed|%s|%s|%s\n" "${NAME}" "${TIMEOUT}" "${pid}"
+                        printf "killfailed|%s|%s|%s\n" "${NAME}" "${CREATION_TIMEOUT}" "${pid}"
                     else
                         rm -f "${cfile}"
                     fi
-                    rm -f "${CACHEFILE}"
-                } >"${CACHEFILE}".fail 2>&1
+                } >"${FAIL_REPORT_FILE}" 2>&1
             fi
         done
 
@@ -1685,13 +1686,13 @@ run_cached() {
             cat <<HERE | nohup "${CURRENT_SHELL}" >/dev/null 2>&1 &
 eval '${MK_DEFINE_LOG_SECTION_TIME}'
 exec > "${CACHEFILE}.new.\$\$" || exit 1
-$* && mv -f "${CACHEFILE}.new.\$\$" "${CACHEFILE}" && rm -f "${CACHEFILE}.fail" || rm -f "${CACHEFILE}" "${CACHEFILE}.new.\$\$"
+$* && mv -f "${CACHEFILE}.new.\$\$" "${CACHEFILE}" && rm -f "${FAIL_REPORT_FILE}" || rm -f "${CACHEFILE}.new.\$\$"
 HERE
         fi
 
     fi
 
-    unset NAME MAXAGE TIMEOUT REFRESH_INTERVAL CACHEFILE NOW MTIME CACHE_INFO
+    unset NAME MAXAGE CREATION_TIMEOUT REFRESH_INTERVAL CACHEFILE NOW MTIME CACHE_INFO TRYING_SINCE OUTPUT_TIMEOUT
 }
 
 run_local_checks() {
diff --git a/templates/mk_postgres.py.j2 b/templates/mk_postgres.py.j2
index 1fc3c6b..39dc9dd 100644
--- a/templates/mk_postgres.py.j2
+++ b/templates/mk_postgres.py.j2
@@ -14,9 +14,8 @@ Example for postgres.cfg file:
 
 -----postgres.cfg-----------------------------------------
 DBUSER=postgres
-INSTANCE=/home/postgres/db1.env:USER_NAME:/PATH/TO/.pgpass
-INSTANCE=/home/postgres/db2.env:USER_NAME:/PATH/TO/.pgpass
-INSTANCE=...
+INSTANCE=/home/postgres/db1.env:USER_NAME:/PATH/TO/.pgpass:
+INSTANCE=/home/postgres/db2.env:USER_NAME:/PATH/TO/.pgpass:
 ----------------------------------------------------------
 """
 
@@ -1199,6 +1198,18 @@ def parse_env_file(env_file):
     return pg_database, pg_port, pg_version
 
 
+def _parse_INSTANCE_value(value, config_separator):
+    # type: (str, str) -> tuple[str, str, str, str]
+    keys = value.split(config_separator)
+    if len(keys) == 3:
+        # Old format (deprecated in Werk 16016), but we don't force updates unless there is
+        # a substantial benefit.
+        keys = keys + [""]
+    env_file, pg_user, pg_passfile, instance_name = keys
+    env_file = env_file.strip()
+    return env_file, pg_user, pg_passfile, instance_name or env_file.split(os.sep)[-1].split(".")[0]
+
+
 def parse_postgres_cfg(postgres_cfg, config_separator):
     # type: (List[str], str) -> Tuple[str, List[Dict[str, Optional[str]]]]
     """
@@ -1215,13 +1226,9 @@ def parse_postgres_cfg(postgres_cfg, config_separator):
         if key == "DBUSER":
             dbuser = value.rstrip()
         if key == "INSTANCE":
-            env_file, pg_user, pg_passfile, instance_name = value.split(config_separator)
-            env_file = env_file.strip()
-            instance_name = instance_name or env_file.split(os.sep)[-1].split(".")[0]
-            if not instance_name:
-                raise ValueError(
-                    "Instance name can not be inferred from .env file, instance name should be specified explicitly"
-                )
+            env_file, pg_user, pg_passfile, instance_name = _parse_INSTANCE_value(
+                value, config_separator
+            )
             pg_database, pg_port, pg_version = parse_env_file(env_file)
             instances.append(
                 {