Fix beanstalkd collector, normalize metric format

When beanstalkd instance could not be contacted, it previously raised
an exception and terminated the collection; this has been fixed.

A not implemented part has been removed from Zookeeper collector.

Measurement names for beanstalk now contain only undescores.

Linted the new collectors with flake8

Author: vdombrovski

collectors/openio/openiobeanstalkd.py

@@ -27,13 +27,14 @@ class OpenioBeanstalkdCollector(diamond.collector.Collector):
 
     def process_config(self):
         super(OpenioBeanstalkdCollector, self).process_config()
-        self.instances = self.config['instances'] or 'OPENIO:127.0.0.1:6014'
+        self.instances = self.config.get('instances', 'OPENIO:127.0.0.1:6014')
 
     def get_default_config_help(self):
         config_help = super(OpenioBeanstalkdCollector,
                             self).get_default_config_help()
         config_help.update({
-            'instances': 'List of instances in the form NAMESPACE:host:port (comma separated)',
+            'instances': 'List of instances in the form NAMESPACE:host:port\
+                         (comma separated)',
         })
         return config_help
 
@@ -47,13 +48,13 @@ def get_default_config(self):
         })
         return config
 
-    def _get_stats(self,host,port):
+    def _get_stats(self, host, port):
         stats = {}
         try:
-            connection = beanstalkc.Connection(host,int(port))
-        except beanstalkc.BeanstalkcException, e:
+            connection = beanstalkc.Connection(host, int(port))
+        except beanstalkc.BeanstalkcException as e:
             self.log.error("Couldn't connect to beanstalkd: %s", e)
-            return {}
+            return None
 
         stats['instance'] = connection.stats()
         stats['tubes'] = []
@@ -74,23 +75,28 @@ def collect(self):
             instances = instances.split(',')
 
         for instance in instances:
-            namespace,host,port = instance.split(':')
-            info = self._get_stats(host,port)
+            namespace, host, port = instance.split(':')
+            info = self._get_stats(host, port)
+            if not info:
+                continue
             metric_prefix = "%s.beanstalkd.%s:%s." % (namespace,
                                                       host.replace('.', '_'),
                                                       port)
 
             for stat, value in info['instance'].items():
                 if stat not in self.SKIP_LIST:
-                    self.publish(metric_prefix + stat, value,
-                             metric_type=self.get_metric_type(stat))
+                    stat = stat.replace('-', '_')
+                    self.publish("%s%s" % (metric_prefix, stat), value,
+                                 metric_type=self.get_metric_type(stat))
 
             for tube_stats in info['tubes']:
                 tube = tube_stats['name']
                 for stat, value in tube_stats.items():
                     if stat != 'name':
-                        self.publish(metric_prefix + 'tubes.%s.%s' % (tube, stat), value,
-                                 metric_type=self.get_metric_type(stat))
+                        _stat = stat.replace('-', '_')
+                        b_name = '%stubes.%s.%s' % (metric_prefix, tube, _stat)
+                        metric = self.get_metric_type(stat)
+                        self.publish(b_name, value, metric_type=metric)
 
     def get_metric_type(self, stat):
         if self.COUNTERS_REGEX.match(stat):

collectors/openio/openioredisstat.py

@@ -25,7 +25,6 @@
 
 import diamond.collector
 import time
-import os
 
 try:
     import redis
@@ -89,13 +88,14 @@ def process_config(self):
             else:
                 auth = None
 
-            nick = '%s:%s' % (host.replace('.','_'), port)
+            nick = '%s:%s' % (host.replace('.', '_'), port)
             self.instances[nick] = (namespace, host, port, auth)
 
         self.log.debug("Configured instances: %s" % self.instances.items())
 
     def get_default_config_help(self):
