use 'zabbix' as default cache user for zabbix

Author: smoors

lib/vsc/utils/nagios.py

@@ -435,6 +435,7 @@ class SimpleNagios(NagiosResult):
     RESERVED_WORDS = set(['message', 'ok', 'warning', 'critical', 'unknown',
                          '_exit', '_cache', '_cache_user', '_final', '_final_state', '_report', '_threshold'])
     REPORTERCLASS = NagiosReporter
+    DEFAULT_CACHE_USER = 'nrpe'
 
     def __init__(self, **kwargs):
         """Initialise message and perfdata"""

lib/vsc/utils/script_tools.py

@@ -80,7 +80,7 @@ def _script_name(full_name):
                               os.path.join(NAGIOS_CACHE_DIR,
                                            NAGIOS_CACHE_FILENAME_TEMPLATE % (_script_name(sys.argv[0]),))),
     'nagios-check-interval-threshold': ('threshold of nagios checks timing out', 'int', 'store', 0),
-    'nagios-user': ('user nagios runs as', 'string', 'store', 'nrpe'),
+    'nagios-user': ('user nagios runs as', 'string', 'store', None),
     'nagios-world-readable-check': ('make the nagios check data file world readable', None, 'store_true', False),
 }
 
@@ -128,6 +128,9 @@ def __init__(self, options, run_prologue=True, excepthook=None, **kwargs):
         options_ = _merge_options(options)
         super(ExtendedSimpleOption, self).__init__(options_, **kwargs)
 
+        if not self.options.nagios_user:
+            self.options.nagios_user = self.MONITORCLASS.DEFAULT_CACHE_USER
+
         self.nagios_reporter = None
         self.lockfile = None
 

lib/vsc/utils/zabbix.py

@@ -52,6 +52,7 @@ def print_report_and_exit(self, timestamp, nagios_exit_code, nagios_exit_string,
 class SimpleZabbix(SimpleNagios):
     """Class to allow easy interaction with Zabbix related code"""
     REPORTERCLASS = ZabbixReporter
+    DEFAULT_CACHE_USER = 'zabbix'
 
     def __str__(self):
         """__str__ determines how the data is written to the cache"""