Merge remote-tracking branch 'firehol/master'

diff --git a/plugins.d/python.d.plugin b/plugins.d/python.d.plugin
index 5a8768d42321c95656dfb1a52335007d9b16a9d3..5e81fb263c0489807449b9fdff79a0db0c72a6d7 100755 (executable)
--- a/plugins.d/python.d.plugin
+++ b/plugins.d/python.d.plugin
@@ -477,6 +477,8 @@ def run():
     configfile = CONFIG_DIR + "python.d.conf"
     msg.PROGRAM = PROGRAM
     msg.info("reading configuration file:", configfile)
+    log_counter = 200
+    log_interval = 3600
 
     conf = read_config(configfile)
     if conf is not None:
@@ -498,11 +500,11 @@ def run():
         try:
             log_counter = conf['logs_per_interval']
         except (KeyError, TypeError):
-            log_counter = 200
+            pass
         try:
             log_interval = conf['log_interval']
         except (KeyError, TypeError):
-            log_interval = 3600
+            pass
         for k, v in conf.items():
             if k in ("update_every", "debug", "enabled"):
                 continue

diff --git a/python.d/memcached.chart.py b/python.d/memcached.chart.py
index d344530cec93de7699f2d53c5eb20c0a57fa92cb..c680128aa1768cfb4cfc984a0bc9d55b0c9ed351 100644 (file)
--- a/python.d/memcached.chart.py
+++ b/python.d/memcached.chart.py
@@ -19,9 +19,16 @@ retries = 60
 #             'unix_socket': None
 #          }}
 
-ORDER = ['net', 'connections', 'items', 'evicted_reclaimed', 'get', 'get_rate', 'set_rate', 'delete', 'cas', 'increment', 'decrement', 'touch', 'touch_rate']
+ORDER = ['cache', 'net', 'connections', 'items', 'evicted_reclaimed',
+         'get', 'get_rate', 'set_rate', 'delete', 'cas', 'increment', 'decrement', 'touch', 'touch_rate']
 
 CHARTS = {
+    'cache': {
+        'options': [None, 'Cache Size', 'kilobytes', 'Cache', 'memcached.cache', 'line'],
+        'lines': [
+            ['bytes', 'used', 'absolute', 1, 1024],
+            ['limit_maxbytes', 'total', 'absolute', 1, 1024]
+        ]},
     'net': {
         'options': [None, 'Network', 'kilobytes/s', 'Network', 'memcached.net', 'line'],
         'lines': [