X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=38079d8772e232f44ac690cc636222a67e45195e;hb=59c7ee1cafaf53814838794908dd84f8101334c7;hp=d327164ac601e3a98c59217122240b0e77b8ea4b;hpb=e913f3f6b71b0ba4abd6aaf2202100a5cef48b75;p=collectd.git diff --git a/src/df.c b/src/df.c index d327164a..41a03cbf 100644 --- a/src/df.c +++ b/src/df.c @@ -1,11 +1,11 @@ /** * collectd - src/df.c - * Copyright (C) 2005,2006 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 - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. + * Free Software Foundation; only version 2 of the License is applicable. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,6 +18,7 @@ * * Authors: * Florian octo Forster + * Paul Sadauskas **/ #include "collectd.h" @@ -27,55 +28,44 @@ #include "utils_mount.h" #include "utils_ignorelist.h" -#define MODULE_NAME "df" - -#if HAVE_STATFS || HAVE_STATVFS -# define DF_HAVE_READ 1 -#else -# define DF_HAVE_READ 0 -#endif - #if HAVE_STATVFS # if HAVE_SYS_STATVFS_H # 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." #endif -static char *filename_template = "df-%s.rrd"; - -static char *ds_def[] = -{ - "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:U", - "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:U", - NULL -}; -static int ds_num = 2; - -static char *config_keys[] = +static const char *config_keys[] = { "Device", "MountPoint", "FSType", "IgnoreSelected", - NULL + "ReportByDevice", + "ReportReserved", + "ReportInodes" }; -static int config_keys_num = 4; +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; -#define BUFSIZE 512 +static _Bool by_device = 0; +static _Bool report_inodes = 0; -static void df_init (void) +static int df_init (void) { if (il_device == NULL) il_device = ignorelist_create (1); @@ -84,10 +74,10 @@ static void df_init (void) if (il_fstype == NULL) il_fstype = ignorelist_create (1); - return; + return (0); } -static int df_config (char *key, char *value) +static int df_config (const char *key, const char *value) { df_init (); @@ -111,9 +101,7 @@ static int df_config (char *key, 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); @@ -127,39 +115,53 @@ static int df_config (char *key, char *value) } return (0); } + else if (strcasecmp (key, "ReportByDevice") == 0) + { + if (IS_TRUE (value)) + by_device = 1; - return (-1); -} + return (0); + } + else if (strcasecmp (key, "ReportInodes") == 0) + { + if (IS_TRUE (value)) + report_inodes = 1; + else + report_inodes = 0; -static void df_write (char *host, char *inst, char *val) -{ - char file[BUFSIZE]; - int status; + return (0); + } - status = snprintf (file, BUFSIZE, filename_template, inst); - if (status < 1) - return; - else if (status >= BUFSIZE) - return; - rrd_update_file (host, file, val, ds_def, ds_num); + return (-1); } -#if DF_HAVE_READ -static void df_submit (char *df_name, - unsigned long long df_used, - unsigned long long df_free) +__attribute__ ((nonnull(2))) +static void df_submit_one (char *plugin_instance, + const char *type, const char *type_instance, + gauge_t value) { - char buf[BUFSIZE]; - - if (snprintf (buf, BUFSIZE, "%u:%llu:%llu", (unsigned int) curtime, - df_used, df_free) >= BUFSIZE) - return; - - plugin_submit (MODULE_NAME, df_name, buf); -} - -static void df_read (void) + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; + + values[0].gauge = value; + + vl.values = values; + vl.values_len = 1; + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "df", sizeof (vl.plugin)); + 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_one */ + +static int df_read (void) { #if HAVE_STATVFS struct statvfs statbuf; @@ -170,70 +172,148 @@ static void df_read (void) cu_mount_t *mnt_list; cu_mount_t *mnt_ptr; - unsigned long long blocksize; - unsigned long long df_free; - unsigned long long df_used; - char mnt_name[BUFSIZE]; - mnt_list = NULL; if (cu_mount_getlist (&mnt_list) == NULL) - return; + { + 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) { - syslog (LOG_ERR, "statv?fs failed: %s", strerror (errno)); + char errbuf[1024]; + ERROR (STATANYFS_STR"(%s) failed: %s", + mnt_ptr->dir, + sstrerror (errno, errbuf, + sizeof (errbuf))); continue; } if (!statbuf.f_blocks) continue; - blocksize = BLOCKSIZE(statbuf); - df_free = statbuf.f_bfree * blocksize; - df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize; - - if (strcmp (mnt_ptr->dir, "/") == 0) + if (by_device) { - strncpy (mnt_name, "root", BUFSIZE); - } - else + /* 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 { - int i, len; - - strncpy (mnt_name, mnt_ptr->dir + 1, BUFSIZE); - len = strlen (mnt_name); - - for (i = 0; i < len; i++) - if (mnt_name[i] == '/') - mnt_name[i] = '-'; + if (strcmp (mnt_ptr->dir, "/") == 0) + { + sstrncpy (disk_name, "root", sizeof (disk_name)); + } + else + { + int i, len; + + sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name)); + len = strlen (disk_name); + + for (i = 0; i < len; i++) + if (disk_name[i] == '/') + disk_name[i] = '-'; + } } - 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); - df_submit (mnt_name, df_used, df_free); + /* + * 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); + + 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)); + + /* 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); + + 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); -} /* static void df_read (void) */ -#else -# define df_read NULL -#endif /* DF_HAVE_READ */ + + return (0); +} /* int df_read */ void module_register (void) { - plugin_register (MODULE_NAME, df_init, df_read, df_write); - cf_register (MODULE_NAME, df_config, config_keys, config_keys_num); -} - -#undef BUFSIZE -#undef MODULE_NAME + plugin_register_config ("df", df_config, + config_keys, config_keys_num); + plugin_register_init ("df", df_init); + plugin_register_read ("df", df_read); +} /* void module_register */