diff --git a/src/df.c b/src/df.c
index 4b3cba019cea9219289cc8adef7633a05e30a9ba..5ff3f59be8cbcb401dd288c17ec4b89777251b43 100644 (file)
--- a/src/df.c
+++ b/src/df.c
# include <sys/statvfs.h>
# endif
# define STATANYFS statvfs
+# define STATANYFS_STR "statvfs"
# define BLOCKSIZE(s) ((s).f_frsize ? (s).f_frsize : (s).f_bsize)
#elif HAVE_STATFS
# if HAVE_SYS_STATFS_H
# include <sys/statfs.h>
# endif
# define STATANYFS statfs
+# define STATANYFS_STR "statfs"
# define BLOCKSIZE(s) (s).f_bsize
#else
# error "No applicable input method."
"IgnoreSelected",
"ReportByDevice",
"ReportReserved",
- "ReportInodes"
+ "ReportInodes",
+ "ReportPercentage"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static _Bool by_device = 0;
static _Bool report_inodes = 0;
+static _Bool report_percentage = 0;
static int df_init (void)
{
return (0);
}
+ else if (strcasecmp (key, "ReportPercentage") == 0)
+ {
+ if (IS_TRUE (value))
+ report_percentage = 1;
+ else
+ report_percentage = 0;
+
+ return (0);
+ }
return (-1);
}
if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
{
char errbuf[1024];
- ERROR ("statv?fs failed: %s",
+ ERROR (STATANYFS_STR"(%s) failed: %s",
+ mnt_ptr->dir,
sstrerror (errno, errbuf,
sizeof (errbuf)));
continue;
if (!statbuf.f_blocks)
continue;
- if (by_device)
+ if (by_device)
{
/* eg, /dev/hda1 -- strip off the "/dev/" */
if (strncmp (mnt_ptr->spec_device, "/dev/", strlen ("/dev/")) == 0)
else
sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
- if (strlen(disk_name) < 1)
+ if (strlen(disk_name) < 1)
{
DEBUG("df: no device name name for mountpoint %s, skipping", mnt_ptr->dir);
continue;
}
- }
- else
+ }
+ else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
{
+ if (strcmp (mnt_ptr->type, "rootfs") == 0)
+ continue;
sstrncpy (disk_name, "root", sizeof (disk_name));
}
else
blocksize = BLOCKSIZE(statbuf);
- /* Sanity-check for the values in the struct */
+ /*
+ * Sanity-check for the values in the struct
+ */
+ /* Check for negative "available" byes. For example UFS can
+ * report negative free space for user. Notice. blk_reserved
+ * will start to diminish after this. */
+#if HAVE_STATVFS
+ /* Cast and temporary variable are needed to avoid
+ * compiler warnings.
+ * ((struct statvfs).f_bavail is unsigned (POSIX)) */
+ int64_t signed_bavail = (int64_t) statbuf.f_bavail;
+ if (signed_bavail < 0)
+ statbuf.f_bavail = 0;
+#elif HAVE_STATFS
+ if (statbuf.f_bavail < 0)
+ statbuf.f_bavail = 0;
+#endif
+ /* Make sure that f_blocks >= f_bfree >= f_bavail */
if (statbuf.f_bfree < statbuf.f_bavail)
statbuf.f_bfree = statbuf.f_bavail;
if (statbuf.f_blocks < statbuf.f_bfree)
blk_reserved = (uint64_t) (statbuf.f_bfree - statbuf.f_bavail);
blk_used = (uint64_t) (statbuf.f_blocks - statbuf.f_bfree);
- df_submit_one (disk_name, "df_complex", "free",
+ if (report_percentage && (statbuf.f_blocks > 0))
+ {
+ uint64_t blk_total = (uint64_t) statbuf.f_blocks;
+ char plugin_instance[DATA_MAX_NAME_LEN];
+
+ ssnprintf (plugin_instance, sizeof (plugin_instance),
+ "%s-bytes", disk_name);
+
+ df_submit_one (plugin_instance, "percent", "free",
+ 100.0 * ((gauge_t) blk_free) / ((gauge_t) blk_total));
+ df_submit_one (plugin_instance, "percent", "reserved",
+ 100.0 * ((gauge_t) blk_reserved) / ((gauge_t) blk_total));
+ df_submit_one (plugin_instance, "percent", "used",
+ 100.0 * ((gauge_t) blk_used) / ((gauge_t) blk_total));
+ }
+ else if (!report_percentage)
+ {
+ df_submit_one (disk_name, "df_complex", "free",
(gauge_t) (blk_free * blocksize));
- df_submit_one (disk_name, "df_complex", "reserved",
+ df_submit_one (disk_name, "df_complex", "reserved",
(gauge_t) (blk_reserved * blocksize));
- df_submit_one (disk_name, "df_complex", "used",
+ df_submit_one (disk_name, "df_complex", "used",
(gauge_t) (blk_used * blocksize));
+ }
/* inode handling */
if (report_inodes)
inode_free = (uint64_t) statbuf.f_favail;
inode_reserved = (uint64_t) (statbuf.f_ffree - statbuf.f_favail);
inode_used = (uint64_t) (statbuf.f_files - statbuf.f_ffree);
-
- df_submit_one (disk_name, "df_inodes", "free",
- (gauge_t) inode_free);
- df_submit_one (disk_name, "df_inodes", "reserved",
- (gauge_t) inode_reserved);
- df_submit_one (disk_name, "df_inodes", "used",
- (gauge_t) inode_used);
+
+ if (report_percentage && (statbuf.f_files > 0))
+ {
+ uint64_t inode_total = (uint64_t) statbuf.f_files;
+ char plugin_instance[DATA_MAX_NAME_LEN];
+
+ ssnprintf (plugin_instance, sizeof (plugin_instance),
+ "%s-inodes", disk_name);
+
+ df_submit_one (plugin_instance, "percent", "free",
+ 100.0 * ((gauge_t) inode_free) / ((gauge_t) inode_total));
+ df_submit_one (plugin_instance, "percent", "reserved",
+ 100.0 * ((gauge_t) inode_reserved) / ((gauge_t) inode_total));
+ df_submit_one (plugin_instance, "percent", "used",
+ 100.0 * ((gauge_t) inode_used) / ((gauge_t) inode_total));
+ }
+ else if (!report_percentage)
+ {
+ df_submit_one (disk_name, "df_inodes", "free",
+ (gauge_t) inode_free);
+ df_submit_one (disk_name, "df_inodes", "reserved",
+ (gauge_t) inode_reserved);
+ df_submit_one (disk_name, "df_inodes", "used",
+ (gauge_t) inode_used);
+ }
}
}