Added "type" to the value_list_t struct.

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index fde5d9a..f422743 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -26,12 +26,6 @@
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
 
-#if HAVE_STATFS || HAVE_STATVFS
-# define DF_HAVE_READ 1
-#else
-# define DF_HAVE_READ 0
-#endif
-
 #if HAVE_STATVFS
 # if HAVE_SYS_STATVFS_H
 #  include <sys/statvfs.h>
@@ -44,21 +38,10 @@
 # endif
 # define STATANYFS statfs
 # define BLOCKSIZE(s) (s).f_bsize
+#else
+# error "No applicable input method."
 #endif
 
-/* 2^50 - 1 == 1125899906842623 = 1 Petabyte */
-static data_source_t dsrc[2] =
-{
-       {"free", DS_TYPE_GAUGE, 0, 1125899906842623.0},
-       {"used", DS_TYPE_GAUGE, 0, 1125899906842623.0}
-};
-
-static data_set_t ds =
-{
-       "df", 2, dsrc
-};
-
-#if DF_HAVE_READ
 static const char *config_keys[] =
 {
        "Device",
@@ -145,9 +128,10 @@ static void df_submit (char *df_name,
        strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "df");
        strcpy (vl.plugin_instance, "");
+       strcpy (vl.type, "df");
        strncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
 
-       plugin_dispatch_values ("df", &vl);
+       plugin_dispatch_values (&vl);
 } /* void df_submit */
 
 static int df_read (void)
@@ -174,7 +158,10 @@ static int df_read (void)
        {
                if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
                {
-                       syslog (LOG_ERR, "statv?fs failed: %s", strerror (errno));
+                       char errbuf[1024];
+                       ERROR ("statv?fs failed: %s",
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        continue;
                }
 
@@ -218,15 +205,11 @@ static int df_read (void)
 
        return (0);
 } /* int df_read */
-#endif /* DF_HAVE_READ */
 
 void module_register (void)
 {
-       plugin_register_data_set (&ds);
-
-#if DF_HAVE_READ
-       plugin_register_config ("df", df_config, config_keys, config_keys_num);
+       plugin_register_config ("df", df_config,
+                       config_keys, config_keys_num);
        plugin_register_init ("df", df_init);
        plugin_register_read ("df", df_read);
-#endif
 } /* void module_register */