X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=61d0c28cb79deb01a222c510ffc57b33ea5911bc;hb=6c6314c7ccca4dae0b9233061dbdf36040dadffe;hp=2c59b01c63e7f5a5e65163f4e1278609fbec8a17;hpb=9d15d1058b93acb7be041934acfe76548539041a;p=collectd.git diff --git a/src/df.c b/src/df.c index 2c59b01c..61d0c28c 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" @@ -48,14 +50,19 @@ static const char *config_keys[] = "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; +static _Bool by_device = false; +static _Bool report_inodes = false; + static int df_init (void) { if (il_device == NULL) @@ -92,9 +99,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); @@ -108,30 +113,56 @@ static int df_config (const char *key, const char *value) } return (0); } + else if (strcasecmp (key, "ReportByDevice") == 0) + { + if (IS_TRUE (value)) + by_device = true; + + return (0); + } + else if (strcasecmp (key, "ReportReserved") == 0) + { + /* Nop for backwards compatibility. */ + return (0); + } + else if (strcasecmp (key, "ReportInodes") == 0) + { + if (IS_TRUE (value)) + report_inodes = true; + else + report_inodes = false; + + 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) { @@ -144,32 +175,17 @@ 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 mnt_name[256]; - mnt_list = NULL; if (cu_mount_getlist (&mnt_list) == NULL) return (-1); for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next) { - if (strcmp (mnt_ptr->dir, "/") == 0) - { - sstrncpy (mnt_name, "root", sizeof (mnt_name)); - } - else - { - int i, len; - - sstrncpy (mnt_name, mnt_ptr->dir + 1, sizeof (mnt_name)); - len = strlen (mnt_name); - - for (i = 0; i < len; i++) - if (mnt_name[i] == '/') - mnt_name[i] = '-'; - } + 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) @@ -193,11 +209,82 @@ static int df_read (void) if (!statbuf.f_blocks) continue; + 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)); + 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 + { + 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] = '-'; + } + } + blocksize = BLOCKSIZE(statbuf); - df_free = statbuf.f_bfree * blocksize; - df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize; - df_submit (mnt_name, df_used, df_free); + /* Sanity-check for the values in the struct */ + 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);