Merge branch 'collectd-4.3' into collectd-4.4

[collectd.git] / src / disk.c

diff --git a/src/disk.c b/src/disk.c
index 490da07ae56098e2e438a835e8e4a72b1c9c110d..2d13430b29ec61dae56a3a739942608ff785dc03 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/disk.c
- * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2005-2008  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
@@ -22,6 +22,7 @@
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
+#include "utils_ignorelist.h"
 
 #if HAVE_MACH_MACH_TYPES_H
 #  include <mach/mach_types.h>
@@ -58,6 +59,10 @@
 #  define UINT_MAX 4294967295U
 #endif
 
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
 #if HAVE_IOKIT_IOKITLIB_H
 static mach_port_t io_master_port = MACH_PORT_NULL;
 /* #endif HAVE_IOKIT_IOKITLIB_H */
@@ -97,10 +102,50 @@ static kstat_t *ksp[MAX_NUMDISK];
 static int numdisk = 0;
 /* #endif HAVE_LIBKSTAT */
 
+#elif defined(HAVE_LIBSTATGRAB)
+/* #endif HAVE_LIBKSTATGRAB */
+
 #else
 # error "No applicable input method."
 #endif
 
+static const char *config_keys[] =
+{
+       "Disk",
+       "IgnoreSelected"
+};
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+
+static ignorelist_t *ignorelist = NULL;
+
+static int disk_config (const char *key, const char *value)
+{
+  if (ignorelist == NULL)
+    ignorelist = ignorelist_create (/* invert = */ 1);
+  if (ignorelist == NULL)
+    return (1);
+
+  if (strcasecmp ("Disk", key) == 0)
+  {
+    ignorelist_add (ignorelist, value);
+  }
+  else if (strcasecmp ("IgnoreSelected", key) == 0)
+  {
+    int invert = 1;
+    if ((strcasecmp ("True", value) == 0)
+       || (strcasecmp ("Yes", value) == 0)
+       || (strcasecmp ("On", value) == 0))
+      invert = 0;
+    ignorelist_set_invert (ignorelist, invert);
+  }
+  else
+  {
+    return (-1);
+  }
+
+  return (0);
+} /* int disk_config */
+
 static int disk_init (void)
 {
 #if HAVE_IOKIT_IOKITLIB_H
@@ -158,6 +203,10 @@ static void disk_submit (const char *plugin_instance,
        value_t values[2];
        value_list_t vl = VALUE_LIST_INIT;
 
+       /* Both `ignorelist' and `plugin_instance' may be NULL. */
+       if (ignorelist_match (ignorelist, plugin_instance) != 0)
+         return;
+
        values[0].counter = read;
        values[1].counter = write;
 
@@ -231,22 +280,14 @@ static int disk_read (void)
        int  disk_minor;
        char disk_name[64];
 
-       static complain_t complain_obj;
-
        /* Get the list of all disk objects. */
        if (IOServiceGetMatchingServices (io_master_port,
                                IOServiceMatching (kIOBlockStorageDriverClass),
                                &disk_list) != kIOReturnSuccess)
        {
-               plugin_complain (LOG_ERR, &complain_obj, "disk plugin: "
-                               "IOServiceGetMatchingServices failed.");
+               ERROR ("disk plugin: IOServiceGetMatchingServices failed.");
                return (-1);
        }
-       else if (complain_obj.interval != 0)
-       {
-               plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
-                               "IOServiceGetMatchingServices succeeded.");
-       }
 
        while ((disk = IOIteratorNext (disk_list)) != 0)
        {
@@ -386,15 +427,12 @@ static int disk_read (void)
 
        diskstats_t *ds, *pre_ds;
 
-       static complain_t complain_obj;
-
        if ((fh = fopen ("/proc/diskstats", "r")) == NULL)
        {
-               if ((fh = fopen ("/proc/partitions", "r")) == NULL)
+               fh = fopen ("/proc/partitions", "r");
+               if (fh == NULL)
                {
-                       plugin_complain (LOG_ERR, &complain_obj,
-                                       "disk plugin: Failed to open /proc/"
-                                       "{diskstats,partitions}.");
+                       ERROR ("disk plugin: fopen (/proc/{diskstats,partitions}) failed.");
                        return (-1);
                }
 
@@ -402,9 +440,6 @@ static int disk_read (void)
                fieldshift = 1;
        }
 
-       plugin_relief (LOG_NOTICE, &complain_obj, "disk plugin: "
-                       "Succeeded to open /proc/{diskstats,partitions}.");
-
        while (fgets (buffer, sizeof (buffer), fh) != NULL)
        {
                char *disk_name;
@@ -417,7 +452,7 @@ static int disk_read (void)
                major = atoll (fields[0]);
                minor = atoll (fields[1]);
 
-               disk_name = fields[2];
+               disk_name = fields[2 + fieldshift];
 
                for (ds = disklist, pre_ds = disklist; ds != NULL; pre_ds = ds, ds = ds->next)
                        if (strcmp (disk_name, ds->name) == 0)
@@ -576,9 +611,8 @@ static int disk_read (void)
 
                if (is_disk)
                {
-                       if ((read_merged != -1LL) || (write_merged != -1LL))
-                               disk_submit (disk_name, "disk_merged",
-                                               read_merged, write_merged);
+                       disk_submit (disk_name, "disk_merged",
+                                       read_merged, write_merged);
                } /* if (is_disk) */
        } /* while (fgets (buffer, sizeof (buffer), fh) != NULL) */
 
@@ -632,13 +666,31 @@ static int disk_read (void)
                                        kio.KIO_ROPS, kio.KIO_WOPS);
                }
        }
-#endif /* defined(HAVE_LIBKSTAT) */
+/* #endif defined(HAVE_LIBKSTAT) */
+
+#elif defined(HAVE_LIBSTATGRAB)
+       sg_disk_io_stats *ds;
+       int disks, counter;
+       char name[DATA_MAX_NAME_LEN];
+       
+       if ((ds = sg_get_disk_io_stats(&disks)) == NULL)
+               return (0);
+               
+       for (counter=0; counter < disks; counter++) {
+               strncpy(name, ds->disk_name, sizeof(name));
+               name[sizeof(name)-1] = '\0'; /* strncpy doesn't terminate longer strings */
+               disk_submit (name, "disk_octets", ds->read_bytes, ds->write_bytes);
+               ds++;
+       }
+#endif /* defined(HAVE_LIBSTATGRAB) */
 
        return (0);
 } /* int disk_read */
 
 void module_register (void)
 {
-       plugin_register_init ("disk", disk_init);
-       plugin_register_read ("disk", disk_read);
+  plugin_register_config ("disk", disk_config,
+      config_keys, config_keys_num);
+  plugin_register_init ("disk", disk_init);
+  plugin_register_read ("disk", disk_read);
 } /* void module_register */