diff options
Diffstat (limited to 'plugins-scripts')
-rw-r--r-- | plugins-scripts/Makefile.am | 2 | ||||
-rwxr-xr-x | plugins-scripts/check_breeze.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_disk_smb.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_file_age.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_flexlm.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_ifoperstatus.pl | 7 | ||||
-rwxr-xr-x | plugins-scripts/check_ifstatus.pl | 9 | ||||
-rwxr-xr-x | plugins-scripts/check_ircd.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_mailq.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_mssql.pl | 3 | ||||
-rwxr-xr-x | plugins-scripts/check_netdns.pl | 14 | ||||
-rwxr-xr-x | plugins-scripts/check_ntp.pl | 471 | ||||
-rwxr-xr-x | plugins-scripts/check_rpc.pl | 5 | ||||
-rwxr-xr-x | plugins-scripts/check_wave.pl | 5 | ||||
-rw-r--r-- | plugins-scripts/t/check_rpc.t | 2 |
15 files changed, 35 insertions, 513 deletions
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am index 794a34f..ea65aed 100644 --- a/plugins-scripts/Makefile.am +++ b/plugins-scripts/Makefile.am | |||
@@ -36,6 +36,8 @@ TESTS = @SCRIPT_TEST@ | |||
36 | test: | 36 | test: |
37 | perl -I $(top_builddir) -I $(top_srcdir) ../test.pl | 37 | perl -I $(top_builddir) -I $(top_srcdir) ../test.pl |
38 | perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test | 38 | perl -I $(top_builddir) -I $(top_srcdir) ../test.pl t/utils.t # utils.t is excluded from above, so manually ask to test |
39 | for SCRIPT in *.pl; do perl -wc $$SCRIPT || exit 1; done | ||
40 | set -e; for SCRIPT in *.sh; do sh -n $$SCRIPT || exit 1; done | ||
39 | 41 | ||
40 | test-debug: | 42 | test-debug: |
41 | NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl | 43 | NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl |
diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl index 1a3aceb..05b9920 100755 --- a/plugins-scripts/check_breeze.pl +++ b/plugins-scripts/check_breeze.pl | |||
@@ -6,7 +6,6 @@ use Getopt::Long; | |||
6 | use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME); | 6 | use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME); |
7 | use FindBin; | 7 | use FindBin; |
8 | use lib "$FindBin::Bin"; | 8 | use lib "$FindBin::Bin"; |
9 | use lib '@libexecdir@'; | ||
10 | use utils qw(%ERRORS &print_revision &support &usage); | 9 | use utils qw(%ERRORS &print_revision &support &usage); |
11 | 10 | ||
12 | $PROGNAME = "check_breeze"; | 11 | $PROGNAME = "check_breeze"; |
@@ -29,10 +28,10 @@ GetOptions | |||
29 | 28 | ||
30 | if ($opt_V) { | 29 | if ($opt_V) { |
31 | print_revision($PROGNAME,'@NP_VERSION@'); | 30 | print_revision($PROGNAME,'@NP_VERSION@'); |
32 | exit $ERRORS{'OK'}; | 31 | exit $ERRORS{'UNKNOWN'}; |
33 | } | 32 | } |
34 | 33 | ||
35 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 34 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
36 | 35 | ||
37 | ($opt_H) || usage("Host name/address not specified\n"); | 36 | ($opt_H) || usage("Host name/address not specified\n"); |
38 | my $host = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); | 37 | my $host = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); |
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index 4805434..9899226 100755 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl | |||
@@ -26,7 +26,6 @@ use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_ | |||
26 | use vars qw($PROGNAME); | 26 | use vars qw($PROGNAME); |
27 | use FindBin; | 27 | use FindBin; |
28 | use lib "$FindBin::Bin"; | 28 | use lib "$FindBin::Bin"; |
29 | use lib '@libexecdir@'; | ||
30 | use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); | 29 | use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); |
31 | 30 | ||
32 | sub print_help (); | 31 | sub print_help (); |
@@ -55,10 +54,10 @@ GetOptions | |||
55 | 54 | ||
56 | if ($opt_V) { | 55 | if ($opt_V) { |
57 | print_revision($PROGNAME,'@NP_VERSION@'); #' | 56 | print_revision($PROGNAME,'@NP_VERSION@'); #' |
58 | exit $ERRORS{'OK'}; | 57 | exit $ERRORS{'UNKNOWN'}; |
59 | } | 58 | } |
60 | 59 | ||
61 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 60 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
62 | 61 | ||
63 | my $smbclient = $utils::PATH_TO_SMBCLIENT; | 62 | my $smbclient = $utils::PATH_TO_SMBCLIENT; |
64 | $smbclient || usage("check requires smbclient, smbclient not set\n"); | 63 | $smbclient || usage("check requires smbclient, smbclient not set\n"); |
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl index 4415fdf..56b8e97 100755 --- a/plugins-scripts/check_file_age.pl +++ b/plugins-scripts/check_file_age.pl | |||
@@ -27,7 +27,6 @@ use File::stat; | |||
27 | use vars qw($PROGNAME); | 27 | use vars qw($PROGNAME); |
28 | use FindBin; | 28 | use FindBin; |
29 | use lib "$FindBin::Bin"; | 29 | use lib "$FindBin::Bin"; |
30 | use lib '@libexecdir@'; | ||
31 | use utils qw (%ERRORS &print_revision &support); | 30 | use utils qw (%ERRORS &print_revision &support); |
32 | 31 | ||
33 | sub print_help (); | 32 | sub print_help (); |
@@ -61,12 +60,12 @@ GetOptions( | |||
61 | 60 | ||
62 | if ($opt_V) { | 61 | if ($opt_V) { |
63 | print_revision($PROGNAME, '@NP_VERSION@'); | 62 | print_revision($PROGNAME, '@NP_VERSION@'); |
64 | exit $ERRORS{'OK'}; | 63 | exit $ERRORS{'UNKNOWN'}; |
65 | } | 64 | } |
66 | 65 | ||
67 | if ($opt_h) { | 66 | if ($opt_h) { |
68 | print_help(); | 67 | print_help(); |
69 | exit $ERRORS{'OK'}; | 68 | exit $ERRORS{'UNKNOWN'}; |
70 | } | 69 | } |
71 | 70 | ||
72 | $opt_f = shift unless ($opt_f); | 71 | $opt_f = shift unless ($opt_f); |
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl index 5f3ed59..e3fe296 100755 --- a/plugins-scripts/check_flexlm.pl +++ b/plugins-scripts/check_flexlm.pl | |||
@@ -37,7 +37,6 @@ use Getopt::Long; | |||
37 | use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME); | 37 | use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME); |
38 | use FindBin; | 38 | use FindBin; |
39 | use lib "$FindBin::Bin"; | 39 | use lib "$FindBin::Bin"; |
40 | use lib '@libexecdir@'; | ||
41 | use utils qw(%ERRORS &print_revision &support &usage); | 40 | use utils qw(%ERRORS &print_revision &support &usage); |
42 | 41 | ||
43 | $PROGNAME="check_flexlm"; | 42 | $PROGNAME="check_flexlm"; |
@@ -59,7 +58,7 @@ GetOptions | |||
59 | 58 | ||
60 | if ($opt_V) { | 59 | if ($opt_V) { |
61 | print_revision($PROGNAME,'@NP_VERSION@'); | 60 | print_revision($PROGNAME,'@NP_VERSION@'); |
62 | exit $ERRORS{'OK'}; | 61 | exit $ERRORS{'UNKNOWN'}; |
63 | } | 62 | } |
64 | 63 | ||
65 | unless (defined $opt_t) { | 64 | unless (defined $opt_t) { |
@@ -67,7 +66,7 @@ unless (defined $opt_t) { | |||
67 | } | 66 | } |
68 | 67 | ||
69 | 68 | ||
70 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 69 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
71 | 70 | ||
72 | unless (defined $opt_F) { | 71 | unless (defined $opt_F) { |
73 | print "Missing license.dat file\n"; | 72 | print "Missing license.dat file\n"; |
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index cf2c7b5..3eed4bc 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl | |||
@@ -37,7 +37,6 @@ use POSIX; | |||
37 | use strict; | 37 | use strict; |
38 | use FindBin; | 38 | use FindBin; |
39 | use lib "$FindBin::Bin"; | 39 | use lib "$FindBin::Bin"; |
40 | use lib '@libexecdir@'; | ||
41 | use utils qw($TIMEOUT %ERRORS &print_revision &support); | 40 | use utils qw($TIMEOUT %ERRORS &print_revision &support); |
42 | 41 | ||
43 | use Net::SNMP; | 42 | use Net::SNMP; |
@@ -368,17 +367,17 @@ sub process_arguments() { | |||
368 | 367 | ||
369 | if ($status == 0){ | 368 | if ($status == 0){ |
370 | print_help(); | 369 | print_help(); |
371 | exit $ERRORS{'OK'}; | 370 | exit $ERRORS{'UNKNOWN'}; |
372 | } | 371 | } |
373 | 372 | ||
374 | if ($opt_V) { | 373 | if ($opt_V) { |
375 | print_revision($PROGNAME,'@NP_VERSION@'); | 374 | print_revision($PROGNAME,'@NP_VERSION@'); |
376 | exit $ERRORS{'OK'}; | 375 | exit $ERRORS{'UNKNOWN'}; |
377 | } | 376 | } |
378 | 377 | ||
379 | if ($opt_h) { | 378 | if ($opt_h) { |
380 | print_help(); | 379 | print_help(); |
381 | exit $ERRORS{'OK'}; | 380 | exit $ERRORS{'UNKNOWN'}; |
382 | } | 381 | } |
383 | 382 | ||
384 | if (! utils::is_hostname($hostname)){ | 383 | if (! utils::is_hostname($hostname)){ |
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl index 6ec71d1..9f2f7c3 100755 --- a/plugins-scripts/check_ifstatus.pl +++ b/plugins-scripts/check_ifstatus.pl | |||
@@ -35,7 +35,6 @@ use POSIX; | |||
35 | use strict; | 35 | use strict; |
36 | use FindBin; | 36 | use FindBin; |
37 | use lib "$FindBin::Bin"; | 37 | use lib "$FindBin::Bin"; |
38 | use lib '@libexecdir@'; | ||
39 | use utils qw($TIMEOUT %ERRORS &print_revision &support); | 38 | use utils qw($TIMEOUT %ERRORS &print_revision &support); |
40 | 39 | ||
41 | use Net::SNMP; | 40 | use Net::SNMP; |
@@ -120,7 +119,7 @@ $status = process_arguments(); | |||
120 | if ($status != 0) | 119 | if ($status != 0) |
121 | { | 120 | { |
122 | print_help() ; | 121 | print_help() ; |
123 | exit $ERRORS{'OK'}; | 122 | exit $ERRORS{'UNKNOWN'}; |
124 | } | 123 | } |
125 | 124 | ||
126 | 125 | ||
@@ -314,17 +313,17 @@ sub process_arguments() { | |||
314 | 313 | ||
315 | if ($status == 0){ | 314 | if ($status == 0){ |
316 | print_help(); | 315 | print_help(); |
317 | exit $ERRORS{'OK'}; | 316 | exit $ERRORS{'UNKNOWN'}; |
318 | } | 317 | } |
319 | 318 | ||
320 | if ($opt_V) { | 319 | if ($opt_V) { |
321 | print_revision($PROGNAME,'@NP_VERSION@'); | 320 | print_revision($PROGNAME,'@NP_VERSION@'); |
322 | exit $ERRORS{'OK'}; | 321 | exit $ERRORS{'UNKNOWN'}; |
323 | } | 322 | } |
324 | 323 | ||
325 | if ($opt_h) { | 324 | if ($opt_h) { |
326 | print_help(); | 325 | print_help(); |
327 | exit $ERRORS{'OK'}; | 326 | exit $ERRORS{'UNKNOWN'}; |
328 | } | 327 | } |
329 | 328 | ||
330 | unless (defined $timeout) { | 329 | unless (defined $timeout) { |
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index 6d40cf5..22d21c2 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl | |||
@@ -51,7 +51,6 @@ use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose); | |||
51 | use vars qw($PROGNAME); | 51 | use vars qw($PROGNAME); |
52 | use FindBin; | 52 | use FindBin; |
53 | use lib "$FindBin::Bin"; | 53 | use lib "$FindBin::Bin"; |
54 | use lib '@libexecdir@'; | ||
55 | use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); | 54 | use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); |
56 | 55 | ||
57 | # ----------------------------------------------------[ Function Prototypes ]-- | 56 | # ----------------------------------------------------[ Function Prototypes ]-- |
@@ -182,10 +181,10 @@ MAIN: | |||
182 | 181 | ||
183 | if ($opt_V) { | 182 | if ($opt_V) { |
184 | print_revision($PROGNAME,'@NP_VERSION@'); | 183 | print_revision($PROGNAME,'@NP_VERSION@'); |
185 | exit $ERRORS{'OK'}; | 184 | exit $ERRORS{'UNKNOWN'}; |
186 | } | 185 | } |
187 | 186 | ||
188 | if ($opt_h) {print_help(); exit $ERRORS{'OK'};} | 187 | if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};} |
189 | 188 | ||
190 | ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n"); | 189 | ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n"); |
191 | my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); | 190 | my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/); |
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index 417c4bf..32f498d 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl | |||
@@ -33,7 +33,6 @@ use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s | |||
33 | %srcdomains %dstdomains); | 33 | %srcdomains %dstdomains); |
34 | use FindBin; | 34 | use FindBin; |
35 | use lib "$FindBin::Bin"; | 35 | use lib "$FindBin::Bin"; |
36 | use lib '@libexecdir@'; | ||
37 | use utils qw(%ERRORS &print_revision &support &usage ); | 36 | use utils qw(%ERRORS &print_revision &support &usage ); |
38 | 37 | ||
39 | my ($sudo); | 38 | my ($sudo); |
@@ -574,12 +573,12 @@ sub process_arguments(){ | |||
574 | 573 | ||
575 | if ($opt_V) { | 574 | if ($opt_V) { |
576 | print_revision($PROGNAME,'@NP_VERSION@'); | 575 | print_revision($PROGNAME,'@NP_VERSION@'); |
577 | exit $ERRORS{'OK'}; | 576 | exit $ERRORS{'UNKNOWN'}; |
578 | } | 577 | } |
579 | 578 | ||
580 | if ($opt_h) { | 579 | if ($opt_h) { |
581 | print_help(); | 580 | print_help(); |
582 | exit $ERRORS{'OK'}; | 581 | exit $ERRORS{'UNKNOWN'}; |
583 | } | 582 | } |
584 | 583 | ||
585 | if (defined $opt_v ){ | 584 | if (defined $opt_v ){ |
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl index 1f38788..fb3952d 100755 --- a/plugins-scripts/check_mssql.pl +++ b/plugins-scripts/check_mssql.pl | |||
@@ -31,7 +31,6 @@ use DBD::Sybase; | |||
31 | use Getopt::Long; | 31 | use Getopt::Long; |
32 | use FindBin; | 32 | use FindBin; |
33 | use lib "$FindBin::Bin"; | 33 | use lib "$FindBin::Bin"; |
34 | use lib '@libexecdir@'; | ||
35 | use utils qw($TIMEOUT %ERRORS &print_revision &support); | 34 | use utils qw($TIMEOUT %ERRORS &print_revision &support); |
36 | use strict; | 35 | use strict; |
37 | 36 | ||
@@ -131,7 +130,7 @@ sub process_arguments { | |||
131 | 130 | ||
132 | if (defined $opt_V) { | 131 | if (defined $opt_V) { |
133 | print_revision($PROGNAME,'@NP_VERSION@'); | 132 | print_revision($PROGNAME,'@NP_VERSION@'); |
134 | exit $ERRORS{'OK'}; | 133 | exit $ERRORS{'UNKNOWN'}; |
135 | } | 134 | } |
136 | 135 | ||
137 | syntax("Help:") if ($help); | 136 | syntax("Help:") if ($help); |
diff --git a/plugins-scripts/check_netdns.pl b/plugins-scripts/check_netdns.pl index 59c81a9..38538e5 100755 --- a/plugins-scripts/check_netdns.pl +++ b/plugins-scripts/check_netdns.pl | |||
@@ -29,10 +29,12 @@ use Getopt::Long; | |||
29 | use Net::DNS; | 29 | use Net::DNS; |
30 | use FindBin; | 30 | use FindBin; |
31 | use lib "$FindBin::Bin"; | 31 | use lib "$FindBin::Bin"; |
32 | use lib '@libexecdir@'; | 32 | use utils; |
33 | use utils ; | ||
34 | 33 | ||
35 | my $PROGNAME = "check_netdns"; | 34 | my $PROGNAME = "check_netdns"; |
35 | sub print_help (); | ||
36 | sub print_version(); | ||
37 | sub print_usage (); | ||
36 | 38 | ||
37 | $ENV{'PATH'}='@TRUSTED_PATH@'; | 39 | $ENV{'PATH'}='@TRUSTED_PATH@'; |
38 | $ENV{'BASH_ENV'}=''; | 40 | $ENV{'BASH_ENV'}=''; |
@@ -44,12 +46,12 @@ GetOptions("V" => $opt_V, "version" => $opt_V, | |||
44 | "t=i" => $opt_t, "timeout=i" => $opt_t, | 46 | "t=i" => $opt_t, "timeout=i" => $opt_t, |
45 | "s=s" => $opt_s, "server=s" => $opt_s, | 47 | "s=s" => $opt_s, "server=s" => $opt_s, |
46 | "H=s" => $opt_H, "hostname=s" => $opt_H); | 48 | "H=s" => $opt_H, "hostname=s" => $opt_H); |
47 | 49 | ||
48 | # -h means display verbose help screen | 50 | # -h means display verbose help screen |
49 | if($opt_h){ print_help(); exit 0; } | 51 | if($opt_h){ print_help(); exit 3; } |
50 | 52 | ||
51 | # -V means display version number | 53 | # -V means display version number |
52 | if ($opt_V) { print_version(); exit 0; } | 54 | if ($opt_V) { print_version(); exit 3; } |
53 | 55 | ||
54 | # -H means host name | 56 | # -H means host name |
55 | $opt_H = shift unless ($opt_H); | 57 | $opt_H = shift unless ($opt_H); |
@@ -71,7 +73,7 @@ if ($opt_s) { | |||
71 | $server = $1; | 73 | $server = $1; |
72 | } else { | 74 | } else { |
73 | print "$opt_s is not a valid host name"; | 75 | print "$opt_s is not a valid host name"; |
74 | exit -1; | 76 | exit 3; |
75 | } | 77 | } |
76 | } | 78 | } |
77 | 79 | ||
diff --git a/plugins-scripts/check_ntp.pl b/plugins-scripts/check_ntp.pl deleted file mode 100755 index 13da939..0000000 --- a/plugins-scripts/check_ntp.pl +++ /dev/null | |||
@@ -1,471 +0,0 @@ | |||
1 | #!@PERL@ -w | ||
2 | # | ||
3 | # (c)1999 Ian Cass, Knowledge Matters Ltd. | ||
4 | # Read the GNU copyright stuff for all the legalese | ||
5 | # | ||
6 | # Check NTP time servers plugin. This plugin requires the ntpdate utility to | ||
7 | # be installed on the system, however since it's part of the ntp suite, you | ||
8 | # should already have it installed. | ||
9 | # | ||
10 | # | ||
11 | # Nothing clever done in this program - its a very simple bare basics hack to | ||
12 | # get the job done. | ||
13 | # | ||
14 | # Things to do... | ||
15 | # check @words[9] for time differences greater than +/- x secs & return a | ||
16 | # warning. | ||
17 | # | ||
18 | # (c) 1999 Mark Jewiss, Knowledge Matters Limited | ||
19 | # 22-9-1999, 12:45 | ||
20 | # | ||
21 | # Modified script to accept 2 parameters or set defaults. | ||
22 | # Now issues warning or critical alert is time difference is greater than the | ||
23 | # time passed. | ||
24 | # | ||
25 | # These changes have not been tested completely due to the unavailability of a | ||
26 | # server with the incorrect time. | ||
27 | # | ||
28 | # (c) 1999 Bo Kersey, VirCIO - Managed Server Solutions <bo@vircio.com> | ||
29 | # 22-10-99, 12:17 | ||
30 | # | ||
31 | # Modified the script to give useage if no parameters are input. | ||
32 | # | ||
33 | # Modified the script to check for negative as well as positive | ||
34 | # time differences. | ||
35 | # | ||
36 | # Modified the script to work with ntpdate 3-5.93e Wed Apr 14 20:23:03 EDT 1999 | ||
37 | # | ||
38 | # Modified the script to work with ntpdate's that return adjust or offset... | ||
39 | # | ||
40 | # | ||
41 | # Script modified 2000 June 01 by William Pietri <william@bianca.com> | ||
42 | # | ||
43 | # Modified script to handle weird cases: | ||
44 | # o NTP server doesn't respond (e.g., has died) | ||
45 | # o Server has correct time but isn't suitable synchronization | ||
46 | # source. This happens while starting up and if contact | ||
47 | # with master has been lost. | ||
48 | # | ||
49 | # Modifed to run under Embedded Perl (sghosh@users.sf.net) | ||
50 | # - combined logic some blocks together.. | ||
51 | # | ||
52 | # Added ntpdate check for stratum 16 desynch peer (James Fidell) Feb 03, 2003 | ||
53 | # | ||
54 | # ntpdate - offset is in seconds | ||
55 | # changed ntpdc to ntpq - jitter/dispersion is in milliseconds | ||
56 | # | ||
57 | # Patch for for regex for stratum1 refid. | ||
58 | |||
59 | require 5.004; | ||
60 | use POSIX; | ||
61 | use strict; | ||
62 | use Getopt::Long; | ||
63 | use vars qw($opt_V $opt_h $opt_H $opt_t $opt_w $opt_c $opt_O $opt_j $opt_k $verbose $PROGNAME $def_jitter $ipv4 $ipv6); | ||
64 | use lib utils.pm; | ||
65 | use utils qw($TIMEOUT %ERRORS &print_revision &support); | ||
66 | |||
67 | $PROGNAME="check_ntp"; | ||
68 | |||
69 | sub print_help (); | ||
70 | sub print_usage (); | ||
71 | |||
72 | $ENV{'PATH'}='@TRUSTED_PATH@'; | ||
73 | $ENV{'BASH_ENV'}=''; | ||
74 | $ENV{'ENV'}=''; | ||
75 | |||
76 | # defaults in sec | ||
77 | my $DEFAULT_OFFSET_WARN = 60; # 1 minute | ||
78 | my $DEFAULT_OFFSET_CRIT = 120; # 2 minutes | ||
79 | # default in millisec | ||
80 | my $DEFAULT_JITTER_WARN = 5000; # 5 sec | ||
81 | my $DEFAULT_JITTER_CRIT = 10000; # 10 sec | ||
82 | |||
83 | Getopt::Long::Configure('bundling'); | ||
84 | GetOptions | ||
85 | ("V" => \$opt_V, "version" => \$opt_V, | ||
86 | "h" => \$opt_h, "help" => \$opt_h, | ||
87 | "v" => \$verbose, "verbose" => \$verbose, | ||
88 | "4" => \$ipv4, "use-ipv4" => \$ipv4, | ||
89 | "6" => \$ipv6, "use-ipv6" => \$ipv6, | ||
90 | "w=f" => \$opt_w, "warning=f" => \$opt_w, # offset|adjust warning if above this number | ||
91 | "c=f" => \$opt_c, "critical=f" => \$opt_c, # offset|adjust critical if above this number | ||
92 | "O" => \$opt_O, "zero-offset" => \$opt_O, # zero-offset bad | ||
93 | "j=s" => \$opt_j, "jwarn=i" => \$opt_j, # jitter warning if above this number | ||
94 | "k=s" => \$opt_k, "jcrit=i" => \$opt_k, # jitter critical if above this number | ||
95 | "t=s" => \$opt_t, "timeout=i" => \$opt_t, | ||
96 | "H=s" => \$opt_H, "hostname=s" => \$opt_H); | ||
97 | |||
98 | if ($opt_V) { | ||
99 | print_revision($PROGNAME,'@NP_VERSION@'); | ||
100 | exit $ERRORS{'OK'}; | ||
101 | } | ||
102 | |||
103 | if ($opt_h) { | ||
104 | print_help(); | ||
105 | exit $ERRORS{'OK'}; | ||
106 | } | ||
107 | |||
108 | # jitter test params specified | ||
109 | if (defined $opt_j || defined $opt_k ) { | ||
110 | $def_jitter = 1; | ||
111 | } | ||
112 | |||
113 | $opt_H = shift unless ($opt_H); | ||
114 | my $host = $1 if ($opt_H && $opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0-9]+(\.[a-zA-Z][-a-zA-Z0-9]+)*)$/); | ||
115 | unless ($host) { | ||
116 | print "No target host specified\n"; | ||
117 | print_usage(); | ||
118 | exit $ERRORS{'UNKNOWN'}; | ||
119 | } | ||
120 | |||
121 | my ($timeout, $owarn, $ocrit, $jwarn, $jcrit); | ||
122 | |||
123 | $timeout = $TIMEOUT; | ||
124 | ($opt_t) && ($opt_t =~ /^([0-9]+)$/) && ($timeout = $1); | ||
125 | |||
126 | $owarn = $DEFAULT_OFFSET_WARN; | ||
127 | ($opt_w) && ($opt_w =~ /^([0-9.]+)$/) && ($owarn = $1); | ||
128 | |||
129 | $ocrit = $DEFAULT_OFFSET_CRIT; | ||
130 | ($opt_c) && ($opt_c =~ /^([0-9.]+)$/) && ($ocrit = $1); | ||
131 | |||
132 | $jwarn = $DEFAULT_JITTER_WARN; | ||
133 | ($opt_j) && ($opt_j =~ /^([0-9]+)$/) && ($jwarn = $1); | ||
134 | |||
135 | $jcrit = $DEFAULT_JITTER_CRIT; | ||
136 | ($opt_k) && ($opt_k =~ /^([0-9]+)$/) && ($jcrit = $1); | ||
137 | |||
138 | if ($ocrit < $owarn ) { | ||
139 | print "Critical offset should be larger than warning offset\n"; | ||
140 | print_usage(); | ||
141 | exit $ERRORS{"UNKNOWN"}; | ||
142 | } | ||
143 | |||
144 | if ($def_jitter) { | ||
145 | if ($opt_k < $opt_j) { | ||
146 | print "Critical jitter should be larger than warning jitter\n"; | ||
147 | print_usage(); | ||
148 | exit $ERRORS{'UNKNOWN'}; | ||
149 | } | ||
150 | } | ||
151 | |||
152 | |||
153 | my $stratum = -1; | ||
154 | my $ignoreret = 0; | ||
155 | my $answer = undef; | ||
156 | my $offset = undef; | ||
157 | my $jitter = undef; | ||
158 | my $syspeer = undef; | ||
159 | my $candidate = 0; | ||
160 | my @candidates; | ||
161 | my $msg; # first line of output to print if format is invalid | ||
162 | |||
163 | my $state = $ERRORS{'UNKNOWN'}; | ||
164 | my $ntpdate_error = $ERRORS{'UNKNOWN'}; | ||
165 | my $jitter_error = $ERRORS{'UNKNOWN'}; | ||
166 | |||
167 | # some systems don't have a proper ntpq (migrated from ntpdc) | ||
168 | my $have_ntpq = undef; | ||
169 | if ($utils::PATH_TO_NTPQ && -x $utils::PATH_TO_NTPQ ) { | ||
170 | $have_ntpq = 1; | ||
171 | }else{ | ||
172 | $have_ntpq = 0; | ||
173 | } | ||
174 | |||
175 | # Just in case of problems, let's not hang Nagios | ||
176 | $SIG{'ALRM'} = sub { | ||
177 | print ("ERROR: No response from ntp server (alarm)\n"); | ||
178 | exit $ERRORS{"UNKNOWN"}; | ||
179 | }; | ||
180 | alarm($timeout); | ||
181 | |||
182 | # Determine protocol to be used for ntpdate and ntpq | ||
183 | my $ntpdate = $utils::PATH_TO_NTPDATE; | ||
184 | my $ntpq = $utils::PATH_TO_NTPQ; | ||
185 | if ($ipv4) { | ||
186 | $ntpdate .= " -4"; | ||
187 | $ntpq .= " -4"; | ||
188 | } | ||
189 | elsif ($ipv6) { | ||
190 | $ntpdate .= " -6"; | ||
191 | $ntpq .= " -6"; | ||
192 | } | ||
193 | # else don't use any flags | ||
194 | |||
195 | ### | ||
196 | ### | ||
197 | ### First, check ntpdate | ||
198 | ### | ||
199 | ### | ||
200 | |||
201 | if (!open (NTPDATE, $ntpdate . " -q $host 2>&1 |")) { | ||
202 | print "Could not open $ntpdate: $!\n"; | ||
203 | exit $ERRORS{"UNKNOWN"}; | ||
204 | } | ||
205 | |||
206 | my $out; | ||
207 | while (<NTPDATE>) { | ||
208 | #print if ($verbose); # noop | ||
209 | $msg = $_ unless ($msg); | ||
210 | $out .= "$_ "; | ||
211 | |||
212 | if (/stratum\s(\d+)/) { | ||
213 | $stratum = $1; | ||
214 | } | ||
215 | |||
216 | if (/(offset|adjust)\s+([-.\d]+)/i) { | ||
217 | $offset = $2; | ||
218 | |||
219 | # An offset of 0.000000 with an error is probably bogus. Actually, | ||
220 | # it's probably always bogus, but let's be paranoid here. | ||
221 | # Has been reported that 0.0000 happens in a production environment | ||
222 | # on Solaris 8 so this check should be taken out - SF tracker 1150777 | ||
223 | if (defined $opt_O ) { | ||
224 | if ($offset == 0) { undef $offset;} | ||
225 | } | ||
226 | |||
227 | $ntpdate_error = defined ($offset) ? $ERRORS{"OK"} : $ERRORS{"CRITICAL"}; | ||
228 | print "ntperr = $ntpdate_error \n" if $verbose; | ||
229 | |||
230 | } | ||
231 | |||
232 | if (/no server suitable for synchronization found/) { | ||
233 | if ($stratum == 16) { | ||
234 | $ntpdate_error = $ERRORS{"WARNING"}; | ||
235 | $msg = "Desynchronized peer server found"; | ||
236 | $ignoreret=1; | ||
237 | } | ||
238 | else { | ||
239 | $ntpdate_error = $ERRORS{"CRITICAL"}; | ||
240 | $msg = "No suitable peer server found - "; | ||
241 | } | ||
242 | } | ||
243 | |||
244 | } | ||
245 | $out =~ s/\n//g; | ||
246 | close (NTPDATE) || | ||
247 | die $! ? "$out - Error closing $ntpdate pipe: $!" | ||
248 | : "$out - Exit status: $? from $ntpdate\n"; | ||
249 | |||
250 | # declare an error if we also get a non-zero return code from ntpdate | ||
251 | # unless already set to critical | ||
252 | if ( $? && !$ignoreret ) { | ||
253 | print "stderr = $? : $! \n" if $verbose; | ||
254 | $ntpdate_error = $ntpdate_error == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"UNKNOWN"} ; | ||
255 | print "ntperr = $ntpdate_error : $!\n" if $verbose; | ||
256 | } | ||
257 | |||
258 | ### | ||
259 | ### | ||
260 | ### Then scan xntpq/ntpq if it exists | ||
261 | ### and look in the 11th column for jitter | ||
262 | ### | ||
263 | # Field 1: Tally Code ( Space, 'x','.','-','+','#','*','o') | ||
264 | # Only match for '*' which implies sys.peer | ||
265 | # or 'o' which implies pps.peer | ||
266 | # If both exist, the last one is picked. | ||
267 | # Field 2: address of the remote peer | ||
268 | # Field 3: Refid of the clock (0.0.0.0 if unknown, WWWV/PPS/GPS/ACTS/USNO/PCS/... if Stratum1) | ||
269 | # Field 4: stratum (0-15) | ||
270 | # Field 5: Type of the peer: local (l), unicast (u), multicast (m) | ||
271 | # broadcast (b); not sure about multicast/broadcast | ||
272 | # Field 6: last packet receive (in seconds) | ||
273 | # Field 7: polling interval | ||
274 | # Field 8: reachability resgister (octal) | ||
275 | # Field 9: delay | ||
276 | # Field 10: offset | ||
277 | # Field 11: dispersion/jitter | ||
278 | # | ||
279 | # According to bug 773588 Some solaris xntpd implementations seemto match on | ||
280 | # "#" even though the docs say it exceeds maximum distance. Providing patch | ||
281 | # here which will generate a warining. | ||
282 | |||
283 | if ($have_ntpq) { | ||
284 | |||
285 | if ( open(NTPQ, $ntpq . " -np $host 2>&1 |") ) { | ||
286 | while (<NTPQ>) { | ||
287 | print $_ if ($verbose); | ||
288 | if ( /timed out/ ){ | ||
289 | $have_ntpq = 0 ; | ||
290 | last ; | ||
291 | } | ||
292 | # number of candidates on <host> for sys.peer | ||
293 | if (/^(\*|\+|\#|o])/) { | ||
294 | ++$candidate; | ||
295 | push (@candidates, $_); | ||
296 | print "Candidate count= $candidate\n" if ($verbose); | ||
297 | } | ||
298 | |||
299 | # match sys.peer or pps.peer | ||
300 | if (/^(\*|o)(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/) { | ||
301 | $syspeer = $2; | ||
302 | $stratum = $4; | ||
303 | $jitter = $11; | ||
304 | print "match $_ \n" if $verbose; | ||
305 | if ($jitter > $jcrit) { | ||
306 | print "Jitter_crit = $11 :$jcrit\n" if ($verbose); | ||
307 | $jitter_error = $ERRORS{'CRITICAL'}; | ||
308 | } elsif ($jitter > $jwarn ) { | ||
309 | print "Jitter_warn = $11 :$jwarn\n" if ($verbose); | ||
310 | $jitter_error = $ERRORS{'WARNING'}; | ||
311 | } else { | ||
312 | $jitter_error = $ERRORS{'OK'}; | ||
313 | } | ||
314 | } else { | ||
315 | print "No match!\n" if $verbose; | ||
316 | $jitter = '(not parsed)'; | ||
317 | } | ||
318 | |||
319 | } | ||
320 | close NTPQ || | ||
321 | die $! ? "Error closing $ntpq pipe: $!" | ||
322 | : "Exit status: $? from $ntpq\n"; | ||
323 | |||
324 | # if we did not match sys.peer or pps.peer but matched # candidates only | ||
325 | # generate a warning | ||
326 | # based on bug id 773588 | ||
327 | unless (defined $syspeer) { | ||
328 | if ($#candidates >=0) { | ||
329 | foreach my $c (@candidates) { | ||
330 | $c =~ /^(#)([-0-9.\s]+)\s+([-0-9A-Za-z_().]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/; | ||
331 | $syspeer = $2; | ||
332 | $stratum = $4; | ||
333 | $jitter = $11; | ||
334 | print "candidate match $c \n" if $verbose; | ||
335 | if ($jitter > $jcrit) { | ||
336 | print "Candidate match - Jitter_crit = $11 :$jcrit\n" if ($verbose); | ||
337 | $jitter_error = $ERRORS{'CRITICAL'}; | ||
338 | }elsif ($jitter > $jwarn ) { | ||
339 | print "Candidate match - Jitter_warn = $11 :$jwarn \n" if ($verbose); | ||
340 | $jitter_error = $ERRORS{'WARNING'}; | ||
341 | } else { | ||
342 | $jitter_error = $ERRORS{'WARNING'}; | ||
343 | } | ||
344 | } | ||
345 | |||
346 | } | ||
347 | } | ||
348 | } | ||
349 | } | ||
350 | |||
351 | |||
352 | if ($ntpdate_error != $ERRORS{'OK'}) { | ||
353 | $state = $ntpdate_error; | ||
354 | if ($ntpdate_error == $ERRORS{'WARNING'} ) { | ||
355 | $answer = $msg; | ||
356 | } | ||
357 | else { | ||
358 | $answer = $msg . "Server for ntp probably down"; | ||
359 | } | ||
360 | |||
361 | if (defined($offset) && abs($offset) > $ocrit) { | ||
362 | $state = $ERRORS{'CRITICAL'}; | ||
363 | $answer = "Server Error and offset $offset sec > +/- $ocrit sec"; | ||
364 | } elsif (defined($offset) && abs($offset) > $owarn) { | ||
365 | $answer = "Server error and offset $offset sec > +/- $owarn sec"; | ||
366 | } elsif (defined($jitter) && abs($jitter) > $jcrit) { | ||
367 | $answer = "Server error and jitter $jitter msec > +/- $jcrit msec"; | ||
368 | } elsif (defined($jitter) && abs($jitter) > $jwarn) { | ||
369 | $answer = "Server error and jitter $jitter msec > +/- $jwarn msec"; | ||
370 | } | ||
371 | |||
372 | } elsif ($have_ntpq && $jitter_error != $ERRORS{'OK'}) { | ||
373 | $state = $jitter_error; | ||
374 | $answer = "Jitter $jitter too high"; | ||
375 | if (defined($offset) && abs($offset) > $ocrit) { | ||
376 | $state = $ERRORS{'CRITICAL'}; | ||
377 | $answer = "Jitter error and offset $offset sec > +/- $ocrit sec"; | ||
378 | } elsif (defined($offset) && abs($offset) > $owarn) { | ||
379 | $answer = "Jitter error and offset $offset sec > +/- $owarn sec"; | ||
380 | } elsif (defined($jitter) && abs($jitter) > $jcrit) { | ||
381 | $answer = "Jitter error and jitter $jitter msec > +/- $jcrit msec"; | ||
382 | } elsif (defined($jitter) && abs($jitter) > $jwarn) { | ||
383 | $answer = "Jitter error and jitter $jitter msec > +/- $jwarn msec"; | ||
384 | } | ||
385 | |||
386 | } elsif( !$have_ntpq ) { # no errors from ntpdate and no ntpq or ntpq timed out | ||
387 | if (abs($offset) > $ocrit) { | ||
388 | $state = $ERRORS{'CRITICAL'}; | ||
389 | $answer = "Offset $offset sec > +/- $ocrit sec"; | ||
390 | } elsif (abs($offset) > $owarn) { | ||
391 | $state = $ERRORS{'WARNING'}; | ||
392 | $answer = "Offset $offset sec > +/- $owarn sec"; | ||
393 | } elsif (( abs($offset) > $owarn) && $def_jitter ) { | ||
394 | $state = $ERRORS{'WARNING'}; | ||
395 | $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out"; | ||
396 | } elsif ( $def_jitter ) { | ||
397 | $state = $ERRORS{'WARNING'}; | ||
398 | $answer = "Offset $offset secs, ntpq timed out"; | ||
399 | } else{ | ||
400 | $state = $ERRORS{'OK'}; | ||
401 | $answer = "Offset $offset secs"; | ||
402 | } | ||
403 | |||
404 | |||
405 | |||
406 | } else { # no errors from ntpdate or ntpq | ||
407 | if (abs($offset) > $ocrit) { | ||
408 | $state = $ERRORS{'CRITICAL'}; | ||
409 | $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec"; | ||
410 | } elsif (abs($jitter) > $jcrit ) { | ||
411 | $state = $ERRORS{'CRITICAL'}; | ||
412 | $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec"; | ||
413 | } elsif (abs($offset) > $owarn) { | ||
414 | $state = $ERRORS{'WARNING'}; | ||
415 | $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec"; | ||
416 | } elsif (abs($jitter) > $jwarn ) { | ||
417 | $state = $ERRORS{'WARNING'}; | ||
418 | $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec"; | ||
419 | |||
420 | } else { | ||
421 | $state = $ERRORS{'OK'}; | ||
422 | $answer = "Offset $offset secs, jitter $jitter msec, peer is stratum $stratum"; | ||
423 | } | ||
424 | |||
425 | } | ||
426 | |||
427 | foreach my $key (keys %ERRORS) { | ||
428 | if ($state==$ERRORS{$key}) { | ||
429 | # print ("NTP $key: $answer"); | ||
430 | print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . ",peer_stratum=$stratum\n"); | ||
431 | last; | ||
432 | } | ||
433 | } | ||
434 | exit $state; | ||
435 | |||
436 | |||
437 | #### | ||
438 | #### subs | ||
439 | |||
440 | sub print_usage () { | ||
441 | print "Usage: $PROGNAME -H <host> [-46] [-O] [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n"; | ||
442 | } | ||
443 | |||
444 | sub print_help () { | ||
445 | print_revision($PROGNAME,'@NP_VERSION@'); | ||
446 | print "Copyright (c) 2003 Bo Kersey/Karl DeBisschop\n"; | ||
447 | print "\n"; | ||
448 | print_usage(); | ||
449 | print " | ||
450 | Checks the local timestamp offset versus <host> with ntpdate | ||
451 | Checks the jitter/dispersion of clock signal between <host> and its sys.peer with ntpq\n | ||
452 | -O (--zero-offset) | ||
453 | A zero offset on \"ntpdate\" will generate a CRITICAL.\n | ||
454 | -w (--warning) | ||
455 | Clock offset in seconds at which a warning message will be generated.\n Defaults to $DEFAULT_OFFSET_WARN. | ||
456 | -c (--critical) | ||
457 | Clock offset in seconds at which a critical message will be generated.\n Defaults to $DEFAULT_OFFSET_CRIT. | ||
458 | -j (--jwarn) | ||
459 | Clock jitter in milliseconds at which a warning message will be generated.\n Defaults to $DEFAULT_JITTER_WARN. | ||
460 | -k (--jcrit) | ||
461 | Clock jitter in milliseconds at which a critical message will be generated.\n Defaults to $DEFAULT_JITTER_CRIT. | ||
462 | |||
463 | If jitter/dispersion is specified with -j or -k and ntpq times out, then a | ||
464 | warning is returned.\n | ||
465 | -4 (--use-ipv4) | ||
466 | Use IPv4 connection | ||
467 | -6 (--use-ipv6) | ||
468 | Use IPv6 connection | ||
469 | \n"; | ||
470 | support(); | ||
471 | } | ||
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl index b1c6147..47d6e49 100755 --- a/plugins-scripts/check_rpc.pl +++ b/plugins-scripts/check_rpc.pl | |||
@@ -22,7 +22,6 @@ | |||
22 | use strict; | 22 | use strict; |
23 | use FindBin; | 23 | use FindBin; |
24 | use lib "$FindBin::Bin"; | 24 | use lib "$FindBin::Bin"; |
25 | use lib '@libexecdir@'; | ||
26 | use utils qw($TIMEOUT %ERRORS &print_revision &support); | 25 | use utils qw($TIMEOUT %ERRORS &print_revision &support); |
27 | use vars qw($PROGNAME); | 26 | use vars qw($PROGNAME); |
28 | my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state); | 27 | my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state); |
@@ -64,12 +63,12 @@ GetOptions( | |||
64 | ); | 63 | ); |
65 | 64 | ||
66 | # -h means display verbose help screen | 65 | # -h means display verbose help screen |
67 | if ($opt_h) { print_help(); exit $ERRORS{'OK'}; } | 66 | if ($opt_h) { print_help(); exit $ERRORS{'UNKNOWN'}; } |
68 | 67 | ||
69 | # -V means display version number | 68 | # -V means display version number |
70 | if ($opt_V) { | 69 | if ($opt_V) { |
71 | print_revision($PROGNAME,'@NP_VERSION@'); | 70 | print_revision($PROGNAME,'@NP_VERSION@'); |
72 | exit $ERRORS{'OK'}; | 71 | exit $ERRORS{'UNKNOWN'}; |
73 | } | 72 | } |
74 | 73 | ||
75 | # Hash containing all RPC program names and numbers | 74 | # Hash containing all RPC program names and numbers |
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl index ee0fda4..41e15f5 100755 --- a/plugins-scripts/check_wave.pl +++ b/plugins-scripts/check_wave.pl | |||
@@ -5,7 +5,6 @@ | |||
5 | use strict; | 5 | use strict; |
6 | use FindBin; | 6 | use FindBin; |
7 | use lib "$FindBin::Bin"; | 7 | use lib "$FindBin::Bin"; |
8 | use lib '@libexecdir@'; | ||
9 | use utils qw($TIMEOUT %ERRORS &print_revision &support); | 8 | use utils qw($TIMEOUT %ERRORS &print_revision &support); |
10 | use vars qw($PROGNAME); | 9 | use vars qw($PROGNAME); |
11 | use Getopt::Long; | 10 | use Getopt::Long; |
@@ -32,12 +31,12 @@ GetOptions | |||
32 | 31 | ||
33 | if ($opt_V) { | 32 | if ($opt_V) { |
34 | print_revision($PROGNAME,'@NP_VERSION@'); #' | 33 | print_revision($PROGNAME,'@NP_VERSION@'); #' |
35 | exit $ERRORS{'OK'}; | 34 | exit $ERRORS{'UNKNOWN'}; |
36 | } | 35 | } |
37 | 36 | ||
38 | if ($opt_h) { | 37 | if ($opt_h) { |
39 | print_help(); | 38 | print_help(); |
40 | exit $ERRORS{'OK'}; | 39 | exit $ERRORS{'UNKNOWN'}; |
41 | } | 40 | } |
42 | 41 | ||
43 | $opt_H = shift unless ($opt_H); | 42 | $opt_H = shift unless ($opt_H); |
diff --git a/plugins-scripts/t/check_rpc.t b/plugins-scripts/t/check_rpc.t index be8ae2f..c58f7bf 100644 --- a/plugins-scripts/t/check_rpc.t +++ b/plugins-scripts/t/check_rpc.t | |||
@@ -15,7 +15,7 @@ my $successOutput = '/^check_rpc/'; | |||
15 | 15 | ||
16 | my $t; | 16 | my $t; |
17 | 17 | ||
18 | $t += checkCmd( "./check_rpc -V", 0, $successOutput ); | 18 | $t += checkCmd( "./check_rpc -V", 3, $successOutput ); |
19 | 19 | ||
20 | exit(0) if defined($Test::Harness::VERSION); | 20 | exit(0) if defined($Test::Harness::VERSION); |
21 | exit($tests - $t); | 21 | exit($tests - $t); |