X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdf.c;h=9185ba449560d17d13c1bb9c5a8b92927986d391;hb=29a58124b9c561019df84f07d334a161a6cd6ab0;hp=a9c1bdb7b815cc7322290939534a1f0a6a13e091;hpb=3ada23491952cc01baadd19ffeba27e0c332f0c1;p=collectd.git diff --git a/src/df.c b/src/df.c index a9c1bdb7..3d5a402c 100644 --- a/src/df.c +++ b/src/df.c @@ -1,6 +1,7 @@ /** * collectd - src/df.c - * Copyright (C) 2005-2007 Florian octo Forster + * Copyright (C) 2005-2009 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 @@ -17,6 +18,7 @@ * * Authors: * Florian octo Forster + * Paul Sadauskas **/ #include "collectd.h" @@ -31,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." @@ -48,16 +52,22 @@ static const char *config_keys[] = "MountPoint", "FSType", "IgnoreSelected", - "ReportByDevice", - NULL + "ReportByDevice", + "ReportReserved", + "ReportInodes", + "ValuesAbsolute", + "ValuesPercentage" }; -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 = 0; +static _Bool report_inodes = 0; +static _Bool values_absolute = 1; +static _Bool values_percentage = 0; static int df_init (void) { @@ -95,9 +105,7 @@ static int df_config (const char *key, const char *value) } 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); @@ -111,40 +119,68 @@ static int df_config (const char *key, const char *value) } return (0); } - else if (strcasecmp (key, "ReportByDevice") == 0) - { - if ((strcasecmp (value, "True") == 0) - || (strcasecmp (value, "Yes") == 0) - || (strcasecmp (value, "On") == 0)) - { - by_device = true; - } + else if (strcasecmp (key, "ReportByDevice") == 0) + { + if (IS_TRUE (value)) + by_device = 1; + + return (0); + } + else if (strcasecmp (key, "ReportInodes") == 0) + { + if (IS_TRUE (value)) + report_inodes = 1; + else + report_inodes = 0; + + return (0); + } + else if (strcasecmp (key, "ValuesAbsolute") == 0) + { + if (IS_TRUE (value)) + values_absolute = 1; + else + 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); } -static void df_submit (char *df_name, - gauge_t df_used, - gauge_t df_free) +__attribute__ ((nonnull(2))) +static void df_submit_one (char *plugin_instance, + const char *type, const char *type_instance, + gauge_t value) { - value_t values[2]; + value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = df_used; - values[1].gauge = df_free; + values[0].gauge = value; vl.values = values; - vl.values_len = 2; + vl.values_len = 1; 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)); + if (plugin_instance != NULL) + sstrncpy (vl.plugin_instance, plugin_instance, + sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); + if (type_instance != NULL) + sstrncpy (vl.type_instance, type_instance, + sizeof (vl.type_instance)); plugin_dispatch_values (&vl); -} /* void df_submit */ +} /* void df_submit_one */ static int df_read (void) { @@ -157,21 +193,36 @@ static int df_read (void) cu_mount_t *mnt_list; cu_mount_t *mnt_ptr; - unsigned long long blocksize; - gauge_t df_free; - gauge_t df_used; - char disk_name[256]; - 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) { + unsigned long long blocksize; + char disk_name[256]; + uint64_t blk_free; + 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)) + 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]; - ERROR ("statv?fs failed: %s", + ERROR (STATANYFS_STR"(%s) failed: %s", + mnt_ptr->dir, sstrerror (errno, errbuf, sizeof (errbuf))); continue; @@ -180,24 +231,26 @@ static int df_read (void) if (!statbuf.f_blocks) continue; - blocksize = BLOCKSIZE(statbuf); - df_free = statbuf.f_bfree * blocksize; - df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize; - - if (by_device) + if (by_device) { - // eg, /dev/hda1 -- strip off the "/dev/" - strncpy (disk_name, mnt_ptr->spec_device + 5, sizeof (disk_name)); - if (strlen(disk_name) < 1) + /* 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); + 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 @@ -213,17 +266,99 @@ static int df_read (void) } } - 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; + blocksize = BLOCKSIZE(statbuf); + + /* + * 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) + statbuf.f_blocks = statbuf.f_bfree; + + blk_free = (uint64_t) statbuf.f_bavail; + blk_reserved = (uint64_t) (statbuf.f_bfree - statbuf.f_bavail); + blk_used = (uint64_t) (statbuf.f_blocks - statbuf.f_bfree); + + if (values_absolute) + { + df_submit_one (disk_name, "df_complex", "free", + (gauge_t) (blk_free * blocksize)); + df_submit_one (disk_name, "df_complex", "reserved", + (gauge_t) (blk_reserved * blocksize)); + df_submit_one (disk_name, "df_complex", "used", + (gauge_t) (blk_used * blocksize)); + } - df_submit (disk_name, df_used, df_free); + 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) + { + uint64_t inode_free; + uint64_t inode_reserved; + uint64_t inode_used; + + /* Sanity-check for the values in the struct */ + if (statbuf.f_ffree < statbuf.f_favail) + 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) + { + 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); + } + } } cu_mount_freelist (mnt_list);