From 91be9ccd8e4c64e910f33a844e18c6e5e84309aa Mon Sep 17 00:00:00 2001 From: "th.l" <thl-cmk@outlook.com> Date: Tue, 11 Oct 2022 19:53:45 +0200 Subject: [PATCH] update project --- check_ntp.mkp | Bin 6406 -> 6234 bytes checks/check_ntp | 16 +++-------- lib/nagios/plugins/check_ntp | 38 ++++++-------------------- web/plugins/wato/active_checks_ntp.py | 6 ++-- 4 files changed, 15 insertions(+), 45 deletions(-) diff --git a/check_ntp.mkp b/check_ntp.mkp index 4a17d2cd7bac2ac0857b3ba523f1868e99ad1b74..5c42ffd374b0a4e095a66ae6427996d87f8f19af 100644 GIT binary patch delta 6109 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 delta 6277 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"f;hv-9#(&S1AyV}scGNdB zGat|_DIoVrM#VHq;GR@It%crI{=1dM-*}Woi|;~z&iiq401Aaa^zV6_Jp6EvjRJqL zRUUrOUMwWm?4CE(19TTo(ra|a59A&j>><SlTg10X$=^sFj0>zz#NL2ve6&!Q-$O%< zGd)L6V)A3~|2Pd{oY^%jFoy*;3M>V;EvbQ2P-27-QT5Tpp7LE^tV2l^FgvLN$9-BA zN=)#7qxD&~I=R|}xgF^z+F}^VXhcES8BD6Bh9sR55^VmSqpBMuG})2LE;mZ=0vkO( zjgc2jGK^qapDe@aM7$c#$~4T$G`wDh75|{#4En0Z>vk4pcuB8r0jC{6uwC&MO=C6+ zv&=@2kz@B*`{-s?+Eme7v&J-SDCk*p4U_qQ0<CBU9W7CN22UzE%TFpbgQ!%fV=6~j z$I}#~qb3Sb-@Hxx^~-rJ6KSrv(<VGH?&wuCC$1*WcUHKfs_6t?*lc-*!fqzbqWiDO zZ?!V7rLU%lRkD7Cftb(%+j~ub2Ur{5EBlQ_X4m<`kie=BU-1nvB=TT@iv(*hz%}3& vU|<PN;c{mv&Vur_VJZk;2&rrn1KE?o3M!M(3KI?R7lQu-Z57;U0Pp|+MU65F diff --git a/checks/check_ntp b/checks/check_ntp index d90573d..49240be 100644 --- a/checks/check_ntp +++ b/checks/check_ntp @@ -32,24 +32,16 @@ def check_ntp_arguments(params): args.append(f'--state_not_synchronized {params["state_not_synchronized"]}') if 'offset_levels' in params: - args.append(f'--offset{str(params["offset_levels"]).strip("(").strip(")")}') - # args.append(f'--offset_warn {params["offset_levels"][0]}') - # args.append(f'--offset_crit {params["offset_levels"][1]}') + args.append(f'--offset{params["offset_levels"][0]},{params["offset_levels"][1]}') if 'stratum_levels' in params: - args.append(f'--stratum {params["stratum_levels"].strip("(").strip(")")}') - # args.append(f'--stratum_warn {params["stratum_levels"][0]}') - # args.append(f'--stratum_crit {params["stratum_levels"][1]}') + args.append(f'--stratum {params["stratum_levels"][0]},{params["stratum_levels"][1]}') if 'dispersion_levels' in params: - args.append(f'--dispersion {params["dispersion_levels"].strip("(").strip(")")}') - # args.append(f'--dispersion_warn {params["dispersion_levels"][0]}') - # args.append(f'--dispersion_crit {params["dispersion_levels"][1]}') + args.append(f'--dispersion {params["dispersion_levels"][0]},{params["dispersion_levels"][1]}') if 'delay_levels' in params: - args.append(f'--delay {params["dispersion_levels"].strip("(").strip(")")}') - # args.append(f'--delay_warn {params["dispersion_levels"][0]}') - # args.append(f'--delay_crit {params["dispersion_levels"][1]}') + args.append(f'--delay {params["dispersion_levels"][0]},{params["dispersion_levels"][1]}') return args diff --git a/lib/nagios/plugins/check_ntp b/lib/nagios/plugins/check_ntp index 36fc5c0..f9e6e93 100755 --- a/lib/nagios/plugins/check_ntp +++ b/lib/nagios/plugins/check_ntp @@ -9,20 +9,23 @@ # Date : 2022-10-04 # File : active_checks_ntp.py # +# Active check to monitor NTP servers. +# +# +# from typing import Optional, Sequence, Tuple from ipaddress import IPv4Address import sys import argparse +from time import ctime, gmtime, strftime + no_ntplib=False try: from ntplib import NTPClient, NTPStats except ModuleNotFoundError: no_ntplib=True -from time import ctime, gmtime, strftime - - _ntp_leap = { 0: 'no warning', 1: 'last minute of the day has 61 seconds', @@ -122,7 +125,7 @@ def _ntp_decode_ref_id(stratum: int, ref_id: int): return ref_id -def parse_arguments(argv: Sequence[str]) -> argparse.Namespace: +def parse_arguments(argv: Sequence[str]): # -> argparse.Namespace # is not available if ntplib is not installed def _warn_crit(arg: str) -> Optional[Tuple[int, int]]: arg = arg.strip('(').strip(')').split(',') warn, crit = arg @@ -136,7 +139,7 @@ def parse_arguments(argv: Sequence[str]) -> argparse.Namespace: parser = argparse.ArgumentParser( formatter_class=argparse.ArgumentDefaultsHelpFormatter, epilog='Add WARN,CRIT levels separated by comma without brackets, like this: "--offset 200,500".' - 'To use this check plugin you need to install the python ntplib in your CMK python environment.' + 'To use this check plugin you need to install the python "ntplib" in your CMK python environment.' ) parser.add_argument( '--server', '-s', required=True, @@ -153,31 +156,6 @@ def parse_arguments(argv: Sequence[str]) -> argparse.Namespace: parser.add_argument( '--state_not_synchronized', type=int, default=2, choices=[0, 1, 2, 3], help='Monitoring state if not synchronized.') - # parser.add_argument( - # '--stratum_warn', type=int, default=10, - # help='WARN at Stratum, use value > 16 to disable.') - # parser.add_argument( - # '--stratum_crit', type=int, default=15, - # help='CRIT at Stratum, use value > 16 to disable.') - # parser.add_argument( - # '--offset_warn', type=int, default=200, - # help='WARN at offset in ms.') - # parser.add_argument( - # '--offset_crit', type=int, default=500, - # help='CRIT at offset in ms.') - # parser.add_argument( - # '--delay_warn', type=int, default=200, - # help='WARN at delay in ms.') - # parser.add_argument( - # '--delay_crit', type=int, default=500, - # help='CRIT at delay in ms.') - # parser.add_argument( - # '--dispersion_warn', type=int, default=3, - # help='WARN at root dispersion in seconds.') - # parser.add_argument( - # '--dispersion_crit', type=int, default=5, - # help='CRIT at root dispersion in seconds.') - parser.add_argument( '--stratum', type=_warn_crit, default=(10, 15), help='WARN,CRIT levels for stratum. Use values > 16 to disable.') diff --git a/web/plugins/wato/active_checks_ntp.py b/web/plugins/wato/active_checks_ntp.py index 0164e07..42d2184 100644 --- a/web/plugins/wato/active_checks_ntp.py +++ b/web/plugins/wato/active_checks_ntp.py @@ -102,7 +102,7 @@ def _valuespec_active_checks_ntp(): ), Integer( title=_('Critical at'), - default_value=14, + default_value=15, maxvalue=18, help=_( 'The stratum (\'distance\' to the reference clock) at which the check gets critical.'), @@ -111,9 +111,9 @@ def _valuespec_active_checks_ntp(): )), ('offset_levels', Tuple( - title=_('Time Offset in ms'), + title=_('max. offset in ms'), help=_('Mean offset in the times reported between this local host and the remote peer or server.' - 'Note: The levels will also be used as lower levels.'), + 'Note: This levels will also be used as lower levels.'), elements=[ Integer( title=_('Warning at'), -- GitLab