From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 6 Nov 2015 08:42:11 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~582
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=83bd4369fc36851bb9a92d0dd3a9d3bc6a408fdd;p=collectd.git

Merge branch 'collectd-5.5'
---

83bd4369fc36851bb9a92d0dd3a9d3bc6a408fdd
diff --cc src/apcups.c
index 718061ae,281bf980..29d58c3a
--- a/src/apcups.c
+++ b/src/apcups.c
@@@ -162,10 -176,10 +162,10 @@@ static int net_open (char const *node, 
  		return (-1);
  	}
  
- 	DEBUG ("Done opening a socket %i", sd);
+ 	DEBUG ("apcups plugin: Done opening a socket %i", sd);
  
  	return (sd);
 -} /* int net_open (char *host, char *service, int port) */
 +} /* int net_open */
  
  /*
   * Receive a message from the other end. Each message consists of
@@@ -455,10 -480,11 +455,10 @@@ static int apcups_read (void
  	 */
  	if (status != 0)
  	{
- 		DEBUG ("apc_query_server (%s, %s) = %i",
 -		DEBUG ("apcups plugin: apc_query_server (%s, %i) = %i",
 -				conf_host == NULL
 -				? APCUPS_DEFAULT_HOST
 -				: conf_host,
 -				conf_port, status);
++		DEBUG ("apcups plugin: apc_query_server (%s, %s) = %i",
 +				(conf_node == NULL) ? APCUPS_DEFAULT_NODE : conf_node,
 +				(conf_service == NULL) ? APCUPS_DEFAULT_SERVICE : conf_service,
 +				status);
  		return (-1);
  	}
  
diff --cc src/types.db
index 2fd59e56,c605f56d..5847218a
--- a/src/types.db
+++ b/src/types.db
@@@ -14,7 -14,8 +14,8 @@@ cache_eviction		value:DERIVE:0:
  cache_operation		value:DERIVE:0:U
  cache_ratio		value:GAUGE:0:100
  cache_result		value:DERIVE:0:U
 -cache_size		value:GAUGE:0:U
 +cache_size		value:GAUGE:0:1125899906842623
+ capacity	value:GAUGE:0:U
  ceph_bytes		value:GAUGE:U:U
  ceph_latency	value:GAUGE:U:U
  ceph_rate			value:DERIVE:0:U