Increase version to 2.2.0p8

kso512 · Aug 22, 2023 · c3ff70e · c3ff70e
1 parent 1c0450a
commit c3ff70e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git 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.0p8                     | 1.0.71           |
 | 2.2.0p7                     | 1.0.69 - 1.0.70  |
 | 2.2.0p6                     | 1.0.68           |
 | 2.2.0p5                     | 1.0.67           |
 | 2.2.0p4                     | 1.0.66           |
-| 2.2.0p3                     | 1.0.65           |
 
 ## 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.0p7"` |
+| checkmk_agent_version | Version of CheckMK Agent to install | `"2.2.0p8"` |
 | 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
@@ -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.0p7"
+checkmk_agent_version: "2.2.0p8"
 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
diff --git a/templates/mk_postgres.py.j2 b/templates/mk_postgres.py.j2
@@ -1215,12 +1215,17 @@ def parse_postgres_cfg(postgres_cfg, config_separator):
         if key == "DBUSER":
             dbuser = value.rstrip()
         if key == "INSTANCE":
-            env_file, pg_user, pg_passfile = value.split(config_separator)
+            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"
+                )
             pg_database, pg_port, pg_version = parse_env_file(env_file)
             instances.append(
                 {
-                    "name": env_file.split(os.sep)[-1].split(".")[0],
+                    "name": instance_name,
                     "pg_user": pg_user.strip(),
                     "pg_passfile": pg_passfile.strip(),
                     "pg_database": pg_database,