From: Florian Forster <octo@collectd.org>
Date: Sat, 25 Feb 2012 17:15:36 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.0.4~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=59c7ee1cafaf53814838794908dd84f8101334c7

Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
	src/df.c

Change-Id: Ie7c9fd4a20cc356bb53b135bf2ca2d5162a8a953
---

59c7ee1cafaf53814838794908dd84f8101334c7
diff --cc contrib/exec-nagios.px
index 4b112f95,02bd0a33..c7f18c58
--- a/contrib/exec-nagios.px
+++ b/contrib/exec-nagios.px
@@@ -23,9 -23,9 +23,10 @@@ use Regexp::Common ('number')
  
  our $ConfigFile = '/etc/exec-nagios.conf';
  our $TypeMap = {};
+ our $NRPEMap = {};
  our $Scripts = [];
 -our $Interval = 300;
 +our $Interval = defined ($ENV{'COLLECTD_INTERVAL'}) ? (0 + $ENV{'COLLECTD_INTERVAL'}) : 300;
 +our $Hostname = defined ($ENV{'COLLECTD_HOSTNAME'}) ? $ENV{'COLLECTD_HOSTNAME'} : '';
  
  main ();
  exit (0);
diff --cc src/df.c
index 371a7fc3,22264d30..41a03cbf
--- a/src/df.c
+++ b/src/df.c
@@@ -245,37 -274,56 +245,39 @@@ 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 is needed to avoid compiler warnings.
 -			/* 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)) */
- 		if (((int64_t) statbuf.f_bavail) < 0)
++		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);
 -			
 -			df_submit_one (disk_name, "df_complex", "free",
 -					(gauge_t) (blk_free * blocksize));
 -			df_submit_one (disk_name, "df_complex", "reserved",
 -					(gauge_t) (blk_reserved * blocksize));
 -			df_submit_one (disk_name, "df_complex", "used",
 -					(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);
 -		}
 +		/* 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);
 +
 +		df_submit_one (disk_name, "df_complex", "free",
 +				(gauge_t) (blk_free * blocksize));
 +		df_submit_one (disk_name, "df_complex", "reserved",
 +				(gauge_t) (blk_reserved * blocksize));
 +		df_submit_one (disk_name, "df_complex", "used",
 +				(gauge_t) (blk_used * blocksize));
  
  		/* inode handling */
  		if (report_inodes)