/**
* collectd - src/df.c
* Copyright (C) 2005-2007 Florian octo Forster
+ * Copyright (C) 2009 Paul Sadauskas
*
* 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
*
* Authors:
* Florian octo Forster <octo at verplant.org>
+ * Paul Sadauskas <psadauskas at gmail.com>
**/
#include "collectd.h"
"MountPoint",
"FSType",
"IgnoreSelected",
- "ReportByDevice",
- NULL
+ "ReportByDevice"
};
-static int config_keys_num = 5;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static ignorelist_t *il_device = NULL;
static ignorelist_t *il_mountpoint = NULL;
static ignorelist_t *il_fstype = NULL;
-static bool by_device = false;
+static _Bool by_device = false;
static int df_init (void)
{
}
else if (strcasecmp (key, "IgnoreSelected") == 0)
{
- if ((strcasecmp (value, "True") == 0)
- || (strcasecmp (value, "Yes") == 0)
- || (strcasecmp (value, "On") == 0))
+ if (IS_TRUE (value))
{
ignorelist_set_invert (il_device, 0);
ignorelist_set_invert (il_mountpoint, 0);
}
return (0);
}
- else if (strcasecmp (key, "ReportByDevice") == 0)
- {
- if ((strcasecmp (value, "True") == 0)
- || (strcasecmp (value, "Yes") == 0)
- || (strcasecmp (value, "On") == 0))
- {
- by_device = false;
- }
+ else if (strcasecmp (key, "ReportByDevice") == 0)
+ {
+ if (IS_TRUE (value))
+ by_device = true;
+
return (0);
}
}
static void df_submit (char *df_name,
+ const char *type,
gauge_t df_used,
gauge_t df_free)
{
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, type, sizeof (vl.type));
sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
unsigned long long blocksize;
gauge_t df_free;
gauge_t df_used;
+ gauge_t df_inodes_free;
+ gauge_t df_inodes_used;
char disk_name[256];
mnt_list = NULL;
for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
{
+ if (ignorelist_match (il_device,
+ (mnt_ptr->spec_device != NULL)
+ ? mnt_ptr->spec_device
+ : mnt_ptr->device))
+ continue;
+ if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
+ continue;
+ if (ignorelist_match (il_fstype, mnt_ptr->type))
+ continue;
+
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];
df_free = statbuf.f_bfree * blocksize;
df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize;
+ df_inodes_used = statbuf.f_files - statbuf.f_ffree;
+ df_inodes_free = statbuf.f_ffree;
+
if (by_device)
{
- // eg, /dev/hda1 -- strip off the "/dev/"
- strncpy (disk_name, mnt_ptr->device + 5, sizeof (disk_name));
+ /* eg, /dev/hda1 -- strip off the "/dev/" */
+ if (strncmp (mnt_ptr->spec_device, "/dev/", strlen ("/dev/")) == 0)
+ sstrncpy (disk_name, mnt_ptr->spec_device + strlen ("/dev/"), sizeof (disk_name));
+ else
+ sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
+
+ if (strlen(disk_name) < 1)
+ {
+ DEBUG("df: no device name name for mountpoint %s, skipping", mnt_ptr->dir);
+ continue;
+ }
}
else
{
}
}
- if (ignorelist_match (il_device,
- (mnt_ptr->spec_device != NULL)
- ? mnt_ptr->spec_device
- : mnt_ptr->device))
- continue;
- if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
- continue;
- if (ignorelist_match (il_fstype, mnt_ptr->type))
- continue;
-
- df_submit (disk_name, df_used, df_free);
+ df_submit (disk_name, "df", df_used, df_free);
+ df_submit (disk_name, "df_inodes", df_inodes_used, df_inodes_free);
}
cu_mount_freelist (mnt_list);