#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>
# endif
# define STATANYFS statfs
# define BLOCKSIZE(s) (s).f_bsize
+#else
+# error "No applicable input method."
#endif
-#if DF_HAVE_READ
static const char *config_keys[] =
{
"Device",
"MountPoint",
"FSType",
"IgnoreSelected",
+ "ReportByDevice",
NULL
};
-static int config_keys_num = 4;
+static int config_keys_num = 5;
static ignorelist_t *il_device = NULL;
static ignorelist_t *il_mountpoint = NULL;
static ignorelist_t *il_fstype = NULL;
+static bool by_device = false;
+
static int df_init (void)
{
if (il_device == NULL)
}
return (0);
}
+ else if (strcasecmp (key, "ReportByDevice") == 0)
+ {
+ if ((strcasecmp (value, "True") == 0)
+ || (strcasecmp (value, "Yes") == 0)
+ || (strcasecmp (value, "On") == 0))
+ {
+ by_device = true;
+ }
+ return (0);
+ }
return (-1);
}
vl.values = values;
vl.values_len = 2;
- vl.time = time (NULL);
- strcpy (vl.host, hostname_g);
- strcpy (vl.plugin, "df");
- strcpy (vl.plugin_instance, "");
- strncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "df", sizeof (vl.plugin));
+ sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
+ sstrncpy (vl.type, "df", sizeof (vl.host));
+ sstrncpy (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)
unsigned long long blocksize;
gauge_t df_free;
gauge_t df_used;
- char mnt_name[256];
+ char disk_name[256];
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
df_free = statbuf.f_bfree * blocksize;
df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize;
- if (strcmp (mnt_ptr->dir, "/") == 0)
+ if (by_device)
{
- strncpy (mnt_name, "root", sizeof (mnt_name));
- }
- else
+ // eg, /dev/hda1 -- strip off the "/dev/"
+ strncpy (disk_name, mnt_ptr->spec_device + 5, sizeof (disk_name));
+ if (strlen(disk_name) < 1)
+ {
+ DEBUG("df: no device name name for mountpoint %s, skipping", mnt_ptr->dir);
+ continue;
+ }
+ }
+ else
{
- int i, len;
-
- strncpy (mnt_name, mnt_ptr->dir + 1, sizeof (mnt_name));
- len = strlen (mnt_name);
-
- for (i = 0; i < len; i++)
- if (mnt_name[i] == '/')
- mnt_name[i] = '-';
+ if (strcmp (mnt_ptr->dir, "/") == 0)
+ {
+ sstrncpy (disk_name, "root", sizeof (disk_name));
+ }
+ else
+ {
+ int i, len;
+
+ sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
+ len = strlen (disk_name);
+
+ for (i = 0; i < len; i++)
+ if (disk_name[i] == '/')
+ disk_name[i] = '-';
+ }
}
if (ignorelist_match (il_device,
if (ignorelist_match (il_fstype, mnt_ptr->type))
continue;
- df_submit (mnt_name, df_used, df_free);
+ df_submit (disk_name, df_used, df_free);
}
cu_mount_freelist (mnt_list);
return (0);
} /* int df_read */
-#endif /* DF_HAVE_READ */
void module_register (void)
{
-#if DF_HAVE_READ
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 */