uint64_t blk_reserved;
uint64_t blk_used;
- if (ignorelist_match (il_device,
- (mnt_ptr->spec_device != NULL)
- ? mnt_ptr->spec_device
- : mnt_ptr->device))
+ char const *dev = (mnt_ptr->spec_device != NULL)
+ ? mnt_ptr->spec_device
+ : mnt_ptr->device;
+
+ if (ignorelist_match (il_device, dev))
continue;
if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
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)
- sstrncpy (disk_name, mnt_ptr->spec_device + strlen ("/dev/"), sizeof (disk_name));
+ if (strncmp (dev, "/dev/", strlen ("/dev/")) == 0)
+ sstrncpy (disk_name, dev + strlen ("/dev/"), sizeof (disk_name));
else
- sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
+ sstrncpy (disk_name, dev, 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);
+ DEBUG("df: no device name for mountpoint %s, skipping", mnt_ptr->dir);
continue;
}
- }
- else
+ }
+ else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
{
df_submit_one (disk_name, "df_complex", "used",
(gauge_t) (blk_used * blocksize));
}
-
+
if (values_percentage)
{
- if (statbuf.f_blocks > 0)
+ if (statbuf.f_blocks > 0)
{
- df_submit_one (disk_name, "df_complex_pct", "free",
+ df_submit_one (disk_name, "percent_bytes", "free",
(gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100));
- df_submit_one (disk_name, "df_complex_pct", "reserved",
+ df_submit_one (disk_name, "percent_bytes", "reserved",
(gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100));
- df_submit_one (disk_name, "df_complex_pct", "used",
+ df_submit_one (disk_name, "percent_bytes", "used",
(gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100));
}
else return (-1);
}
-
+
/* inode handling */
- if (report_inodes)
+ if (report_inodes && statbuf.f_files != 0 && statbuf.f_ffree != 0)
{
uint64_t inode_free;
uint64_t inode_reserved;
statbuf.f_ffree = statbuf.f_favail;
if (statbuf.f_files < statbuf.f_ffree)
statbuf.f_files = statbuf.f_ffree;
-
+
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);
if (values_percentage)
{
- if (statbuf.f_files > 0)
+ if (statbuf.f_files > 0)
{
- df_submit_one (disk_name, "df_inodes_pct", "free",
+ df_submit_one (disk_name, "percent_inodes", "free",
(gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100));
- df_submit_one (disk_name, "df_inodes_pct", "reserved",
+ df_submit_one (disk_name, "percent_inodes", "reserved",
(gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100));
- df_submit_one (disk_name, "df_inodes_pct", "used",
+ df_submit_one (disk_name, "percent_inodes", "used",
(gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
}
else return (-1);
}
- if (values_absolute)
+ if (values_absolute)
{
df_submit_one (disk_name, "df_inodes", "free",
(gauge_t) inode_free);