Update varnish4 plugin for SampleProbe

Jean Baptiste Favre · Jean Baptiste Favre · commit 0de1292e05d2 · 2015-09-01T15:06:14.000+02:00
diff --git a/scripts/varnish4.py b/scripts/varnish4.py
@@ -12,10 +12,10 @@
 from subprocess import check_output
 from time import time, sleep
 
-class VarnishServer():
+class VarnishServer(protobix.SampleProbe):
+
+    __version__ = '0.0.9'
 
-    __version__ = '0.0.8'
-    ZBX_CONN_ERR = 'ERR - unable to send data to Zabbix [%s]'
     METRICS = [
         ('cache[hit]', 'MAIN.cache_hit'),
         ('cache[hitpass]', 'MAIN.cache_hitpass'),
@@ -49,116 +49,45 @@ class VarnishServer():
         ('thread[queuelen]', 'MAIN.thread_queue_len')
     ]
 
-    def _parse_args(self):
-        ''' Parse the script arguments
-        '''
-        parser = optparse.OptionParser()
-
-        parser.add_option("-d", "--dry", action="store_true",
-                              help="Performs Varnish call but do not send "
-                                   "anything to the Zabbix server. Can be used "
-                                   "for both Update & Discovery mode")
-        parser.add_option("-D", "--debug", action="store_true",
-                          help="Enable debug mode. This will prevent bulk send "
-                               "operations and force sending items one after the "
-                               "other, displaying result for each one")
-        parser.add_option("-v", "--verbose", action="store_true",
-                          help="When used with debug option, will force value "
-                               "display for each items managed. Beware that it "
-                               "can be pretty too much verbose, specialy for LLD")
+    def _get_varnishstat(self,hostname):
+        varnish_stats = simplejson.loads(
+            check_output(
+                ['varnishstat', '-n', socket.gethostname(), '-1', '-j']
+            )
+        )
+        timestamp = int(time())
+        return varnish_stats, timestamp
 
-        mode_group = optparse.OptionGroup(parser, "Program Mode")
-        mode_group.add_option("--update-items", action="store_const",
-                              dest="mode", const="update_items",
-                              help="Get & send items to Zabbix. This is the default "
-                                   "behaviour even if option is not specified")
-        mode_group.add_option("--discovery", action="store_const",
-                              dest="mode", const="discovery",
-                              help="If specified, will perform Zabbix Low Level "
-                                   "Discovery on Varnish. "
-                                   "Default is to get & send items")
-        parser.add_option_group(mode_group)
-        parser.set_defaults(mode="update_items")
+    def _parse_args(self):
+        # Parse the script arguments
+        # Common part
+        parser = super( VarnishServer, self)._parse_args()
 
+        # Varnish options
         general_options = optparse.OptionGroup(parser, "Varnish Configuration")
-        general_options.add_option("-H", "--host", metavar="HOST", default="localhost",
+        general_options.add_option("-H", "--host", default="localhost",
                                    help="Varnish server hostname")
-        general_options.add_option("-p", "--port", help="Varnish server port",
-                                   default=6379)
+        general_options.add_option("-P", "--port", default=6379,
+                                   help="Varnish server port")
         parser.add_option_group(general_options)
 
-        polling_options = optparse.OptionGroup(parser, "Zabbix configuration")
-        polling_options.add_option("--zabbix-server", metavar="HOST",
-                                   default="localhost",
-                                   help="The hostname of Zabbix server or "
-                                        "proxy, default is localhost.")
-        polling_options.add_option("--zabbix-port", metavar="PORT", default=10051,
-                                   help="The port on which the Zabbix server or "
-                                        "proxy is running, default is 10051.")
-        parser.add_option_group(polling_options)
+        (options, args) = parser.parse_args()
+        return (options, args)
 
-        return parser.parse_args()
+    def _init_probe(self):
+        if self.options.host == 'localhost':
+            self.hostname = socket.getfqdn()
+        else:
+            self.hostname = self.options.host
 
     def _get_metrics(self, hostname):
         """ Get Varnish stats and parse it """
         data = {}
-        data[hostname] = {}
         stats, timestamp = self._get_varnishstat(hostname)
         for (key, metric) in self.METRICS:
-            data[hostname]["varnish.%s"%key] = stats[metric]['value']
-        return data
-
-    def _get_varnishstat(self,hostname):
-        varnish_stats = simplejson.loads(check_output(['varnishstat', '-n', socket.gethostname(), '-1', '-j']))
-        timestamp = int(time())
-        return varnish_stats, timestamp
-
-    def _init_container(self):
-        zbx_container = protobix.DataContainer(
-            data_type = 'items',
-            zbx_host  = self.options.zabbix_server,
-            zbx_port  = int(self.options.zabbix_port),
-            debug     = self.options.debug,
-            dryrun    = self.options.dry
-        )
-        zbx_container.data_type = 'items'
-        return zbx_container
-
-    def run(self):
-        (self.options, args) = self._parse_args()
-        if self.options.host == 'localhost':
-            hostname = socket.getfqdn()
-        else:
-            hostname = self.options.host
-
-        # Step 1: init container
-        try:
-            zbx_container = self._init_container()
-        except:
-            return 1
-
-        # Step 2: get data
-        try:
-            data = self._get_metrics(hostname)
-        except:
-            return 2
-
-        # Step 3: format & load data into container
-        try:
-            zbx_container.add(data)
-            zbx_container.add_item(hostname, "varnish.zbx_version", self.__version__)
-        except:
-            return 3
-
-        # Step 4: send container data to Zabbix server
-        try:
-            zbx_container.send(zbx_container)
-        except protobix.SenderException as zbx_e:
-            if self.options.debug:
-                print self.ZBX_CONN_ERR % zbx_e.err_text
-            return 4
-        # Everything went fine. Let's return 0 and exit
-        return 0
+            data["varnish.%s" % key] = stats[metric]['value']
+        data['varnish.zbx_version'] = self.__version__
+        return { hostname: data }
 
 if __name__ == '__main__':
     ret = VarnishServer().run()
