Merge pull request python-diamond#694 from acampoh/custom_metrics_kafka

Custom metrics kafka

docs/collectors/KafkaCollector.md

@@ -22,6 +22,7 @@ measure_collector_time | False | Collect the collector run time in ms | bool
 metrics_blacklist | None | Regex to match metrics to block. Mutually exclusive with metrics_whitelist | NoneType
 metrics_whitelist | None | Regex to match metrics to transmit. Mutually exclusive with metrics_blacklist | NoneType
 port | 8082 | | int
+query_paths | *kafka*:* | list of metrics to be read, separated by commas | str
 
 #### Example Output
 

src/collectors/kafkastat/kafkastat.py

@@ -37,8 +37,9 @@ class KafkaCollector(diamond.collector.Collector):
  def get_default_config_help(self):
  config_help = super(KafkaCollector, self).get_default_config_help()
  config_help.update({
- 'host': "",
- 'port': "",
+ 'host': "JMX host to connect. default: localhost",
+ 'port': "JMX port. default: 8082",
+ 'query_paths': "list of metrics process, separated by commas",
  })
  return config_help
 
@@ -51,6 +52,7 @@ def get_default_config(self):
  'host': '127.0.0.1',
  'port': 8082,
  'path': 'kafka',
+ 'query_paths': "*kafka*:*",
  })
  return config
 
@@ -158,12 +160,14 @@ def collect(self):
  self.log.error('Failed to import xml.etree.ElementTree')
  return
 
+ query_elements = self.config['query_paths'].split(',')
  # Get list of gatherable stats
  query_list = [
- '*kafka*:*',
  'java.lang:type=GarbageCollector,name=*',
  'java.lang:type=Threading'
  ]
+
+ query_list = query_elements + query_list
  mbeans = set()
  for pattern in query_list:
  match = self.get_mbeans(pattern)