Rename to ntpd, update README
Sven Mäder committed
Feb 16, 2018 at 16:34 UTC
b43b60582a308d39b0b6b59b2c62aa6898da910e
4 files changed
+36
-41
conf.d/python.d/ntpd.conf
renamed
+4
-9
@@ -1,4 +1,4 @@
1
-# netdata python.d.plugin configuration for ntp
1
+# netdata python.d.plugin configuration for ntpd
2
#
3
# This file is in YaML format. Generally the format is:
4
#
@@ -58,15 +58,10 @@
58
#
59
# host: 'localhost' # the host to query
60
# port: '123' # the UDP port where `ntpd` listens
61
-# peer_filter: '127\..*' # regex to exclude peers by ip or name
61
+# all_peers: no # use `yes` to show peer charts
62
+# peer_filter: '127\..*' # regex to exclude peers
63
# # by default local peers are hidden
63
-# # use `'.*'` to disable the peers submenu.
64
-# peer_names: yes # show peer names instead of ip addresses
65
-# # by default names are shown, if the dns name
66
-# # of the peer matches the local host's fqdn,
67
-# # the matching domain part is hidden.
68
-# # Set to `no` to show ip addresses.
69
-# # Dots `.` are replaced by dashes `-`.
64
+# # use `''` to show all peers.
65
#
66
# ----------------------------------------------------------------------
67
# AUTO-DETECTION JOBS
python.d/README.md
+5
-5
@@ -1472,9 +1472,9 @@ Configuration is not needed.
1472
1473
---
1474
1475
-# ntp
1475
+# ntpd
1476
1477
-Module monitors the system variables of the local `ntpd` daemon, incl. variables of the polled peers using the NTP Control Message Protocol via UDP socket, similar to `ntpq`.
1477
+Module monitors the system variables of the local `ntpd` daemon (optional incl. variables of the polled peers) using the NTP Control Message Protocol via UDP socket, similar to `ntpq`.
1478
1479
**Requirements:**
1480
* Version of `ntpd` must be 2.0+
@@ -1521,8 +1521,8 @@ update_every: 10
1521
1522
host: 'localhost'
1523
port: '123'
1524
-peer_names: yes
1525
-peer_filter: '(127\..*)|(.*\.example\.com)'
1524
+all_peers: yes
1525
+peer_filter: '(127\..*)|(192\.168\..*)'
1526
```
1527
1528
Sample (multiple jobs):
@@ -1537,7 +1537,7 @@ otherhost:
1537
host: 'otherhost'
1538
```
1539
1540
-If no configuration is given, module will attempt to connect to `ntpd` on `::1:123` or `127.0.0.1:123`. Peer names are resolved using reverse dns lookup of the source address. Local peers (127.*) are hidden by default, use `peer_filter: '.*'` to show all. To disable reverse lookup and show ip addresses instead, use `peer_names: no`. Any dots `.` are replaced with dashes `-`.
1540
+If no configuration is given, module will attempt to connect to `ntpd` on `::1:123` or `127.0.0.1:123` and show charts for the systemvars. Use `all_peers: yes` to also show the charts for configured peers. Local peers (127.*) are hidden by default, use `peer_filter: ''` to show all.
1541
1542
---
1543
python.d/ntpd.chart.py
renamed
+23
-23
@@ -1,5 +1,5 @@
1
# -*- coding: utf-8 -*-
2
-# Description: ntp netdata python.d module
2
+# Description: ntpd netdata python.d module
3
# Author: Sven Mäder (rda0)
4
# Author: Ilya Mashchenko (l2isbad)
5
@@ -53,51 +53,51 @@ ORDER = [
53
54
CHARTS = {
55
'sys_offset': {
56
- 'options': [None, 'Combined offset of server relative to this host', 'ms', 'system', 'ntp.sys_offset', 'area'],
56
+ 'options': [None, 'Combined offset of server relative to this host', 'ms', 'system', 'ntpd.sys_offset', 'area'],
57
'lines': [
58
['offset', 'offset', 'absolute', 1, PRECISION]
59
]},
60
'sys_jitter': {
61
- 'options': [None, 'Combined system jitter and clock jitter', 'ms', 'system', 'ntp.sys_jitter', 'line'],
61
+ 'options': [None, 'Combined system jitter and clock jitter', 'ms', 'system', 'ntpd.sys_jitter', 'line'],
62
'lines': [
63
['sys_jitter', 'system', 'absolute', 1, PRECISION],
64
['clk_jitter', 'clock', 'absolute', 1, PRECISION]
65
]},
66
'sys_frequency': {
67
- 'options': [None, 'Frequency offset relative to hardware clock', 'ppm', 'system', 'ntp.sys_frequency', 'area'],
67
+ 'options': [None, 'Frequency offset relative to hardware clock', 'ppm', 'system', 'ntpd.sys_frequency', 'area'],
68
'lines': [
69
['frequency', 'frequency', 'absolute', 1, PRECISION]
70
]},
71
'sys_wander': {
72
- 'options': [None, 'Clock frequency wander', 'ppm', 'system', 'ntp.sys_wander', 'area'],
72
+ 'options': [None, 'Clock frequency wander', 'ppm', 'system', 'ntpd.sys_wander', 'area'],
73
'lines': [
74
['clk_wander', 'clock', 'absolute', 1, PRECISION]
75
]},
76
'sys_rootdelay': {
77
'options': [None, 'Total roundtrip delay to the primary reference clock', 'ms', 'system',
78
- 'ntp.sys_rootdelay', 'area'],
78
+ 'ntpd.sys_rootdelay', 'area'],
79
'lines': [
80
['rootdelay', 'delay', 'absolute', 1, PRECISION]
81
]},
82
'sys_rootdisp': {
83
'options': [None, 'Total root dispersion to the primary reference clock', 'ms', 'system',
84
- 'ntp.sys_rootdisp', 'area'],
84
+ 'ntpd.sys_rootdisp', 'area'],
85
'lines': [
86
['rootdisp', 'dispersion', 'absolute', 1, PRECISION]
87
]},
88
'sys_stratum': {
89
- 'options': [None, 'Stratum (1-15)', '1', 'system', 'ntp.sys_stratum', 'line'],
89
+ 'options': [None, 'Stratum (1-15)', '1', 'system', 'ntpd.sys_stratum', 'line'],
90
'lines': [
91
['stratum', 'stratum', 'absolute', 1, PRECISION]
92
]},
93
'sys_tc': {
94
- 'options': [None, 'Time constant and poll exponent (3-17)', 'log2 s', 'system', 'ntp.sys_tc', 'line'],
94
+ 'options': [None, 'Time constant and poll exponent (3-17)', 'log2 s', 'system', 'ntpd.sys_tc', 'line'],
95
'lines': [
96
['tc', 'current', 'absolute', 1, PRECISION],
97
['mintc', 'minimum', 'absolute', 1, PRECISION]
98
]},
99
'sys_precision': {
100
- 'options': [None, 'Precision', 'log2 s', 'system', 'ntp.sys_precision', 'line'],
100
+ 'options': [None, 'Precision', 'log2 s', 'system', 'ntpd.sys_precision', 'line'],
101
'lines': [
102
['precision', 'precision', 'absolute', 1, PRECISION]
103
]}
@@ -105,57 +105,57 @@ CHARTS = {
105
106
PEER_CHARTS = {
107
'peer_offset': {
108
- 'options': [None, 'Filter offset', 'ms', 'peers', 'ntp.peer_offset', 'line'],
108
+ 'options': [None, 'Filter offset', 'ms', 'peers', 'ntpd.peer_offset', 'line'],
109
'lines': [
110
]},
111
'peer_delay': {
112
- 'options': [None, 'Filter delay', 'ms', 'peers', 'ntp.peer_delay', 'line'],
112
+ 'options': [None, 'Filter delay', 'ms', 'peers', 'ntpd.peer_delay', 'line'],
113
'lines': [
114
]},
115
'peer_dispersion': {
116
- 'options': [None, 'Filter dispersion', 'ms', 'peers', 'ntp.peer_dispersion', 'line'],
116
+ 'options': [None, 'Filter dispersion', 'ms', 'peers', 'ntpd.peer_dispersion', 'line'],
117
'lines': [
118
]},
119
'peer_jitter': {
120
- 'options': [None, 'Filter jitter', 'ms', 'peers', 'ntp.peer_jitter', 'line'],
120
+ 'options': [None, 'Filter jitter', 'ms', 'peers', 'ntpd.peer_jitter', 'line'],
121
'lines': [
122
]},
123
'peer_xleave': {
124
- 'options': [None, 'Interleave delay', 'ms', 'peers', 'ntp.peer_xleave', 'line'],
124
+ 'options': [None, 'Interleave delay', 'ms', 'peers', 'ntpd.peer_xleave', 'line'],
125
'lines': [
126
]},
127
'peer_rootdelay': {
128
'options': [None, 'Total roundtrip delay to the primary reference clock', 'ms', 'peers',
129
- 'ntp.peer_rootdelay', 'line'],
129
+ 'ntpd.peer_rootdelay', 'line'],
130
'lines': [
131
]},
132
'peer_rootdisp': {
133
'options': [None, 'Total root dispersion to the primary reference clock', 'ms', 'peers',
134
- 'ntp.peer_rootdisp', 'line'],
134
+ 'ntpd.peer_rootdisp', 'line'],
135
'lines': [
136
]},
137
'peer_stratum': {
138
- 'options': [None, 'Stratum (1-15)', '1', 'peers', 'ntp.peer_stratum', 'line'],
138
+ 'options': [None, 'Stratum (1-15)', '1', 'peers', 'ntpd.peer_stratum', 'line'],
139
'lines': [
140
]},
141
'peer_hmode': {
142
- 'options': [None, 'Host mode (1-6)', '1', 'peers', 'ntp.peer_hmode', 'line'],
142
+ 'options': [None, 'Host mode (1-6)', '1', 'peers', 'ntpd.peer_hmode', 'line'],
143
'lines': [
144
]},
145
'peer_pmode': {
146
- 'options': [None, 'Peer mode (1-5)', '1', 'peers', 'ntp.peer_pmode', 'line'],
146
+ 'options': [None, 'Peer mode (1-5)', '1', 'peers', 'ntpd.peer_pmode', 'line'],
147
'lines': [
148
]},
149
'peer_hpoll': {
150
- 'options': [None, 'Host poll exponent', 'log2 s', 'peers', 'ntp.peer_hpoll', 'line'],
150
+ 'options': [None, 'Host poll exponent', 'log2 s', 'peers', 'ntpd.peer_hpoll', 'line'],
151
'lines': [
152
]},
153
'peer_ppoll': {
154
- 'options': [None, 'Peer poll exponent', 'log2 s', 'peers', 'ntp.peer_ppoll', 'line'],
154
+ 'options': [None, 'Peer poll exponent', 'log2 s', 'peers', 'ntpd.peer_ppoll', 'line'],
155
'lines': [
156
]},
157
'peer_precision': {
158
- 'options': [None, 'Precision', 'log2 s', 'peers', 'ntp.peer_precision', 'line'],
158
+ 'options': [None, 'Precision', 'log2 s', 'peers', 'ntpd.peer_precision', 'line'],
159
'lines': [
160
]}
161
}
web/dashboard_info.js
+4
-4
@@ -343,8 +343,8 @@ netdataDashboard.menu = {
343
info: 'Provides statistics on the <b><a href="http://ceph.com/">ceph</a></b> cluster server, the open-source distributed storage system.'
344
},
345
346
- 'ntp': {
347
- title: 'NTP',
346
+ 'ntpd': {
347
+ title: 'ntpd',
348
icon: '<i class="fas fa-clock"></i>',
349
info: 'Provides statistics for the internal variables of the Network Time Protocol daemon <b><a href="http://www.ntp.org/">ntpd</a></b> including the configured peers.'
350
}
@@ -495,12 +495,12 @@ netdataDashboard.submenu = {
495
info: 'Detailed information about the status of the Erlang VM that hosts CouchDB. These are intended for advanced users only. High values of the peak message queue (>10e6) generally indicate an overload condition.'
496
},
497
498
- 'ntp.system': {
498
+ 'ntpd.system': {
499
title: 'system',
500
info: 'Statistics of the internal system variables as shown by <a href="http://doc.ntp.org/current-stable/ntpq.html">ntpq</a> (standard NTP query program).'
501
},
502
503
- 'ntp.peers': {
503
+ 'ntpd.peers': {
504
title: 'peers',
505
info: 'Statistics of the peer variables for each peer as shown by <a href="http://doc.ntp.org/current-stable/ntpq.html">ntpq</a> (standard NTP query program).'
506
}