df: rename percentage types to a more generic name

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index abb6418ae00c8dd13f20219a32c6ab57aca1b2d3..4936cc0c3eda2a7ddfe9cc17a6e6c9cfb6ddfe1b 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -55,7 +55,8 @@ static const char *config_keys[] =
        "ReportByDevice",
        "ReportReserved",
        "ReportInodes",
-        "FreePercentage"
+       "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_free_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, "FreePercentage") == 0)
+               return (0);
+       }
+       else if (strcasecmp (key, "ValuesPercentage") == 0)
        {
                if (IS_TRUE (value))
-                       report_free_percentage = 1;
+                       values_percentage = 1;
                else
-                       report_free_percentage = 0;
+                       values_percentage = 0;
 
                return (0);
        }
@@ -197,7 +207,6 @@ static int df_read (void)
                uint64_t blk_free;
                uint64_t blk_reserved;
                uint64_t blk_used;
-               float blk_free_percentage;
 
                if (ignorelist_match (il_device,
                                        (mnt_ptr->spec_device != NULL)
@@ -222,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)
@@ -230,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);
+                               DEBUG("df: no device name for mountpoint %s, skipping", mnt_ptr->dir);
                                continue;
                        }
-               } 
-               else 
+               }
+               else
                {
                        if (strcmp (mnt_ptr->dir, "/") == 0)
                        {
@@ -286,23 +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 (report_free_percentage)
+               }
+               
+               if (values_percentage)
                {
-                   blk_free_percentage  = (float)((statbuf.f_blocks - statbuf.f_bfree) / statbuf.f_blocks * 100);
-                    float diff = statbuf.f_blocks - statbuf.f_bfree;
-                    float div = diff/statbuf.f_blocks ;
-
-                    df_submit_one (disk_name, "df_complex", "free_percentage", 
-                                   (gauge_t) (div * 100));
+                       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)
                {
@@ -315,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);
+                       }
                }
        }