X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=194c25730107f43149d6ea9f273ef24f74a19d45;hb=79c87aeda9172e219a842e393c6499c8bf37662a;hp=38079d8772e232f44ac690cc636222a67e45195e;hpb=3f391479bfc45d0ff6e0c7b87c899e41a192f392;p=collectd.git

diff --git a/src/df.c b/src/df.c
index 38079d87..194c2573 100644
--- a/src/df.c
+++ b/src/df.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/df.c
  * Copyright (C) 2005-2007  Florian octo Forster
+ * Copyright (C) 2009       Paul Sadauskas
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Paul Sadauskas <psadauskas at gmail.com>
  **/
 
 #include "collectd.h"
@@ -48,14 +50,16 @@ static const char *config_keys[] =
 	"MountPoint",
 	"FSType",
 	"IgnoreSelected",
-	NULL
+        "ReportByDevice"
 };
-static int config_keys_num = 4;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
 static ignorelist_t *il_device = NULL;
 static ignorelist_t *il_mountpoint = NULL;
 static ignorelist_t *il_fstype = NULL;
 
+static _Bool by_device = false;
+
 static int df_init (void)
 {
 	if (il_device == NULL)
@@ -92,9 +96,7 @@ static int df_config (const char *key, const char *value)
 	}
 	else if (strcasecmp (key, "IgnoreSelected") == 0)
 	{
-		if ((strcasecmp (value, "True") == 0)
-				|| (strcasecmp (value, "Yes") == 0)
-				|| (strcasecmp (value, "On") == 0))
+		if (IS_TRUE (value))
 		{
 			ignorelist_set_invert (il_device, 0);
 			ignorelist_set_invert (il_mountpoint, 0);
@@ -108,6 +110,13 @@ static int df_config (const char *key, const char *value)
 		}
 		return (0);
 	}
+	else if (strcasecmp (key, "ReportByDevice") == 0)
+	{
+		if (IS_TRUE (value))
+			by_device = true;
+
+		return (0);
+	}
 
 	return (-1);
 }
@@ -147,7 +156,7 @@ static int df_read (void)
 	unsigned long long blocksize;
 	gauge_t df_free;
 	gauge_t df_used;
-	char mnt_name[256];
+	char disk_name[256];
 
 	mnt_list = NULL;
 	if (cu_mount_getlist (&mnt_list) == NULL)
@@ -155,6 +164,16 @@ static int df_read (void)
 
 	for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
 	{
+		if (ignorelist_match (il_device,
+					(mnt_ptr->spec_device != NULL)
+					? mnt_ptr->spec_device
+					: mnt_ptr->device))
+			continue;
+		if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
+			continue;
+		if (ignorelist_match (il_fstype, mnt_ptr->type))
+			continue;
+
 		if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
 		{
 			char errbuf[1024];
@@ -171,33 +190,40 @@ static int df_read (void)
 		df_free = statbuf.f_bfree * blocksize;
 		df_used = (statbuf.f_blocks - statbuf.f_bfree) * blocksize;
 
-		if (strcmp (mnt_ptr->dir, "/") == 0)
+		if (by_device) 
 		{
-			sstrncpy (mnt_name, "root", sizeof (mnt_name));
-		}
-		else
+			/* 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));
+			else
+				sstrncpy (disk_name, mnt_ptr->spec_device, sizeof (disk_name));
+
+			if (strlen(disk_name) < 1) 
+			{
+				DEBUG("df: no device name name for mountpoint %s, skipping", mnt_ptr->dir);
+				continue;
+			}
+		} 
+		else 
 		{
-			int i, len;
-
-			sstrncpy (mnt_name, mnt_ptr->dir + 1, sizeof (mnt_name));
-			len = strlen (mnt_name);
-
-			for (i = 0; i < len; i++)
-				if (mnt_name[i] == '/')
-					mnt_name[i] = '-';
+			if (strcmp (mnt_ptr->dir, "/") == 0)
+			{
+				sstrncpy (disk_name, "root", sizeof (disk_name));
+			}
+			else
+			{
+				int i, len;
+
+				sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
+				len = strlen (disk_name);
+
+				for (i = 0; i < len; i++)
+					if (disk_name[i] == '/')
+						disk_name[i] = '-';
+			}
 		}
 
-		if (ignorelist_match (il_device,
-					(mnt_ptr->spec_device != NULL)
-					? mnt_ptr->spec_device
-					: mnt_ptr->device))
-			continue;
-		if (ignorelist_match (il_mountpoint, mnt_ptr->dir))
-			continue;
-		if (ignorelist_match (il_fstype, mnt_ptr->type))
-			continue;
-
-		df_submit (mnt_name, df_used, df_free);
+		df_submit (disk_name, df_used, df_free);
 	}
 
 	cu_mount_freelist (mnt_list);