Fixed overriding MONITORING_TOOL on command line (#998)

* Fixed installer docs

* Fixed monitoring_tool override

* adding timeout to test script

* whoops: actually removed outdated entries

Author: mickem

docs/docs/installing.md

@@ -99,18 +99,18 @@ The MSI file can be customized during the installer. The following keys are avai
 
 ### Features
 
-NSClient++ consists of the following features most which can be disable when doing silent installs.
+NSClient++ consists of the following features most which can be disabled when doing silent installations.
 
 | Feature Name        | Title                  | Description                                                                               |
-| ------------------- | ---------------------- | ----------------------------------------------------------------------------------------- |
+|---------------------|------------------------|-------------------------------------------------------------------------------------------|
 | CheckPlugins        | Check Plugins          | Various plugins to check your system. (Includes all check plugins)                        |
-| Documentation       | Documentation (pdf)    | Documentation for NSClient++ and how to use it from Nagios                                |
-| DotNetPluginSupport | .net plugin support    | Support for loading modules written in .dot net (Requires installing .net framework)      |
 | ExtraClientPlugin   | Various client plugins | Plugins to connect to various systems such as syslog, graphite and smtp                   |
 | FirewallConfig      | Firewall Exception     | A firewall exception to allow NSClient++ to open ports                                    |
 | LuaScript           | Lua Scripting          | Allows running INTERNAL scripts written in Lua                                            |
 | NRPEPlugins         | NRPE Support           | NRPE Server Plugin. Support for the more versatile NRPE protocol (check_nrpe)             |
 | NSCAPlugin          | NSCA plugin            | Plugin to submit passive results to an NSCA server                                        |
+| CheckMK             | Check MK support       | Experimental support for check_mk server and clients                                      |
+| ElasticPlugin       | Elastic Search support | Support for submitting metrics to elastic                                                 |
 | NSCPlugins          | check_nt support       | NSClient Server Plugin. Support for the old NSClient protocol (check_nt)                  |
 | PythonScript        | Python Scripting       | Allows running INTERNAL scripts written in Python                                         |
 | SampleScripts       | Scripts                | Scripts for checking and testing various aspects of your computer and NSClient++          |

installer_lib/installer_helper.hpp

@@ -106,7 +106,7 @@ class msi_helper {
     std::wstring old = getMsiPropery(PREFIX_KEY + key);
     if (old.empty()) {
       logMessage(L" -- Setting " + std::wstring(PREFIX_KEY) + key + L" to '" + val + L"' as it was empty");
-      setMsiProperty(key, val);
+      setMsiProperty(PREFIX_KEY + key, val);
     }
   }
   void setPropertyKeyAndDefault(std::wstring key, std::wstring value, std::wstring old_value) {

tests/msi/helpers.py

@@ -30,7 +30,11 @@ def delete_registry_tree(root, subkey):
         raise e
 
 def ensure_uninstalled(msi_file, target_folder):
-    uninstall = run(["msiexec", "/x", f"{msi_file}", "/q"])
+    try:
+        uninstall = run(["msiexec", "/x", f"{msi_file}", "/q"], timeout=120)
+    except Exception as e:
+        print(f"! Uninstall process failed: {e}", flush=True)
+        exit(1)
     if uninstall.returncode == 1605:
         print("- No installation found, continuing with install.", flush=True)
     elif uninstall.returncode == 0:
@@ -40,7 +44,7 @@ def ensure_uninstalled(msi_file, target_folder):
         exit(1)
 
     print("- Killing any running NSClient++ processes.", flush=True)
-    taskkill = run(["taskkill", "/F", "/IM", "nscp.exe"])
+    run(["taskkill", "/F", "/IM", "nscp.exe"])
 
 
     delete_registry_tree(HKEY_LOCAL_MACHINE, r"Software\NSClient++")

tests/msi/tests/boot.ini-rest-config-without-monitoring-tool.yaml

@@ -0,0 +1,10 @@
+command_line: ["msiexec.exe", "/i", "$MSI-FILE", "/qn", "/l*", "log.txt", "ADDLOCAL=ALL", "TLS_VERIFY_MODE=none", "TLS_VERSION=1.2", "CONFIGURATION_TYPE=https://raw.githubusercontent.com/mickem/nscp/refs/heads/main/tests/rest/nsclient.ini", "MONITORING_TOOL=none" ]
+replace_password: true
+boot.ini: |
+  [settings]
+  1 = https://raw.githubusercontent.com/mickem/nscp/refs/heads/main/tests/rest/nsclient.ini
+  [tls]
+  verify mode = none
+  version = 1.2
+
+nsclient.ini: ""

tests/msi/tests/normal-install-without-monitoring-tool.yaml

@@ -0,0 +1,7 @@
+command_line: ["msiexec.exe", "/i", "$MSI-FILE", "/qn", "/l*", "log.txt", "ADDLOCAL=ALL", "MONITORING_TOOL=none" ]
+replace_password: true
+boot.ini: |
+  [settings]
+  1 = ini://${shared-path}/nsclient.ini
+
+nsclient.ini: ""