[Git][NTPsec/ntpsec][master] 3 commits: Make peer and MRU field tables available on the ntpmon page.
Eric S. Raymond
gitlab at mg.gitlab.com
Wed Dec 21 21:52:08 UTC 2016
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
bdf21fac by Eric S. Raymond at 2016-12-21T16:51:49-05:00
Make peer and MRU field tables available on the ntpmon page.
- - - - -
469c8cd2 by Eric S. Raymond at 2016-12-21T16:51:49-05:00
Markup fix.
- - - - -
83794c4a by Eric S. Raymond at 2016-12-21T16:51:49-05:00
Remove obsolete comment, fix typos.
- - - - -
7 changed files:
- + docs/includes/mrufmt.txt
- docs/includes/ntpmon-body.txt
- docs/includes/ntpq-body.txt
- + docs/includes/peerfmt.txt
- docs/leapsmear.txt
- etc/ntp-conf.d/example.conf
- etc/ntp-conf.d/use-no-remote-configuration
Changes:
=====================================
docs/includes/mrufmt.txt
=====================================
--- /dev/null
+++ b/docs/includes/mrufmt.txt
@@ -0,0 +1,26 @@
+// Included twice, from ntpq and ntpmon docs
+[width="100%",cols="<20%,<80%"]
+|=======================================================================
+|Column |Description
+|+lstint+ |
+Interval in s between the receipt of the most recent packet from this
+address and the completion of the retrieval of the MRU list by +ntpq+.
+|+avgint+ |
+Average interval in s between packets from this address.
+|+rstr+ |
+Restriction flags associated with this address. Most are copied
+unchanged from the matching +restrict+ command, however 0x400 (kod)
+and 0x20 (limited) flags are cleared unless the last packet from this
+address triggered a rate control response.
+|+r+ |
+Rate control indicator, either a period, +L+ or +K+ for no rate
+control response, rate limiting by discarding, or rate limiting with a
+KoD response, respectively.
+|+m+ |Packet mode.
+|+v+ |Packet version number.
+|+count+ |Packets received from this address.
+|+rport+ |Source port of last packet from this address.
+|+remote address+|
+DNS name, numeric address, or address followed by claimed DNS name
+which could not be verified in parentheses.
+|=======================================================================
=====================================
docs/includes/ntpmon-body.txt
=====================================
--- a/docs/includes/ntpmon-body.txt
+++ b/docs/includes/ntpmon-body.txt
@@ -35,6 +35,14 @@ commands.
If no hostname is specified on the command line, localhost is monitored.
+Here's a breakdown of the peers display in the top window:
+
+include::peerfmt.txt[]
+
+And the MRU list in the bottom window:
+
+include::mrufmt.txt[]
+
== Commands ==
a:: Change peer display to apeers mode, showing association IDs.
=====================================
docs/includes/ntpq-body.txt
=====================================
--- a/docs/includes/ntpq-body.txt
+++ b/docs/includes/ntpq-body.txt
@@ -290,31 +290,7 @@ The _sortorder_ defaults to +lstint+ and may be any of +addr+,
+count+, +avgint+, +lstint+, or any of those preceded by a minus sign
(hyphen) to reverse the sort order. The output columns are:
+
-[width="100%",cols="<20%,<80%"]
-|=======================================================================
-|Column |Description
-|+lstint+ |
-Interval in s between the receipt of the most recent packet from this
-address and the completion of the retrieval of the MRU list by +ntpq+.
-|+avgint+ |
-Average interval in s between packets from this address.
-|+rstr+ |
-Restriction flags associated with this address. Most are copied
-unchanged from the matching +restrict+ command, however 0x400 (kod)
-and 0x20 (limited) flags are cleared unless the last packet from this
-address triggered a rate control response.
-|+r+ |
-Rate control indicator, either a period, +L+ or +K+ for no rate
-control response, rate limiting by discarding, or rate limiting with a
-KoD response, respectively.
-|+m+ |Packet mode.
-|+v+ |Packet version number.
-|+count+ |Packets received from this address.
-|+rport+ |Source port of last packet from this address.
-|+remote address+|
-DNS name, numeric address, or address followed by claimed DNS name
-which could not be verified in parentheses.
-|=======================================================================
+include::mrufmt.txt
+mreadvar+ 'assocID' 'assocID' [ 'variable_name' [ = 'value'[ ... ]::
+mrv+ 'assocID' 'assocID' [ 'variable_name' [ = 'value'[ ... ]::
@@ -335,27 +311,9 @@ which could not be verified in parentheses.
+peers+::
Display a list of peers in the form
+
-+[tally]remote refid st t when pool reach delay offset jitter+
++tally remote refid st t when pool reach delay offset jitter+
+
-[cols="<20%,<80%"]
-|=======================================================================
-|Variable |Description
-|[+tally+] |
-single-character code indicating current value of the +select+ field
-of the link:decode.html#peer[peer status word]
-|+remote+ |host name (or IP number) of peer
-|+refid+ |association ID or link:decode.html#kiss[kiss code]
-|+st+ |stratum
-|+t+ |
-+u+: unicast or manycast client,
-+l+: local (reference clock), +s+: symmetric (peer), server, +B+: broadcast server,
-|+when+ |sec/min/hr since last received packet
-|+poll+ |poll interval (log~2~ s)
-|+reach+ |reach shift register (octal)
-|+delay+ |roundtrip delay
-|+offset+ |offset of server relative to this host
-|+jitter+ |jitter
-|=======================================================================
+include::peerfmt.txt[]
+apeers+::
Display a list of peers in the form:
=====================================
docs/includes/peerfmt.txt
=====================================
--- /dev/null
+++ b/docs/includes/peerfmt.txt
@@ -0,0 +1,20 @@
+// Included twice, from ntpq and ntpmon docs
+[cols="<20%,<80%"]
+|=======================================================================
+|Variable |Description
+|+tally+ |
+single-character code indicating current value of the +select+ field
+of the link:decode.html#peer[peer status word]
+|+remote+ |host name (or IP number) of peer
+|+refid+ |association ID or link:decode.html#kiss[kiss code]
+|+st+ |stratum
+|+t+ |
++u+: unicast or manycast client,
++l+: local (reference clock), +s+: symmetric (peer), server, +B+: broadcast server,
+|+when+ |sec/min/hr since last received packet
+|+poll+ |poll interval (log~2~ s)
+|+reach+ |reach shift register (octal)
+|+delay+ |roundtrip delay
+|+offset+ |offset of server relative to this host
+|+jitter+ |jitter
+|=======================================================================
=====================================
docs/leapsmear.txt
=====================================
--- a/docs/leapsmear.txt
+++ b/docs/leapsmear.txt
@@ -1,4 +1,4 @@
-= Leap Second Smearing with NTP=
+= Leap Second Smearing with NTP =
By Martin Burnicki
with some edits by Harlan Stenn
=====================================
etc/ntp-conf.d/example.conf
=====================================
--- a/etc/ntp-conf.d/example.conf
+++ b/etc/ntp-conf.d/example.conf
@@ -1,8 +1,8 @@
# This is a complete, usable ntp.conf file assembled from use snippets.
-# To configure as a Statum 1 using GPSD, uncomment the first line.
+# To configure as a Stratum 1 using GPSD, uncomment the first line.
-#includefile use-gpsd-shm # GPSD vis SHM as a local clock source
+#includefile use-gpsd-shm # GPSD via SHM as a local clock source
includefile use-country-pool # Check servers from the US pool
includefile use-no-remote-configuration # Normal security
includefile use-minimal-logging # Declare a drift file and that's it
=====================================
etc/ntp-conf.d/use-no-remote-configuration
=====================================
--- a/etc/ntp-conf.d/use-no-remote-configuration
+++ b/etc/ntp-conf.d/use-no-remote-configuration
@@ -1,7 +1,6 @@
# Exchange time with everybody, but don't allow configuration.
# This is the right security setup for 99% of deployments.
-# Note: due to a bug, restrict nopeer can't be used with the pool keyword.
restrict default kod limited nomodify nopeer noquery
restrict -6 default kod limited nomodify nopeer noquery
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/781aad739e268211d4bcc16c19ed60c9e3e66089...83794c4ab70fa8e2c91f38fa5f81e41be5e7b6d0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161221/fd217bee/attachment.html>
More information about the vc
mailing list