diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/check_linux_raid.pl | 2 | ||||
| -rw-r--r-- | contrib/check_nmap.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl index 77e75f6d..c24b0cd2 100644 --- a/contrib/check_linux_raid.pl +++ b/contrib/check_linux_raid.pl | |||
| @@ -61,7 +61,7 @@ while(defined $nextdev){ | |||
| 61 | if (defined $device) { | 61 | if (defined $device) { |
| 62 | if (/(\[[_U]+\])/) { | 62 | if (/(\[[_U]+\])/) { |
| 63 | $status{$device} = $1; | 63 | $status{$device} = $1; |
| 64 | } elsif (/recovery = (.*?)\s/) { | 64 | } elsif (/recovery =\s+(.*?)\s/) { |
| 65 | $recovery{$device} = $1; | 65 | $recovery{$device} = $1; |
| 66 | ($finish{$device}) = /finish=(.*?min)/; | 66 | ($finish{$device}) = /finish=(.*?min)/; |
| 67 | $device=undef; | 67 | $device=undef; |
diff --git a/contrib/check_nmap.py b/contrib/check_nmap.py index 07f6d7fa..481a62bf 100644 --- a/contrib/check_nmap.py +++ b/contrib/check_nmap.py | |||
| @@ -43,7 +43,7 @@ _version_ = '1.21' | |||
| 43 | # 0.20 2000-07-10 jaclu Initial release | 43 | # 0.20 2000-07-10 jaclu Initial release |
| 44 | 44 | ||
| 45 | 45 | ||
| 46 | import sys, os, string, whrandom | 46 | import sys, os, string, random |
| 47 | 47 | ||
| 48 | import tempfile | 48 | import tempfile |
| 49 | from getopt import getopt | 49 | from getopt import getopt |
| @@ -207,8 +207,7 @@ class CheckNmap: | |||
| 207 | # _if_ two processes in deed get the same tmp-file | 207 | # _if_ two processes in deed get the same tmp-file |
| 208 | # the only result is a normal error message to nagios | 208 | # the only result is a normal error message to nagios |
| 209 | # | 209 | # |
| 210 | r=whrandom.whrandom() | 210 | self.tmp_file=tempfile.mktemp('.%s') % random.randint(0,100000) |
| 211 | self.tmp_file=tempfile.mktemp('.%s')%r.randint(0,100000) | ||
| 212 | if self.debug: | 211 | if self.debug: |
| 213 | print 'Tmpfile is: %s'%self.tmp_file | 212 | print 'Tmpfile is: %s'%self.tmp_file |
| 214 | # | 213 | # |
| @@ -388,7 +387,7 @@ Version: %s""" % _version_ | |||
| 388 | 387 | ||
| 389 | def doc_syntax(): | 388 | def doc_syntax(): |
| 390 | print """ | 389 | print """ |
| 391 | Usage: check_ports [-v|--debug] [-H|--host host] [-V|--version] [-h|--help] | 390 | Usage: check_nmap.py [-v|--debug] [-H|--host host] [-V|--version] [-h|--help] |
| 392 | [-o|--optional port1,port2,port3 ...] [-r|--range range] | 391 | [-o|--optional port1,port2,port3 ...] [-r|--range range] |
| 393 | [-p|--port port1,port2,port3 ...] [-t|--timeout timeout]""" | 392 | [-p|--port port1,port2,port3 ...] [-t|--timeout timeout]""" |
| 394 | 393 | ||
