From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 3 Mar 2016 10:15:42 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~456
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eb2f3a4bdc78e1e2c4191b4e08d75d5eeea8be0e;p=collectd.git

Merge branch 'collectd-5.5'
---

eb2f3a4bdc78e1e2c4191b4e08d75d5eeea8be0e
diff --cc src/redis.c
index 5bcc7035,2586ca0c..4e3de56c
--- a/src/redis.c
+++ b/src/redis.c
@@@ -434,13 -435,7 +436,11 @@@ static int redis_read (void) /* {{{ *
      redis_handle_info (rn->name, rr->str, "pubsub", "channels", "pubsub_channels", DS_TYPE_GAUGE);
      redis_handle_info (rn->name, rr->str, "pubsub", "patterns", "pubsub_patterns", DS_TYPE_GAUGE);
      redis_handle_info (rn->name, rr->str, "current_connections", "slaves", "connected_slaves", DS_TYPE_GAUGE);
 +    redis_handle_info (rn->name, rr->str, "cache_result", "hits", "keyspace_hits", DS_TYPE_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "cache_result", "misses", "keyspace_misses", DS_TYPE_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "total_bytes", "input", "total_net_input_bytes", DS_TYPE_DERIVE);
 +    redis_handle_info (rn->name, rr->str, "total_bytes", "output", "total_net_output_bytes", DS_TYPE_DERIVE);
  
-     freeReplyObject (rr);
- 
      for (rq = rn->queries; rq != NULL; rq = rq->next)
          redis_handle_query(rh, rn, rq);