From f41cf1ed5798afa98c48d92b05ac92dfd4fa6f3e Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Wed, 29 Oct 2014 23:10:43 +0100 Subject: [PATCH] Add verbose mode to make it more usefull as an icinga2 plugin --- dnssec-check | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dnssec-check b/dnssec-check index 25a45ac..a14508d 100755 --- a/dnssec-check +++ b/dnssec-check @@ -57,17 +57,24 @@ def main(): parser.add_option("-c", "--critical-days", action="store", type=int, dest="crit", default=2, help="minimum remaining validity in days before a warning is issued") - + parser.add_option("-v", action="store_true", dest="verbose", default=False) + parser.add_option("-q", action="store_false", dest="verbose") opts, _args = parser.parse_args() + if not opts.names: + parser.error("needs at least one DNS name") + resolver = ub_ctx() resolver.add_ta_file(opts.ancor) encoding = sys.getfilesystemencoding() final = 0 - for name in opts.names: - result = check_dnssec_expire(resolver, idn2dname(name.decode(encoding)), + for name in opts.names: + name = idn2dname(name.decode(encoding)) + result = check_dnssec_expire(resolver, name, timedelta(opts.warn), timedelta(opts.crit)) + if result == 0 and opts.verbose: + print("OK %s" % name) if result == 2: final = 2 elif result == 1 and final != 2: -- 2.39.2