X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdf.c;h=4936cc0c3eda2a7ddfe9cc17a6e6c9cfb6ddfe1b;hb=26cad19ab2412d87fa01f75ab498054482a072d2;hp=61d0c28cb79deb01a222c510ffc57b33ea5911bc;hpb=37e18082cfb22491138e282074c5267df48dd8de;p=collectd.git diff --git a/src/df.c b/src/df.c index 61d0c28c..4936cc0c 100644 --- a/src/df.c +++ b/src/df.c @@ -33,12 +33,14 @@ # include # 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 # endif # define STATANYFS statfs +# define STATANYFS_STR "statfs" # define BLOCKSIZE(s) (s).f_bsize #else # error "No applicable input method." @@ -52,7 +54,9 @@ static const char *config_keys[] = "IgnoreSelected", "ReportByDevice", "ReportReserved", - "ReportInodes" + "ReportInodes", + "ValuesAbsolute", + "ValuesPercentage" }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -60,8 +64,10 @@ 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 report_inodes = false; +static _Bool by_device = 0; +static _Bool report_inodes = 0; +static _Bool values_absolute = 1; +static _Bool values_percentage = 0; static int df_init (void) { @@ -116,25 +122,37 @@ static int df_config (const char *key, const char *value) else if (strcasecmp (key, "ReportByDevice") == 0) { if (IS_TRUE (value)) - by_device = true; + by_device = 1; return (0); } - else if (strcasecmp (key, "ReportReserved") == 0) + else if (strcasecmp (key, "ReportInodes") == 0) { - /* Nop for backwards compatibility. */ + if (IS_TRUE (value)) + report_inodes = 1; + else + report_inodes = 0; + return (0); } - else if (strcasecmp (key, "ReportInodes") == 0) + else if (strcasecmp (key, "ValuesAbsolute") == 0) { if (IS_TRUE (value)) - report_inodes = true; + values_absolute = 1; else - report_inodes = false; + values_absolute = 0; return (0); } + else if (strcasecmp (key, "ValuesPercentage") == 0) + { + if (IS_TRUE (value)) + values_percentage = 1; + else + values_percentage = 0; + return (0); + } return (-1); } @@ -177,7 +195,10 @@ static int df_read (void) mnt_list = NULL; if (cu_mount_getlist (&mnt_list) == NULL) + { + ERROR ("df plugin: cu_mount_getlist failed."); return (-1); + } for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next) { @@ -200,7 +221,8 @@ static int df_read (void) 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; @@ -209,7 +231,7 @@ static int df_read (void) 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) @@ -217,16 +239,18 @@ static int df_read (void) 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); + DEBUG("df: no device 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 @@ -244,7 +268,24 @@ static int df_read (void) 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) @@ -254,13 +295,30 @@ static int df_read (void) 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 (values_absolute) + { + 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)); - + } + + if (values_percentage) + { + if (statbuf.f_blocks > 0) + { + df_submit_one (disk_name, "percent_bytes", "free", + (gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100)); + df_submit_one (disk_name, "percent_bytes", "reserved", + (gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100)); + 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) { @@ -273,17 +331,33 @@ static int df_read (void) 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); - - 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 (values_percentage) + { + if (statbuf.f_files > 0) + { + df_submit_one (disk_name, "percent_inodes", "free", + (gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100)); + df_submit_one (disk_name, "percent_inodes", "reserved", + (gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100)); + df_submit_one (disk_name, "percent_inodes", "used", + (gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100)); + } + else return (-1); + } + if (values_absolute) + { + 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); + } } }