update documentation, add help for --no-check-certificate

This commit is contained in:
Jan Dittberner 2015-02-11 00:05:37 +01:00
parent 46fc29c976
commit 81eb543c8f
2 changed files with 25 additions and 5 deletions

27
README
View file

@ -5,8 +5,10 @@ nagios/icinga check for XMPP
Usage:
------
usage: check_xmpp [-h] -H HOST_ADDRESS [-p PORT] [-s | -c] [-4 | -6]
[--servername SERVERNAME] [--starttls]
usage: check_xmpp [-h] -H HOST_ADDRESS [-p PORT] [--s2s | --c2s] [-4 | -6]
[--servername SERVERNAME] [--starttls] [-w SECONDS]
[-c SECONDS] [--no-check-certificates] [-r CAROOTS]
[--warn-days WARNDAYS] [--crit-days CRITDAYS] [-v]
Check XMPP services
@ -15,10 +17,27 @@ optional arguments:
-H HOST_ADDRESS, --host-address HOST_ADDRESS
host address
-p PORT, --port PORT port
-s, --s2s server to server (s2s)
-c, --c2s client to server (c2s)
--s2s server to server (s2s)
--c2s client to server (c2s)
-4, --ipv4 enforce IPv4
-6, --ipv6 enforce IPv6
--servername SERVERNAME
server name to be used
--starttls check whether the service allows starttls
-w SECONDS, --warning SECONDS
return warning if connection setup takes longer than
SECONDS
-c SECONDS, --critical SECONDS
return critical if connection setup takes longer than
SECONDS
--no-check-certificates
do not check whether the XMPP server's certificate is
valid
-r CAROOTS, --ca-roots CAROOTS
path to a file or directory where CA certifcates can
be found
--warn-days WARNDAYS set state to WARN if the certificate is valid for not
more than the given number of days
--crit-days CRITDAYS set state to CRITICAL if the certificate is valid for
not more than the given number of days
-v, --verbose

View file

@ -400,7 +400,8 @@ def main():
"-c", "--critical", metavar="SECONDS", default='',
help="return critical if connection setup takes longer than SECONDS")
parser.add_argument(
"--no-check-certificates", dest='checkcerts', action='store_false')
"--no-check-certificates", dest='checkcerts', action='store_false',
help="do not check whether the XMPP server's certificate is valid")
parser.add_argument(
"-r", "--ca-roots", dest="caroots",
help="path to a file or directory where CA certifcates can be found")