Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6

[collectd.git] / src / rrdcached.c

diff --git a/src/rrdcached.c b/src/rrdcached.c
index 012b28151eca540a9ee6d4d5098243d8dd191558..31c6352411fc4481deb584f37e9f07c59bf321e2 100644 (file)
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -221,7 +221,6 @@ static int rc_read (void)
 
   vl.values = values;
   vl.values_len = 1;
-  vl.time = time (NULL);
 
   if ((strncmp ("unix:", daemon_address, strlen ("unix:")) == 0)
       || (daemon_address[0] == '/'))
@@ -234,7 +233,7 @@ static int rc_read (void)
   status = rrdc_stats_get (&head);
   if (status != 0)
   {
-    ERROR ("rrdcached plugin: rrdc_stats_get failed.");
+    ERROR ("rrdcached plugin: rrdc_stats_get failed with status %i.", status);
     return (-1);
   }
 
@@ -273,8 +272,29 @@ static int rc_read (void)
       sstrncpy (vl.type, "gauge", sizeof (vl.type));
       sstrncpy (vl.type_instance, "tree_depth", sizeof (vl.type_instance));
     }
+    else if (strcasecmp ("FlushesReceived", ptr->name) == 0)
+    {
+      sstrncpy (vl.type, "operations", sizeof (vl.type));
+      sstrncpy (vl.type_instance, "receive-flush", sizeof (vl.type_instance));
+    }
+    else if (strcasecmp ("JournalBytes", ptr->name) == 0)
+    {
+      sstrncpy (vl.type, "counter", sizeof (vl.type));
+      sstrncpy (vl.type_instance, "journal-bytes", sizeof (vl.type_instance));
+    }
+    else if (strcasecmp ("JournalRotate", ptr->name) == 0)
+    {
+      sstrncpy (vl.type, "counter", sizeof (vl.type));
+      sstrncpy (vl.type_instance, "journal-rotates", sizeof (vl.type_instance));
+    }
+    else if (strcasecmp ("UpdatesReceived", ptr->name) == 0)
+    {
+      sstrncpy (vl.type, "operations", sizeof (vl.type));
+      sstrncpy (vl.type_instance, "receive-update", sizeof (vl.type_instance));
+    }
     else
     {
+      DEBUG ("rrdcached plugin: rc_read: Unknown statistic `%s'.", ptr->name);
       continue;
     }