From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Fri, 6 Nov 2015 09:32:55 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~51
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=dab48f284f9d4bb6ae98244310c5cdb6c5d91bf3;hp=142fb2ea490118e62f34df41f907ef1e58fb0be4

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/src/statsd.c b/src/statsd.c
index 5b0bdd69..7fe9eb3c 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -851,8 +851,19 @@ static int statsd_metric_submit_unsafe (char const *name, /* {{{ */
     else
       values[0].gauge = (gauge_t) c_avl_size (metric->set);
   }
-  else
-    values[0].derive = (derive_t) metric->value;
+  else { /* STATSD_COUNTER */
+      /*
+       * Expand a single value to two metrics:
+       *
+       * - The absolute counter, as a gauge
+       * - A derived rate for this counter
+       */
+      values[0].derive = (derive_t) metric->value;
+      plugin_dispatch_values(&vl);
+
+      sstrncpy(vl.type, "gauge", sizeof (vl.type));
+      values[0].gauge = (gauge_t) metric->value;
+  }
 
   return (plugin_dispatch_values (&vl));
 } /* }}} int statsd_metric_submit_unsafe */