X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdf.c;h=0b223080e38d726d13215b2996ddfb4e19eb89e5;hb=65121a18b0d01a120f0931776b1d552c9358f5c6;hp=5391f50c852f8dea77e620683c1a2d5e51fd3eac;hpb=61fba41289decabc1a18c855fcd462fece9ab983;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 5391f50c..0b223080 100644
--- a/src/df.c
+++ b/src/df.c
@@ -54,7 +54,9 @@ static const char *config_keys[] =
 	"IgnoreSelected",
 	"ReportByDevice",
 	"ReportReserved",
-	"ReportInodes"
+	"ReportInodes",
+	"ValuesAbsolute",
+	"ValuesPercentage"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -64,6 +66,8 @@ static ignorelist_t *il_fstype = NULL;
 
 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)
 {
@@ -131,7 +135,24 @@ 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;
 
+		return (0);
+	}
+	else if (strcasecmp (key, "ValuesPercentage") == 0)
+	{
+		if (IS_TRUE (value))
+			values_percentage = 1;
+		else
+			values_percentage = 0;
+
+		return (0);
+	}
 
 	return (-1);
 }
@@ -228,6 +249,8 @@ static int df_read (void)
 		{
 			if (strcmp (mnt_ptr->dir, "/") == 0)
 			{
+				if (strcmp (mnt_ptr->type, "rootfs") == 0)
+					continue;
 				sstrncpy (disk_name, "root", sizeof (disk_name));
 			}
 			else
@@ -245,7 +268,24 @@ static int df_read (void)
 
 		blocksize = BLOCKSIZE(statbuf);
 
-		/* Sanity-check for the values in the struct */
+		/*
+		 * 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)
@@ -255,13 +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 (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)
 		{
@@ -274,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, "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);
+			}
+			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);
+			}
 		}
 	}