Plugin df - reporting both percentage and absolute values

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 541af4ce9340b66450a06a21a5d582e3c9331c63..97dd8ab2dc0d4c15328d9179693e123e7e489830 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1511,14 +1511,19 @@ Enable this option if inodes are a scarce resource for you, usually because
 many small files are stored on the disk. This is a usual scenario for mail
 transfer agents and web caches.
 
-=item B<ReportPercentage> B<false>|B<true>
+=item B<ValuesAbsolute> B<true>|B<false>
 
-Enables or disables reporting of disk space and inodes as a percentage.
-Defaults to B<false>.
+Enables or disables reporting of free, used and used disk space in 1K-blocks. 
+Defaults to true.
+
+=item B<ValuesPercentage> B<true>|B<false>
+
+Enables or disables reporting of free, used and used disk space in percentage.
+Defaults to false.
 
-This is useful for deploying I<collectd> on the cloud, where machines with
-different disk size may exist. Then it is more practical to configure
-thresholds based on relative disk size.
+This is useful for deploying collectd on the cloud, where machines with
+different disk size may exist. Then it is more practical to configure thresholds
+based on relative disk size.
 
 =back
 

diff --git a/src/df.c b/src/df.c
index 5ff3f59be8cbcb401dd288c17ec4b89777251b43..0b223080e38d726d13215b2996ddfb4e19eb89e5 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -55,7 +55,8 @@ static const char *config_keys[] =
        "ReportByDevice",
        "ReportReserved",
        "ReportInodes",
-       "ReportPercentage"
+       "ValuesAbsolute",
+       "ValuesPercentage"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -65,7 +66,8 @@ static ignorelist_t *il_fstype = NULL;
 
 static _Bool by_device = 0;
 static _Bool report_inodes = 0;
-static _Bool report_percentage = 0;
+static _Bool values_absolute = 1;
+static _Bool values_percentage = 0;
 
 static int df_init (void)
 {
@@ -133,13 +135,21 @@ static int df_config (const char *key, const char *value)
 
                return (0);
        }
+       else if (strcasecmp (key, "ValuesAbsolute") == 0)
+       {
+               if (IS_TRUE (value))
+                       values_absolute = 1;
+               else
+                       values_absolute = 0;
 
-       else if (strcasecmp (key, "ReportPercentage") == 0)
+               return (0);
+       }
+       else if (strcasecmp (key, "ValuesPercentage") == 0)
        {
                if (IS_TRUE (value))
-                       report_percentage = 1;
+                       values_percentage = 1;
                else
-                       report_percentage = 0;
+                       values_percentage = 0;
 
                return (0);
        }
@@ -221,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)
@@ -229,13 +239,13 @@ 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);
                                continue;
                        }
-               }
-               else
+               } 
+               else 
                {
                        if (strcmp (mnt_ptr->dir, "/") == 0)
                        {
@@ -285,22 +295,7 @@ 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);
 
-               if (report_percentage && (statbuf.f_blocks > 0))
-               {
-                       uint64_t blk_total = (uint64_t) statbuf.f_blocks;
-                       char plugin_instance[DATA_MAX_NAME_LEN];
-
-                       ssnprintf (plugin_instance, sizeof (plugin_instance),
-                                       "%s-bytes", disk_name);
-
-                       df_submit_one (plugin_instance, "percent", "free",
-                                       100.0 * ((gauge_t) blk_free) / ((gauge_t) blk_total));
-                       df_submit_one (plugin_instance, "percent", "reserved",
-                                       100.0 * ((gauge_t) blk_reserved) / ((gauge_t) blk_total));
-                       df_submit_one (plugin_instance, "percent", "used",
-                                       100.0 * ((gauge_t) blk_used) / ((gauge_t) blk_total));
-               }
-               else if (!report_percentage)
+               if (values_absolute)
                {
                        df_submit_one (disk_name, "df_complex", "free",
                                (gauge_t) (blk_free * blocksize));
@@ -309,7 +304,21 @@ static int df_read (void)
                        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, "df_complex_pct", "free", 
+                                       (gauge_t) ((float_t)(blk_free) / statbuf.f_blocks * 100));
+                               df_submit_one (disk_name, "df_complex_pct", "reserved", 
+                                       (gauge_t) ((float_t)(blk_reserved) / statbuf.f_blocks * 100));
+                               df_submit_one (disk_name, "df_complex_pct", "used", 
+                                       (gauge_t) ((float_t)(blk_used) / statbuf.f_blocks * 100));
+                               }
+                       else return (-1);
+               }
+               
                /* inode handling */
                if (report_inodes)
                {
@@ -322,27 +331,25 @@ 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);
 
-                       if (report_percentage && (statbuf.f_files > 0))
+                       if (values_percentage)
                        {
-                               uint64_t inode_total = (uint64_t) statbuf.f_files;
-                               char plugin_instance[DATA_MAX_NAME_LEN];
-
-                               ssnprintf (plugin_instance, sizeof (plugin_instance),
-                                               "%s-inodes", disk_name);
-
-                               df_submit_one (plugin_instance, "percent", "free",
-                                               100.0 * ((gauge_t) inode_free) / ((gauge_t) inode_total));
-                               df_submit_one (plugin_instance, "percent", "reserved",
-                                               100.0 * ((gauge_t) inode_reserved) / ((gauge_t) inode_total));
-                               df_submit_one (plugin_instance, "percent", "used",
-                                               100.0 * ((gauge_t) inode_used) / ((gauge_t) inode_total));
+                               if (statbuf.f_files > 0) 
+                               {
+                                       df_submit_one (disk_name, "df_inodes_pct", "free", 
+                                               (gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100));
+                                       df_submit_one (disk_name, "df_inodes_pct", "reserved", 
+                                               (gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100));
+                                       df_submit_one (disk_name, "df_inodes_pct", "used", 
+                                               (gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
+                               }
+                               else return (-1);
                        }
-                       else if (!report_percentage)
+                       if (values_absolute) 
                        {
                                df_submit_one (disk_name, "df_inodes", "free",
                                                (gauge_t) inode_free);