diff --git a/snippets/ntp/test02.py b/snippets/ntp/test02.py index 3abc13f..ec7f505 100644 --- a/snippets/ntp/test02.py +++ b/snippets/ntp/test02.py @@ -6,16 +6,9 @@ session.openhost('localhost') peers = session.readstat() -k = [] - -l = session.readvar(0) -print(f"{l=}") -k.append(list(dict(l).keys())) for p in peers: - l = session.readvar(p.associd) - print(f"{p.associd}: {dict(l)}") - k.append(list(dict(l).keys())) - -print(json.dumps(k, indent=4)) + vars = session.readvar(p.associd, ['srchost', 'srcadr', 'refid', 'stratum', 'hmode', 'rec', 'reach', 'hpoll', 'ppoll', 'delay', 'offset', 'jitter']) + peerSelectStatus = " x.-+#*o"[(session.rstatus >>8) & 0x07] + print(f"{p.associd}, {peerSelectStatus}, {session.rstatus:04x}: {dict(vars)}") diff --git a/src/agentx-ntpsec.py b/src/agentx-ntpsec.py index dec8432..e5a5193 100644 --- a/src/agentx-ntpsec.py +++ b/src/agentx-ntpsec.py @@ -38,6 +38,24 @@ def int_scale1M(x): def pass_value(x): return x +# sysinfo +# sysinfo = ( +# ("peeradr", "system peer: ", NTP_ADP), +# ("peermode", "system peer mode: ", NTP_MODE), +# ("leap", "leap indicator: ", NTP_2BIT), +# ("stratum", "stratum: ", NTP_INT), +# ("precision", "log2 precision: ", NTP_INT), +# ("rootdelay", "root delay: ", NTP_FLOAT), +# ("rootdisp", "root dispersion: ", NTP_FLOAT), +# ("rootdist", "root distance ", NTP_FLOAT), +# ("refid", "reference ID: ", NTP_STR), +# ("reftime", "reference time: ", NTP_LFP), +# ("sys_jitter", "system jitter: ", NTP_FLOAT), +# ("clk_jitter", "clock jitter: ", NTP_FLOAT), +# ("clk_wander", "clock wander: ", NTP_FLOAT), +# ("authdelay", "symm. auth. delay:", NTP_FLOAT), +# ) + LOCAL_SERVER_KEYS = [ ['leap', pyagentx.TYPE_INTEGER, pass_value], ['stratum', pyagentx.TYPE_INTEGER, pass_value], @@ -63,6 +81,32 @@ LOCAL_SERVER_KEYS = [ ['mintc', pyagentx.TYPE_INTEGER, pass_value] ] +# sysstats +# sysstats = ( +# ("ss_uptime", "uptime: ", NTP_UPTIME), +# ("ss_numctlreq", "control requests: ", NTP_INT), +# ) +# sysstats2 = ( +# ("ss_reset", "sysstats reset: ", NTP_UPTIME), +# ("ss_received", "packets received: ", NTP_PACKETS), +# ("ss_thisver", "current version: ", NTP_PACKETS), +# ("ss_oldver", "older version: ", NTP_PACKETS), +# ("ss_ver1", "NTPv1 total: ", NTP_PACKETS), +# ("ss_ver1client","NTPv1 clients: ", NTP_PACKETS), +# ("ss_ver1zero", "NTPv1 mode0: ", NTP_PACKETS), +# ("ss_ver1symm", "NTPv1 symm act: ", NTP_PACKETS), +# ("ss_badformat", "bad length or format: ", NTP_PACKETS), +# ("ss_badauth", "authentication failed:", NTP_PACKETS), +# ("ss_declined", "declined: ", NTP_PACKETS), +# ("ss_restricted","restricted: ", NTP_PACKETS), +# ("ss_limited", "rate limited: ", NTP_PACKETS), +# ("ss_kodsent", "KoD responses: ", NTP_PACKETS), +# ("ss_processed", "processed for time: ", NTP_PACKETS), +# ) +# + + + PEER_KEYS = [ ['srcadr', pyagentx.TYPE_OCTETSTRING, pass_value], ['srcport', pyagentx.TYPE_INTEGER, pass_value],