Merge ~canonical-is-bootstack/charm-hw-health:bug/1904045 into charm-hw-health:master

[Alvaro Uria]

[Alvaro Uria (aluria)]

* lint: commands succeeded
* unit tests: 42 passed, 16 warnings in 1.11s
* func tests: 27 passed, 17733 warnings in 1363.28s (0:22:43)

[Alvaro Uria (aluria)]

BTW, I tested the corner case of upgrading cs:hw-health-5 to a build of this fix, and the /var/lib/nagios/ipmi_sensors.out file got automatically generated with nagios:nagios ownership. The cronjob was reconfigured to run as "nagios" and the croned script was able to replace the root-owned generated file from before.

[James Troup (elmo)]

LGTM

diff --git a/src/lib/hwhealth/hwdiscovery.py b/src/lib/hwhealth/hwdiscovery.py
index 282f499..1bb8dba 100644
--- a/src/lib/hwhealth/hwdiscovery.py
+++ b/src/lib/hwhealth/hwdiscovery.py
@@ -30,7 +30,10 @@ def get_tools(manufacturer="auto"):
         # Some system vendors have multiple tools, have to iterate sets
         system_tools = set(chain.from_iterable(SUPPORTED_SYSTEMS.values()))
         driver_tools = set(SUPPORTED_DRIVERS.values())
-        all_tools = storage_tools | system_tools | driver_tools
+        ipmi_tools = set()
+        if hookenv.config("enable_ipmi"):
+            ipmi_tools = {tools.Ipmi}
+        all_tools = storage_tools | system_tools | driver_tools | ipmi_tools
         series_filtered_tools = set(
             tool for tool in all_tools if tool.is_series_supported()
         )
diff --git a/src/lib/hwhealth/tools.py b/src/lib/hwhealth/tools.py
index ddb602f..08c96dd 100644
--- a/src/lib/hwhealth/tools.py
+++ b/src/lib/hwhealth/tools.py
@@ -628,7 +628,7 @@ class Ipmi(Tool):
     def configure_nrpe_check(self, nrpe_setup):
         # extra options for check_ipmi_sensors Perl script are configured in
         # the cronjob
-        self._install_cronjob()
+        self._install_cronjob(cron_user="nagios")
         super().configure_nrpe_check(nrpe_setup)
 
     def install(self):