X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd-nagios.c;h=b3c1855aba2be7d98a3c112b62b5ddbebe33f609;hb=adee81fe60077d03345c94e3780752a8c2c712cf;hp=29e34a4ce5a413c4af48037aade685fb1616b267;hpb=a2bf02b4f5bf4a22395b57bba6715dada3859612;p=collectd.git

diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c
index 29e34a4c..b3c1855a 100644
--- a/src/collectd-nagios.c
+++ b/src/collectd-nagios.c
@@ -1,6 +1,6 @@
 /**
  * collectd-nagios - src/collectd-nagios.c
- * Copyright (C) 2008  Florian octo Forster
+ * Copyright (C) 2008-2010  Florian octo Forster
  *
  * 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
@@ -23,6 +23,18 @@
 # include "config.h"
 #endif
 
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE
+#endif
+
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif
+
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 600
+#endif
+
 #if !defined(__GNUC__) || !__GNUC__
 # define __attribute__(x) /**/
 #endif
@@ -34,40 +46,10 @@
 #include <string.h>
 #include <strings.h>
 #include <assert.h>
-
-#include <sys/socket.h>
-#include <sys/un.h>
+#include <math.h>
 
 #include "libcollectdclient/client.h"
 
-/*
- * This is copied directly from collectd.h. Make changes there!
- */
-#if NAN_STATIC_DEFAULT
-# include <math.h>
-/* #endif NAN_STATIC_DEFAULT*/
-#elif NAN_STATIC_ISOC
-# ifndef __USE_ISOC99
-#  define DISABLE_ISOC99 1
-#  define __USE_ISOC99 1
-# endif /* !defined(__USE_ISOC99) */
-# include <math.h>
-# if DISABLE_ISOC99
-#  undef DISABLE_ISOC99
-#  undef __USE_ISOC99
-# endif /* DISABLE_ISOC99 */
-/* #endif NAN_STATIC_ISOC */
-#elif NAN_ZERO_ZERO
-# include <math.h>
-# ifdef NAN
-#  undef NAN
-# endif
-# define NAN (0.0 / 0.0)
-# ifndef isnan
-#  define isnan(f) ((f) != (f))
-# endif /* !defined(isnan) */
-#endif /* NAN_ZERO_ZERO */
-
 #define RET_OKAY     0
 #define RET_WARNING  1
 #define RET_CRITICAL 2
@@ -96,6 +78,7 @@ static char *hostname_g = NULL;
 static range_t range_critical_g;
 static range_t range_warning_g;
 static int consolitation_g = CON_NONE;
+static _Bool nan_is_error_g = 0;
 
 static char **match_ds_g = NULL;
 static int    match_ds_num_g = 0;
@@ -254,6 +237,7 @@ static void usage (const char *name)
 			"  -H <host>      Hostname to query the values for.\n"
 			"  -c <range>     Critical range\n"
 			"  -w <range>     Warning range\n"
+			"  -m             Treat \"Not a Number\" (NaN) as critical (default: warning)\n"
 			"\n"
 			"Consolidation functions:\n"
 			"  none:          Apply the warning- and critical-ranges to each data-source\n"
@@ -280,7 +264,12 @@ static int do_check_con_none (size_t values_num,
 	for (i = 0; i < values_num; i++)
 	{
 		if (isnan (values[i]))
-			num_warning++;
+		{
+			if (nan_is_error_g)
+				num_critical++;
+			else
+				num_warning++;
+		}
 		else if (match_range (&range_critical_g, values[i]) != 0)
 			num_critical++;
 		else if (match_range (&range_warning_g, values[i]) != 0)
@@ -316,7 +305,7 @@ static int do_check_con_none (size_t values_num,
 	{
 		printf (" |");
 		for (i = 0; i < values_num; i++)
-			printf (" %s=%g;;;;", values_names[i], values[i]);
+			printf (" %s=%f;;;;", values_names[i], values[i]);
 	}
 	printf ("\n");
 
@@ -337,11 +326,18 @@ static int do_check_con_average (size_t values_num,
 	total_num = 0;
 	for (i = 0; i < values_num; i++)
 	{
-		if (!isnan (values[i]))
+		if (isnan (values[i]))
 		{
-			total += values[i];
-			total_num++;
+			if (!nan_is_error_g)
+				continue;
+
+			printf ("CRITICAL: Data source \"%s\" is NaN\n",
+					values_names[i]);
+			return (RET_CRITICAL);
 		}
+
+		total += values[i];
+		total_num++;
 	}
 
 	if (total_num == 0)
@@ -370,7 +366,7 @@ static int do_check_con_average (size_t values_num,
 
 	printf ("%s: %g average |", status_str, average);
 	for (i = 0; i < values_num; i++)
-		printf (" %s=%g;;;;", values_names[i], values[i]);
+		printf (" %s=%f;;;;", values_names[i], values[i]);
 	printf ("\n");
 
 	return (status_code);
@@ -389,11 +385,18 @@ static int do_check_con_sum (size_t values_num,
 	total_num = 0;
 	for (i = 0; i < values_num; i++)
 	{
-		if (!isnan (values[i]))
+		if (isnan (values[i]))
 		{
-			total += values[i];
-			total_num++;
+			if (!nan_is_error_g)
+				continue;
+
+			printf ("CRITICAL: Data source \"%s\" is NaN\n",
+					values_names[i]);
+			return (RET_CRITICAL);
 		}
+
+		total += values[i];
+		total_num++;
 	}
 
 	if (total_num == 0)
@@ -420,7 +423,7 @@ static int do_check_con_sum (size_t values_num,
 
 	printf ("%s: %g sum |", status_str, total);
 	for (i = 0; i < values_num; i++)
-		printf (" %s=%g;;;;", values_names[i], values[i]);
+		printf (" %s=%f;;;;", values_names[i], values[i]);
 	printf ("\n");
 
 	return (status_code);
@@ -443,8 +446,19 @@ static int do_check_con_percentage (size_t values_num,
 	}
 
 	for (i = 0; i < values_num; i++)
-		if (!isnan (values[i]))
-			sum += values[i];
+	{
+		if (isnan (values[i]))
+		{
+			if (!nan_is_error_g)
+				continue;
+
+			printf ("CRITICAL: Data source \"%s\" is NaN\n",
+					values_names[i]);
+			return (RET_CRITICAL);
+		}
+
+		sum += values[i];
+	}
 
 	if (sum == 0.0)
 	{
@@ -563,7 +577,7 @@ int main (int argc, char **argv)
 	{
 		int c;
 
-		c = getopt (argc, argv, "w:c:s:n:H:g:d:h");
+		c = getopt (argc, argv, "w:c:s:n:H:g:d:hm");
 		if (c < 0)
 			break;
 
@@ -623,6 +637,9 @@ int main (int argc, char **argv)
 				match_ds_num_g++;
 				break;
 			}
+			case 'm':
+				nan_is_error_g = 1;
+				break;
 			default:
 				usage (argv[0]);
 		} /* switch (c) */