diff options
author | Björn Berg <32747776+MisterMountain@users.noreply.github.com> | 2023-05-02 09:31:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-02 09:31:32 +0200 |
commit | e14f1ad7c35504b97f81b1b33a5533e57c605fc2 (patch) | |
tree | a59d292d928c123ad862776f344918035466c817 /plugins-scripts | |
parent | 3dc677e4f1f990e7b26bc714a02608070379cf85 (diff) | |
parent | a4be133f01a231dc45c98aabed35f96d6f826fd7 (diff) | |
download | monitoring-plugins-e14f1ad7c35504b97f81b1b33a5533e57c605fc2.tar.gz |
Merge branch 'monitoring-plugins:master' into fix_version_return_code
Diffstat (limited to 'plugins-scripts')
-rw-r--r-- | plugins-scripts/check_disk_smb.pl | 2 | ||||
-rwxr-xr-x | plugins-scripts/check_ifoperstatus.pl | 8 | ||||
-rwxr-xr-x | plugins-scripts/check_ifstatus.pl | 2 | ||||
-rwxr-xr-x | plugins-scripts/check_ircd.pl | 4 | ||||
-rwxr-xr-x | plugins-scripts/check_mailq.pl | 2 | ||||
-rwxr-xr-x | plugins-scripts/check_rpc.pl | 2 | ||||
-rwxr-xr-x | plugins-scripts/check_uptime.pl | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl index 15d16340..f4d33a7b 100644 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl | |||
@@ -28,7 +28,7 @@ use FindBin; | |||
28 | use lib "$FindBin::Bin"; | 28 | use lib "$FindBin::Bin"; |
29 | use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); | 29 | use utils qw($TIMEOUT %ERRORS &print_revision &support &usage); |
30 | 30 | ||
31 | # make us session leader which makes all childs exit if we do | 31 | # make us session leader which makes all children exit if we do |
32 | setsid; | 32 | setsid; |
33 | 33 | ||
34 | sub print_help (); | 34 | sub print_help (); |
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index c190ce95..e335cdad 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl | |||
@@ -134,7 +134,7 @@ if (defined $ifdescr || defined $iftype) { | |||
134 | } | 134 | } |
135 | if ($status==0) { | 135 | if ($status==0) { |
136 | $state = "UNKNOWN"; | 136 | $state = "UNKNOWN"; |
137 | printf "$state: could not retrive ifdescr/iftype snmpkey - $status-$snmpkey\n"; | 137 | printf "$state: could not retrieve ifdescr/iftype snmpkey - $status-$snmpkey\n"; |
138 | $session->close; | 138 | $session->close; |
139 | exit $ERRORS{$state}; | 139 | exit $ERRORS{$state}; |
140 | } | 140 | } |
@@ -187,7 +187,7 @@ if (defined $ifXTable) { | |||
187 | $name = $response->{$snmpIfDescr} ; | 187 | $name = $response->{$snmpIfDescr} ; |
188 | } | 188 | } |
189 | 189 | ||
190 | ## if AdminStatus is down - some one made a consious effort to change config | 190 | ## if AdminStatus is down - some one made a conscious effort to change config |
191 | ## | 191 | ## |
192 | if ( not ($response->{$snmpIfAdminStatus} == 1) ) { | 192 | if ( not ($response->{$snmpIfAdminStatus} == 1) ) { |
193 | $answer = "Interface $name (index $snmpkey) is administratively down."; | 193 | $answer = "Interface $name (index $snmpkey) is administratively down."; |
@@ -286,7 +286,7 @@ sub print_usage() { | |||
286 | printf "check_ifoperstatus -k <IF_KEY> -H <HOSTNAME> [-C <community>]\n"; | 286 | printf "check_ifoperstatus -k <IF_KEY> -H <HOSTNAME> [-C <community>]\n"; |
287 | printf "Copyright (C) 2000 Christoph Kron\n"; | 287 | printf "Copyright (C) 2000 Christoph Kron\n"; |
288 | printf "check_ifoperstatus.pl comes with ABSOLUTELY NO WARRANTY\n"; | 288 | printf "check_ifoperstatus.pl comes with ABSOLUTELY NO WARRANTY\n"; |
289 | printf "This programm is licensed under the terms of the "; | 289 | printf "This program is licensed under the terms of the "; |
290 | printf "GNU General Public License\n(check source code for details)\n"; | 290 | printf "GNU General Public License\n(check source code for details)\n"; |
291 | printf "\n\n"; | 291 | printf "\n\n"; |
292 | } | 292 | } |
@@ -424,7 +424,7 @@ sub process_arguments() { | |||
424 | if (defined $seclevel && defined $secname) { | 424 | if (defined $seclevel && defined $secname) { |
425 | $session_opts{'-username'} = $secname; | 425 | $session_opts{'-username'} = $secname; |
426 | 426 | ||
427 | # Must define a security level even though defualt is noAuthNoPriv | 427 | # Must define a security level even though default is noAuthNoPriv |
428 | unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) { | 428 | unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) { |
429 | usage("Must define a valid security level even though default is noAuthNoPriv"); | 429 | usage("Must define a valid security level even though default is noAuthNoPriv"); |
430 | } | 430 | } |
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl index 32984e53..38b87fcc 100755 --- a/plugins-scripts/check_ifstatus.pl +++ b/plugins-scripts/check_ifstatus.pl | |||
@@ -354,7 +354,7 @@ sub process_arguments() { | |||
354 | if (defined $seclevel && defined $secname) { | 354 | if (defined $seclevel && defined $secname) { |
355 | $session_opts{'-username'} = $secname; | 355 | $session_opts{'-username'} = $secname; |
356 | 356 | ||
357 | # Must define a security level even though defualt is noAuthNoPriv | 357 | # Must define a security level even though default is noAuthNoPriv |
358 | unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) { | 358 | unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) { |
359 | usage("Must define a valid security level even though default is noAuthNoPriv"); | 359 | usage("Must define a valid security level even though default is noAuthNoPriv"); |
360 | } | 360 | } |
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index d869ae7b..84f20229 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl | |||
@@ -60,7 +60,7 @@ sub print_usage (); | |||
60 | sub connection ($$$$); | 60 | sub connection ($$$$); |
61 | sub bindRemote ($$); | 61 | sub bindRemote ($$); |
62 | 62 | ||
63 | # -------------------------------------------------------------[ Enviroment ]-- | 63 | # -------------------------------------------------------------[ Environment ]-- |
64 | 64 | ||
65 | $ENV{'PATH'}='@TRUSTED_PATH@'; | 65 | $ENV{'PATH'}='@TRUSTED_PATH@'; |
66 | $ENV{'BASH_ENV'}=''; | 66 | $ENV{'BASH_ENV'}=''; |
@@ -208,7 +208,7 @@ MAIN: | |||
208 | 208 | ||
209 | # Just in case of problems, let's not hang the monitoring system | 209 | # Just in case of problems, let's not hang the monitoring system |
210 | $SIG{'ALRM'} = sub { | 210 | $SIG{'ALRM'} = sub { |
211 | print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n"; | 211 | print "Something is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n"; |
212 | exit $ERRORS{"UNKNOWN"}; | 212 | exit $ERRORS{"UNKNOWN"}; |
213 | }; | 213 | }; |
214 | 214 | ||
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index f02c90fb..49156af3 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl | |||
@@ -4,7 +4,7 @@ | |||
4 | # transmittal. | 4 | # transmittal. |
5 | # | 5 | # |
6 | # Initial version support sendmail's mailq command | 6 | # Initial version support sendmail's mailq command |
7 | # Support for mutiple sendmail queues (Carlos Canau) | 7 | # Support for multiple sendmail queues (Carlos Canau) |
8 | # Support for qmail (Benjamin Schmid) | 8 | # Support for qmail (Benjamin Schmid) |
9 | 9 | ||
10 | # License Information: | 10 | # License Information: |
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl index 47d6e49e..8a56b9fc 100755 --- a/plugins-scripts/check_rpc.pl +++ b/plugins-scripts/check_rpc.pl | |||
@@ -5,7 +5,7 @@ | |||
5 | # usage: | 5 | # usage: |
6 | # check_rpc host service | 6 | # check_rpc host service |
7 | # | 7 | # |
8 | # Check if an rpc serice is registered and running | 8 | # Check if an rpc service is registered and running |
9 | # using rpcinfo - $proto $host $prognum 2>&1 |"; | 9 | # using rpcinfo - $proto $host $prognum 2>&1 |"; |
10 | # | 10 | # |
11 | # Use these hosts.cfg entries as examples | 11 | # Use these hosts.cfg entries as examples |
diff --git a/plugins-scripts/check_uptime.pl b/plugins-scripts/check_uptime.pl index f9542872..d73e40e1 100755 --- a/plugins-scripts/check_uptime.pl +++ b/plugins-scripts/check_uptime.pl | |||
@@ -110,7 +110,7 @@ $pretty_uptime .= sprintf( "%d week%s, ", $weeks, $weeks == 1 ? "" : "s" ) if | |||
110 | $pretty_uptime .= sprintf( "%d day%s, ", $days, $days == 1 ? "" : "s" ) if $days; | 110 | $pretty_uptime .= sprintf( "%d day%s, ", $days, $days == 1 ? "" : "s" ) if $days; |
111 | $pretty_uptime .= sprintf( "%d hour%s, ", $hours, $hours == 1 ? "" : "s" ) if $hours; | 111 | $pretty_uptime .= sprintf( "%d hour%s, ", $hours, $hours == 1 ? "" : "s" ) if $hours; |
112 | $pretty_uptime .= sprintf( "%d minute%s, ", $mins, $mins == 1 ? "" : "s" ) if $mins; | 112 | $pretty_uptime .= sprintf( "%d minute%s, ", $mins, $mins == 1 ? "" : "s" ) if $mins; |
113 | # Replace last occurence of comma with "and" | 113 | # Replace last occurrence of comma with "and" |
114 | $pretty_uptime =~ s/, $/ and /; | 114 | $pretty_uptime =~ s/, $/ and /; |
115 | # Always print the seconds (though it may be 0 seconds) | 115 | # Always print the seconds (though it may be 0 seconds) |
116 | $pretty_uptime .= sprintf( "%d second%s", $secs, $secs == 1 ? "" : "s" ); | 116 | $pretty_uptime .= sprintf( "%d second%s", $secs, $secs == 1 ? "" : "s" ); |