X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdf.c;h=3d5a402c7949b8741b7568b78d987c1fe033dc6a;hb=b0d364776a000846f5deb8c650d678834c537735;hp=03b02ceaf06e9d585c57541bd9feed44f58fead3;hpb=c07ccc0a97187cf6e7a9c95a2b1dd01a6f19e205;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 03b02cea..3d5a402c 100644
--- 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);
+				DEBUG("df: no device name for mountpoint %s, skipping", mnt_ptr->dir);
 				continue;
 			}
-		} 
-		else 
+		}
+		else
 		{
 			if (strcmp (mnt_ptr->dir, "/") == 0)
 			{
@@ -285,19 +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)
-		{
-			if (statbuf.f_files > 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
+		if (values_absolute)
 		{
 			df_submit_one (disk_name, "df_complex", "free",
 				(gauge_t) (blk_free * blocksize));
@@ -306,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, "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)
 		{
@@ -319,24 +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)
+			if (values_percentage)
 			{
-				if (statbuf.f_files > 0) 
+				if (statbuf.f_files > 0)
 				{
-					df_submit_one (disk_name, "df_inodes_pct", "free", 
+					df_submit_one (disk_name, "percent_inodes", "free",
 						(gauge_t) ((float_t)(inode_free) / statbuf.f_files * 100));
-					df_submit_one (disk_name, "df_inodes_pct", "reserved", 
+					df_submit_one (disk_name, "percent_inodes", "reserved",
 						(gauge_t) ((float_t)(inode_reserved) / statbuf.f_files * 100));
-					df_submit_one (disk_name, "df_inodes_pct", "used", 
+					df_submit_one (disk_name, "percent_inodes", "used",
 						(gauge_t) ((float_t)(inode_used) / statbuf.f_files * 100));
 				}
+				else return (-1);
 			}
-			else 
+			if (values_absolute)
 			{
 				df_submit_one (disk_name, "df_inodes", "free",
 						(gauge_t) inode_free);