-        config_help = super(OpenioRedisCollector, self).get_default_config_help()
+        config_help = super(OpenioRedisCollector, self)\
+                                .get_default_config_help()
         config_help.update({
             'timeout': 'Socket timeout',
             'db': '',
@@ -110,7 +110,7 @@ def get_default_config(self):
         """
         Return default config
 
-:rtype: dict
+        :rtype: dict
 
         """
         config = super(OpenioRedisCollector, self).get_default_config()
@@ -125,11 +125,11 @@ def get_default_config(self):
         return config
 
     def _client(self, host, port, auth):
-        """Return a redis client for the configuration.
+        """ Return a redis client for the configuration.
 
-:param str host: redis host
-:param int port: redis port
-:rtype: redis.Redis
+            :param str host: redis host
+            :param int port: redis port
+            :rtype: redis.Redis
 
         """
         db = int(self.config['db'])
@@ -139,8 +139,9 @@ def _client(self, host, port, auth):
                               db=db, socket_timeout=timeout, password=auth)
             cli.ping()
             return cli
-        except Exception, ex:
-            self.log.error("OpenioRedisCollector: failed to connect to %s:%i. %s.",
+        except Exception as ex:
+            self.log.error("OpenioRedisCollector:\
+                           failed to connect to %s:%i. %s.",
                            host, port, ex)
 
     def _precision(self, value):

collectors/openio/openiozookeeper.py

@@ -26,7 +26,6 @@
 
 import diamond.collector
 import socket
-import re
 
 
 class OpenioZookeeperCollector(diamond.collector.Collector):
@@ -36,7 +35,8 @@ def process_config(self):
         self.instances = self.config['instances'] or 'OPENIO:localhost:6005'
 
     def get_default_config_help(self):
-        config_help = super(OpenioZookeeperCollector, self).get_default_config_help()
+        config_help = super(OpenioZookeeperCollector, self)\
+                                .get_default_config_help()
         config_help.update({
             'publish':
                 "Which rows of 'status' you would like to publish." +
@@ -62,7 +62,7 @@ def get_default_config(self):
             # 'publish': ''
 
             # Connection settings
-            #'instances': ['OPENIO:localhost:6005'],
+            # 'instances': ['OPENIO:localhost:6005'],
         })
         return config
 
@@ -88,60 +88,44 @@ def get_raw_stats(self, host, port):
     def _get_stats(self, host, port):
         # stuff that's always ignored, aren't 'stats'
         ignored = ('zk_version', 'zk_server_state')
-        pid = None
 
         stats = {}
         data = self.get_raw_stats(host, port)
 
         # parse stats
         for line in data.splitlines():
-
             pieces = line.split()
-
             if pieces[0] in ignored:
                 continue
             stats[pieces[0]] = pieces[1]
 
         # get max connection limit
-        self.log.debug('pid %s', pid)
-        try:
-            cmdline = "/proc/%s/cmdline" % pid
-            f = open(cmdline, 'r')
-            m = re.search("-c\x00(\d+)", f.readline())
-            if m is not None:
-                self.log.debug('limit connections %s', m.group(1))
-                stats['limit_maxconn'] = m.group(1)
-            f.close()
-        except:
-            self.log.debug("Cannot parse command line options for zookeeper")
-
         return stats
 
     def collect(self):
         instances = self.config.get('instances')
 
         # Convert a string config value to be an array
-        if isinstance(instances , basestring):
+        if isinstance(instances, basestring):
             instances = instances.split(',')
 
         for instance in instances:
             namespace, hostname, port = instance.split(':')
 
             stats = self._get_stats(hostname, port)
 
-            metric_prefix = '%s.zookeeper.%s:%s.' % (namespace,
-                                                     hostname.replace('.', '_'),
-                                                     port)
+            prefix = '%s.zookeeper.%s:%s.' % (namespace,
+                                              hostname.replace('.', '_'),
+                                              port)
 
             # figure out what we're configured to get, defaulting to everything
             desired = self.config.get('publish', stats.keys())
 
             # for everything we want
             for stat in desired:
                 if stat in stats:
-                    self.publish(metric_prefix + stat, stats[stat])
+                    self.publish(prefix + stat, stats[stat])
                 else:
-
                     # we don't, must be somehting configured in publish so we
                     # should log an error about it
                     self.log.error("No such key '%s' available, issue 'stats' "