X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd-nagios.c;h=63effd5528bd706a30426d0b22cb557fd91faee9;hb=1d3482c65a00342de681e777c74108734ece0eab;hp=d3369b24a85ce012356a4709a602bee210c64838;hpb=88def4953cea36e3425dfa0a9caa5b5aa52c45f1;p=collectd.git diff --git a/src/collectd-nagios.c b/src/collectd-nagios.c index d3369b24..63effd55 100644 --- a/src/collectd-nagios.c +++ b/src/collectd-nagios.c @@ -1,3 +1,5 @@ +#include "config.h" + #include #include #include @@ -9,18 +11,32 @@ #include /* - * This weird macro cascade forces the glibc to define `NAN'. I don't know - * another way to solve this, so more intelligent solutions are welcome. -octo + * This is copied directly from collectd.h. Make changes there! */ -#ifndef __USE_ISOC99 -# define DISABLE__USE_ISOC99 1 -# define __USE_ISOC99 1 -#endif -#include -#ifdef DISABLE__USE_ISOC99 -# undef DISABLE__USE_ISOC99 -# undef __USE_ISOC99 -#endif +#if NAN_STATIC_DEFAULT +# include +/* #endif NAN_STATIC_DEFAULT*/ +#elif NAN_STATIC_ISOC +# ifndef __USE_ISOC99 +# define DISABLE_ISOC99 1 +# define __USE_ISOC99 1 +# endif /* !defined(__USE_ISOC99) */ +# include +# if DISABLE_ISOC99 +# undef DISABLE_ISOC99 +# undef __USE_ISOC99 +# endif /* DISABLE_ISOC99 */ +/* #endif NAN_STATIC_ISOC */ +#elif NAN_ZERO_ZERO +# include +# 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 @@ -44,6 +60,8 @@ extern int optind, opterr, optopt; static char *socket_file_g = NULL; static char *value_string_g = NULL; +static char *hostname_g = NULL; + static range_t range_critical_g; static range_t range_warning_g; static int consolitation_g = CON_NONE; @@ -110,9 +128,9 @@ int match_range (range_t *range, double value) { int ret = 0; - if ((range->min != NAN) && (range->min > value)) + if (!isnan (range->min) && (range->min > value)) ret = 1; - if ((range->max != NAN) && (range->max < value)) + if (!isnan (range->max) && (range->max < value)) ret = 1; return (((ret - range->invert) == 0) ? 0 : 1); @@ -163,7 +181,7 @@ static int get_values (int *ret_values_num, double **ret_values, return (-1); } - fprintf (fh, "GETVAL %s\n", value_string_g); + fprintf (fh, "GETVAL %s/%s\n", hostname_g, value_string_g); fflush (fh); if (fgets (buffer, sizeof (buffer), fh) == NULL) @@ -232,7 +250,7 @@ static int get_values (int *ret_values_num, double **ret_values, static void usage (const char *name) { - fprintf (stderr, "Usage: %s <-s socket> <-n value_spec> [options]\n" + fprintf (stderr, "Usage: %s <-s socket> <-n value_spec> <-H hostname> [options]\n" "\n" "Valid options are:\n" " -s Path to collectd's UNIX-socket.\n" @@ -242,6 +260,7 @@ static void usage (const char *name) " DSes. By default all DSes are used.\n" " -g Method to use to consolidate several DSes.\n" " Valid arguments are `none', `average' and `sum'\n" + " -H Hostname to query the values for.\n" " -c Critical range\n" " -w Warning range\n" "\n" @@ -265,7 +284,7 @@ int do_check_con_none (int values_num, double *values, char **values_names) for (i = 0; i < values_num; i++) { - if (values[i] == NAN) + if (isnan (values[i])) num_warning++; else if (match_range (&range_critical_g, values[i]) != 0) num_critical++; @@ -275,25 +294,22 @@ int do_check_con_none (int values_num, double *values, char **values_names) num_okay++; } - if ((num_critical != 0) || (values_num == 0)) + printf ("%i critical, %i warning, %i okay", + num_critical, num_warning, num_okay); + if (values_num > 0) { - printf ("CRITICAL: %i critical, %i warning, %i okay\n", - num_critical, num_warning, num_okay); - return (RET_CRITICAL); + printf (" |"); + for (i = 0; i < values_num; i++) + printf (" %s=%lf;;;;", values_names[i], values[i]); } + printf ("\n"); + + if ((num_critical != 0) || (values_num == 0)) + return (RET_CRITICAL); else if (num_warning != 0) - { - printf ("WARNING: %i warning, %i okay\n", - num_warning, num_okay); return (RET_WARNING); - } - else - { - printf ("OKAY: %i okay\n", num_okay); - return (RET_OKAY); - } - return (RET_UNKNOWN); + return (RET_OKAY); } /* int do_check_con_none */ int do_check_con_average (int values_num, double *values, char **values_names) @@ -301,12 +317,13 @@ int do_check_con_average (int values_num, double *values, char **values_names) int i; double total; int total_num; + double average; total = 0.0; total_num = 0; for (i = 0; i < values_num; i++) { - if (values[i] != NAN) + if (!isnan (values[i])) { total += values[i]; total_num++; @@ -314,31 +331,23 @@ int do_check_con_average (int values_num, double *values, char **values_names) } if (total_num == 0) - { - printf ("WARNING: No defined values found\n"); + average = NAN; + else + average = total / total_num; + printf ("%lf average |", average); + for (i = 0; i < values_num; i++) + printf (" %s=%lf;;;;", values_names[i], values[i]); + + if (total_num == 0) return (RET_WARNING); - } - if (match_range (&range_critical_g, total / total_num) != 0) - { - printf ("CRITICAL: Average = %lf\n", - (double) (total / total_num)); + if (isnan (average) + || match_range (&range_critical_g, average)) return (RET_CRITICAL); - } - else if (match_range (&range_warning_g, total / total_num) != 0) - { - printf ("WARNING: Average = %lf\n", - (double) (total / total_num)); + else if (match_range (&range_warning_g, average) != 0) return (RET_WARNING); - } - else - { - printf ("OKAY: Average = %lf\n", - (double) (total / total_num)); - return (RET_OKAY); - } - return (RET_UNKNOWN); + return (RET_OKAY); } /* int do_check_con_average */ int do_check_con_sum (int values_num, double *values, char **values_names) @@ -351,7 +360,7 @@ int do_check_con_sum (int values_num, double *values, char **values_names) total_num = 0; for (i = 0; i < values_num; i++) { - if (values[i] != NAN) + if (!isnan (values[i])) { total += values[i]; total_num++; @@ -403,7 +412,7 @@ int do_check (void) return (do_check_con_sum (values_num, values, values_names)); free (values); - free (values_names); + free (values_names); /* FIXME? */ return (RET_UNKNOWN); } @@ -422,7 +431,7 @@ int main (int argc, char **argv) { int c; - c = getopt (argc, argv, "w:c:s:n:g:d:h"); + c = getopt (argc, argv, "w:c:s:n:H:g:d:h"); if (c < 0) break; @@ -440,6 +449,9 @@ int main (int argc, char **argv) case 'n': value_string_g = optarg; break; + case 'H': + hostname_g = optarg; + break; case 'g': if (strcasecmp (optarg, "none") == 0) consolitation_g = CON_NONE; @@ -478,7 +490,8 @@ int main (int argc, char **argv) } /* switch (c) */ } - if ((socket_file_g == NULL) || (value_string_g == NULL)) + if ((socket_file_g == NULL) || (value_string_g == NULL) + || (hostname_g == NULL)) usage (argv[0]); return (do_check ());