dont print nagios exit string for zabbix

Author: smoors

lib/vsc/utils/nagios.py

@@ -280,11 +280,15 @@ def report_and_exit(self):
 
         if self.threshold <= 0 or time.time() - timestamp < self.threshold:
             self.log.info("Nagios check cache file %s contents delivered: %s", self.filename, nagios_message)
-            print("%s %s" % (nagios_exit_string, nagios_message))
+            self.print_report(nagios_exit_string, nagios_message)
             sys.exit(nagios_exit_code)
         else:
             unknown_exit("%s gzipped JSON file too old (timestamp = %s)" % (self.header, time.ctime(timestamp)))
 
+    def print_report(self, nagios_exit_string, nagios_message):
+        """Print the nagios report"""
+        print("%s %s" % (nagios_exit_string, nagios_message))
+
     def cache(self, nagios_exit, nagios_message):
         """Store the result in the cache file with a timestamp.
 
@@ -434,6 +438,11 @@ class SimpleNagios(NagiosResult):
 
     def __init__(self, **kwargs):
         """Initialise message and perfdata"""
+        self._init(**kwargs)
+
+    def _init(self, reporterclass=NagiosReporter, **kwargs):
+        """The real init method"""
+
         self.__dict__ = {}
         self.message = None  # the message
 
@@ -453,10 +462,10 @@ def __init__(self, **kwargs):
         if self._cache:
             # make a NagiosReporter instance that can be used for caching
             if self._cache_user:
-                cache = NagiosReporter('no header', self._cache, self._threshold, nagios_username=self._cache_user,
+                cache = reporterclass('no header', self._cache, self._threshold, nagios_username=self._cache_user,
                                        world_readable=self._world_readable)
             else:
-                cache = NagiosReporter('no header', self._cache, self._threshold, world_readable=self._world_readable)
+                cache = reporterclass('no header', self._cache, self._threshold, world_readable=self._world_readable)
             if self._report_and_exit:
                 cache.report_and_exit()
             else:

lib/vsc/utils/zabbix.py

@@ -30,15 +30,29 @@
 
 @author: Samuel Moors (Vrije Universiteit Brussel)
 """
+from __future__ import print_function
 
 import json
 
-from vsc.utils.nagios import SimpleNagios
+
+from vsc.utils.nagios import SimpleNagios, NagiosReporter
 
 
 class SimpleZabbix(SimpleNagios):
+    def __init__(self, **kwargs):
+        """Initialise message and perfdata"""
+        super(SimpleZabbix, self)._init(reporterclass=ZabbixReporter, **kwargs)
+
     def __str__(self):
         """__str__ determines how the data is written to the cache"""
         processed_dict = {key: value for (key, value) in self.__dict__.items() if not key.startswith('_')}
         return json.dumps(processed_dict)
 
+
+class ZabbixReporter(NagiosReporter):
+    """Reporting class for Zabbix reports"""
+
+    def print_report(self, nagios_exit_string, nagios_message):
+        """Print the nagios report"""
+        print(nagios_message)
+