X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd-nagios.c;h=8f4a41054ab55efbf0e79bf4d2a51b3da0e9244e;hb=ddb04607819e0026bb61e7af80f87d39c10dae91;hp=f37f78dde302b7cc2d22793282cf3415f516d96e;hpb=cd3a0c6f7928a34da21f670f627e8e8a21943546;p=collectd.git

diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c
index f37f78dd..8f4a4105 100644
--- a/src/collectd-nagios.c
+++ b/src/collectd-nagios.c
@@ -99,6 +99,7 @@
 #define CON_NONE     0
 #define CON_AVERAGE  1
 #define CON_SUM      2
+#define CON_PERCENTAGE  3
 
 struct range_s
 {
@@ -164,7 +165,7 @@ static int filter_ds (size_t *values_num,
 		return (RET_UNKNOWN);
 	}
 
-	for (i = 0; i < match_ds_num_g; i++)
+	for (i = 0; i < (size_t) match_ds_num_g; i++)
 	{
 		size_t j;
 
@@ -272,7 +273,7 @@ static void usage (const char *name)
 			"  -d <ds>        Select the DS to examine. May be repeated to examine multiple\n"
 			"                 DSes. By default all DSes are used.\n"
 			"  -g <consol>    Method to use to consolidate several DSes.\n"
-			"                 Valid arguments are `none', `average' and `sum'\n"
+			"                 See below for a list of valid arguments.\n"
 			"  -H <host>      Hostname to query the values for.\n"
 			"  -c <range>     Critical range\n"
 			"  -w <range>     Warning range\n"
@@ -283,6 +284,8 @@ static void usage (const char *name)
 			"  average:       Calculate the average of all matching DSes and apply the\n"
 			"                 warning- and critical-ranges to the calculated average.\n"
 			"  sum:           Apply the ranges to the sum of all DSes.\n"
+			"  percentage:    Apply the ranges to the ratio (in percent) of the first value\n"
+			"                 and the sum of all values."
 			"\n", name);
 	exit (1);
 } /* void usage */
@@ -295,7 +298,7 @@ static int do_check_con_none (size_t values_num,
 	int num_okay = 0;
 	const char *status_str = "UNKNOWN";
 	int status_code = RET_UNKNOWN;
-	int i;
+	size_t i;
 
 	for (i = 0; i < values_num; i++)
 	{
@@ -346,7 +349,7 @@ static int do_check_con_none (size_t values_num,
 static int do_check_con_average (size_t values_num,
 		double *values, char **values_names)
 {
-	int i;
+	size_t i;
 	double total;
 	int total_num;
 	double average;
@@ -399,7 +402,7 @@ static int do_check_con_average (size_t values_num,
 static int do_check_con_sum (size_t values_num,
 		double *values, char **values_names)
 {
-	int i;
+	size_t i;
 	double total;
 	int total_num;
 	const char *status_str = "UNKNOWN";
@@ -446,6 +449,56 @@ static int do_check_con_sum (size_t values_num,
 	return (status_code);
 } /* int do_check_con_sum */
 
+static int do_check_con_percentage (size_t values_num,
+		double *values, char **values_names)
+{
+	size_t i;
+	double sum = 0.0;
+	double percentage;
+
+	const char *status_str  = "UNKNOWN";
+	int         status_code = RET_UNKNOWN;
+
+	if ((values_num < 1) || (isnan (values[0])))
+	{
+		printf ("WARNING: The first value is not defined\n");
+		return (RET_WARNING);
+	}
+
+	for (i = 0; i < values_num; i++)
+		if (!isnan (values[i]))
+			sum += values[i];
+
+	if (sum == 0.0)
+	{
+		printf ("WARNING: Values sum up to zero\n");
+		return (RET_WARNING);
+	}
+
+	percentage = 100.0 * values[0] / sum;
+
+	if (match_range (&range_critical_g, percentage) != 0)
+	{
+		status_str  = "CRITICAL";
+		status_code = RET_CRITICAL;
+	}
+	else if (match_range (&range_warning_g, percentage) != 0)
+	{
+		status_str  = "WARNING";
+		status_code = RET_WARNING;
+	}
+	else
+	{
+		status_str  = "OKAY";
+		status_code = RET_OKAY;
+	}
+
+	printf ("%s: %lf percent |", status_str, percentage);
+	for (i = 0; i < values_num; i++)
+		printf (" %s=%lf;;;;", values_names[i], values[i]);
+	return (status_code);
+} /* int do_check_con_percentage */
+
 static int do_check (void)
 {
 	lcc_connection_t *connection;
@@ -507,6 +560,8 @@ static int do_check (void)
 		status =  do_check_con_average (values_num, values, values_names);
 	else if (consolitation_g == CON_SUM)
 		status = do_check_con_sum (values_num, values, values_names);
+	else if (consolitation_g == CON_PERCENTAGE)
+		status = do_check_con_percentage (values_num, values, values_names);
 
 	free (values);
 	if (values_names != NULL)
@@ -559,8 +614,14 @@ int main (int argc, char **argv)
 					consolitation_g = CON_AVERAGE;
 				else if (strcasecmp (optarg, "sum") == 0)
 					consolitation_g = CON_SUM;
+				else if (strcasecmp (optarg, "percentage") == 0)
+					consolitation_g = CON_PERCENTAGE;
 				else
+				{
+					fprintf (stderr, "Unknown consolidation function `%s'.\n",
+							optarg);
 					usage (argv[0]);
+				}
 				break;
 			case 'd':
 			{
@@ -592,7 +653,10 @@ int main (int argc, char **argv)
 
 	if ((socket_file_g == NULL) || (value_string_g == NULL)
 			|| (hostname_g == NULL))
+	{
+		fprintf (stderr, "Missing required arguments.\n");
 		usage (argv[0]);
+	}
 
 	return (do_check ());
 } /* int main */