X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fethstat.c;h=08381a821087e275fb03922a32bc54c35ca7c3cd;hb=77311aed583ac4566d76f1ce3a1dc9deae2e59dc;hp=7507bd97851cbbb12ee256a1e067fa1196b9343b;hpb=46ba00ecd986212d2519791244c50b33e1b81397;p=collectd.git

diff --git a/src/ethstat.c b/src/ethstat.c
index 7507bd97..08381a82 100644
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/ethstat.c
  * Copyright (C) 2011       Cyril Feraudet
+ * Copyright (C) 2012       Florian "octo" Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -18,6 +19,7 @@
  *
  * Authors:
  *   Cyril Feraudet <cyril at feraudet.com>
+ *   Florian "octo" Forster <octo@collectd.org>
  **/
 
 #include "collectd.h"
@@ -25,6 +27,7 @@
 #include "plugin.h"
 #include "configfile.h"
 #include "utils_avltree.h"
+#include "utils_complain.h"
 
 #if HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
@@ -51,6 +54,8 @@ static size_t interfaces_num = 0;
 
 static c_avl_tree_t *value_map = NULL;
 
+static _Bool collect_mapped_only = 0;
+
 static int ethstat_add_interface (const oconfig_item_t *ci) /* {{{ */
 {
   char **tmp;
@@ -61,6 +66,7 @@ static int ethstat_add_interface (const oconfig_item_t *ci) /* {{{ */
   if (tmp == NULL)
     return (-1);
   interfaces = tmp;
+  interfaces[interfaces_num] = NULL;
 
   status = cf_util_get_string (ci, interfaces + interfaces_num);
   if (status != 0)
@@ -99,7 +105,7 @@ static int ethstat_add_map (const oconfig_item_t *ci) /* {{{ */
   memset (map, 0, sizeof (*map));
 
   sstrncpy (map->type, ci->values[1].value.string, sizeof (map->type));
-  if (ci->values_num == 2)
+  if (ci->values_num == 3)
     sstrncpy (map->type_instance, ci->values[2].value.string,
         sizeof (map->type_instance));
 
@@ -144,6 +150,8 @@ static int ethstat_config (oconfig_item_t *ci) /* {{{ */
       ethstat_add_interface (child);
     else if (strcasecmp ("Map", child->key) == 0)
       ethstat_add_map (child);
+    else if (strcasecmp ("MappedOnly", child->key) == 0)
+      (void) cf_util_get_boolean (child, &collect_mapped_only);
     else
       WARNING ("ethstat plugin: The config option \"%s\" is unknown.",
           child->key);
@@ -155,6 +163,8 @@ static int ethstat_config (oconfig_item_t *ci) /* {{{ */
 static void ethstat_submit_value (const char *device,
     const char *type_instance, derive_t value)
 {
+  static c_complain_t complain_no_map = C_COMPLAIN_INIT_STATIC;
+
   value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
   value_map_t *map = NULL;
@@ -162,6 +172,16 @@ static void ethstat_submit_value (const char *device,
   if (value_map != NULL)
     c_avl_get (value_map, type_instance, (void *) &map);
 
+  /* If the "MappedOnly" option is specified, ignore unmapped values. */
+  if (collect_mapped_only && (map == NULL))
+  {
+    if (value_map == NULL)
+      c_complain (LOG_WARNING, &complain_no_map,
+          "ethstat plugin: The \"MappedOnly\" option has been set to true, "
+          "but no mapping has been configured. All values will be ignored!");
+    return;
+  }
+
   values[0].derive = value;
   vl.values = values;
   vl.values_len = 1;
@@ -284,10 +304,9 @@ static int ethstat_read_interface (char *device)
   {
     const char *stat_name;
 
-    stat_name = (void *) &strings->data[i * ETH_GSTRING_LEN],
-              DEBUG("ethstat plugin: device = \"%s\": %s = %"PRIu64,
-                  device, stat_name,
-                  (uint64_t) stats->data[i]);
+    stat_name = (void *) &strings->data[i * ETH_GSTRING_LEN];
+    DEBUG("ethstat plugin: device = \"%s\": %s = %"PRIu64,
+        device, stat_name, (uint64_t) stats->data[i]);
     ethstat_submit_value (device,
         stat_name, (derive_t) stats->data[i]);
   }