X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=f3bc7e4267eb5151eb02cab049e16be3842eff29;hb=f8379dd45f4a43595f4027992696ee8d02908bff;hp=dc7be1ebd8238a3f6913819c1d406d3f4130ae6c;hpb=dd5fc7ca70168375863161967d6738914ea008b7;p=collectd.git

diff --git a/src/df.c b/src/df.c
index dc7be1eb..f3bc7e42 100644
--- a/src/df.c
+++ b/src/df.c
@@ -53,8 +53,9 @@ static const char *config_keys[] =
 	"FSType",
 	"IgnoreSelected",
 	"ReportByDevice",
-	"ReportReserved",
-	"ReportInodes"
+	"ReportInodes",
+	"ValuesAbsolute",
+	"ValuesPercentage"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -62,9 +63,10 @@ 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_reserved = false;
-static _Bool report_inodes = false;
+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)
 {
@@ -119,55 +121,41 @@ static int df_config (const char *key, const char *value)
 	else if (strcasecmp (key, "ReportByDevice") == 0)
 	{
 		if (IS_TRUE (value))
-			by_device = true;
+			by_device = 1;
 
 		return (0);
 	}
-	else if (strcasecmp (key, "ReportReserved") == 0)
+	else if (strcasecmp (key, "ReportInodes") == 0)
 	{
 		if (IS_TRUE (value))
-			report_reserved = true;
+			report_inodes = 1;
 		else
-			report_reserved = false;
+			report_inodes = 0;
 
 		return (0);
 	}
-	else if (strcasecmp (key, "ReportInodes") == 0)
+	else if (strcasecmp (key, "ValuesAbsolute") == 0)
 	{
 		if (IS_TRUE (value))
-			report_inodes = true;
+			values_absolute = 1;
 		else
-			report_inodes = false;
+			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);
 }
 
-static void df_submit_two (char *df_name,
-		const char *type,
-		gauge_t df_used,
-		gauge_t df_free)
-{
-	value_t values[2];
-	value_list_t vl = VALUE_LIST_INIT;
-
-	values[0].gauge = df_used;
-	values[1].gauge = df_free;
-
-	vl.values = values;
-	vl.values_len = 2;
-	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, type, sizeof (vl.type));
-	sstrncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
-
-	plugin_dispatch_values (&vl);
-} /* void df_submit_two */
-
 __attribute__ ((nonnull(2)))
 static void df_submit_one (char *plugin_instance,
 		const char *type, const char *type_instance,
@@ -215,17 +203,43 @@ static int df_read (void)
 	{
 		unsigned long long blocksize;
 		char disk_name[256];
+		cu_mount_t *dup_ptr;
+		uint64_t blk_free;
+		uint64_t blk_reserved;
+		uint64_t blk_used;
+
+		char const *dev = (mnt_ptr->spec_device != NULL)
+			? mnt_ptr->spec_device
+			: mnt_ptr->device;
 
-		if (ignorelist_match (il_device,
-					(mnt_ptr->spec_device != NULL)
-					? mnt_ptr->spec_device
-					: mnt_ptr->device))
+		if (ignorelist_match (il_device, dev))
 			continue;
 		if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
 			continue;
 		if (ignorelist_match (il_fstype, mnt_ptr->type))
 			continue;
 
+		/* search for duplicates *in front of* the current mnt_ptr. */
+		for (dup_ptr = mnt_list; dup_ptr != NULL; dup_ptr = dup_ptr->next)
+		{
+			/* No duplicate found: mnt_ptr is the first of its kind. */
+			if (dup_ptr == mnt_ptr)
+			{
+				dup_ptr = NULL;
+				break;
+			}
+
+			/* Duplicate found: leave non-NULL dup_ptr. */
+			if (by_device && (strcmp (mnt_ptr->spec_device, dup_ptr->spec_device) == 0))
+				break;
+			else if (!by_device && (strcmp (mnt_ptr->dir, dup_ptr->dir) == 0))
+				break;
+		}
+
+		/* ignore duplicates */
+		if (dup_ptr != NULL)
+			continue;
+
 		if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
 		{
 			char errbuf[1024];
@@ -239,28 +253,24 @@ 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)
-				sstrncpy (disk_name, mnt_ptr->spec_device + strlen ("/dev/"), sizeof (disk_name));
+			if (strncmp (dev, "/dev/", strlen ("/dev/")) == 0)
+				sstrncpy (disk_name, dev + strlen ("/dev/"), sizeof (disk_name));
 			else
-				sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
+				sstrncpy (disk_name, dev, 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)
-			{
-				if (strcmp (mnt_ptr->type, "rootfs") == 0)
-					continue;
 				sstrncpy (disk_name, "root", sizeof (disk_name));
-			}
 			else
 			{
 				int i, len;
@@ -276,59 +286,59 @@ static int df_read (void)
 
 		blocksize = BLOCKSIZE(statbuf);
 
-		if (report_reserved)
-		{
-			uint64_t blk_free;
-			uint64_t blk_reserved;
-			uint64_t blk_used;
-
-			/*
-			 * 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. */
+		/*
+		 * 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;
+		/* 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;
+		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)
-				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);
-			
+		/* 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)
+			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);
+
+		if (values_absolute)
+		{
 			df_submit_one (disk_name, "df_complex", "free",
-					(gauge_t) (blk_free * blocksize));
+				(gauge_t) (blk_free * blocksize));
 			df_submit_one (disk_name, "df_complex", "reserved",
-					(gauge_t) (blk_reserved * blocksize));
+				(gauge_t) (blk_reserved * blocksize));
 			df_submit_one (disk_name, "df_complex", "used",
-					(gauge_t) (blk_used * blocksize));
+				(gauge_t) (blk_used * blocksize));
 		}
-		else /* compatibility code */
-		{
-			gauge_t df_free;
-			gauge_t df_used;
 
-			df_free = statbuf.f_bfree * blocksize;
-			df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize;
-
-			df_submit_two (disk_name, "df", df_used, df_free);
+		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)
+		if (report_inodes && statbuf.f_files != 0 && statbuf.f_ffree != 0)
 		{
 			uint64_t inode_free;
 			uint64_t inode_reserved;
@@ -343,13 +353,29 @@ static int df_read (void)
 			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);
+			}
 		}
 	}