From: Florian Forster <octo@collectd.org>
Date: Thu, 28 Jul 2016 10:03:43 +0000 (+0200)
Subject: empty_counter match: Add support for the DERIVE data source type.
X-Git-Tag: collectd-5.6.0~141^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9a68f99cfe1d2f3013534b3018068f808a6823c4;hp=005a70ad7863229b8c60e8ca83b67e89dfb05ad0;p=collectd.git

empty_counter match: Add support for the DERIVE data source type.

Fixes: #1813
---

diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c
index eba6a58e..caa3e7e3 100644
--- a/src/match_empty_counter.c
+++ b/src/match_empty_counter.c
@@ -89,11 +89,13 @@ static int mec_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */
 
   for (i = 0; i < ds->ds_num; i++)
   {
-    if (ds->ds[i].type != DS_TYPE_COUNTER)
+    if ((ds->ds[i].type != DS_TYPE_DERIVE)
+        && (ds->ds[i].type != DS_TYPE_COUNTER))
       continue;
 
     num_counters++;
-    if (vl->values[i].counter == 0)
+    if (((ds->ds[i].type == DS_TYPE_DERIVE) && (vl->values[i].derive == 0))
+        || ((ds->ds[i].type == DS_TYPE_COUNTER) && (vl->values[i].counter == 0)))
       num_empty++;
   }