Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-22 02:51:03 +00:00
Code Issues Releases Wiki Activity

chrony_status: fix fetch output for serverstats graph

Browse source 
Was not expecting #1255 to be merged so quickly 🤪. Now the new
serverstats graph has been fully tested and actually works 😉.

This change also doesn't needlessly convert all values to floating
point numbers, instead provides the values to munin in the same format
as they are originally output by chrony.

Also this adds some server stats found in chrony 4.0 (but still works
with 3.4 and probably earlier).
This commit is contained in:
Kenyon Ralph 2021-11-14 16:19:43 -08:00 • committed by Lars Kruse
parent 357c358669
commit 0866add183
1 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

48
plugins/chrony/chrony_status
View file

@ -46,6 +46,24 @@ import os
import subprocess import subprocess
import sys import sys
GRAPHS = [
'stratum',
'systime',
'delay',
'frequency',
'serverstats',
]
SERVERSTATS = [
'received',
'dropped',
'command_received',
'command_dropped',
'client_log_records_dropped',
'nts_ke_connections_accepted',
'nts_ke_connections_dropped',
'authenticated_packets',
]
FIELDS = { FIELDS = {
'stratum': 'Stratum', 'stratum': 'Stratum',
@ -57,6 +75,9 @@ FIELDS = {
'command_received': 'Command packets received', 'command_received': 'Command packets received',
'command_dropped': 'Command packets dropped', 'command_dropped': 'Command packets dropped',
'client_log_records_dropped': 'Client log records dropped', 'client_log_records_dropped': 'Client log records dropped',
'nts_ke_connections_accepted': 'NTS-KE connections accepted',
'nts_ke_connections_dropped': 'NTS-KE connections dropped',
'authenticated_packets': 'Authenticated NTP packets',
} }
@ -76,9 +97,9 @@ def get_values():
for label in FIELDS: for label in FIELDS:
for line in lines: for line in lines:
if line.startswith(FIELDS[label]): if line.startswith(FIELDS[label]):
value = float(line.split(':', 1)[1].split()[0]) value = line.split(':', 1)[1].split()[0]
if ' slow' in line: if ' slow' in line:
value = -value value = -float(value)
ret[label] = value ret[label] = value
return ret return ret
@ -137,6 +158,15 @@ def config():
print('client_log_records_dropped.label Client log records dropped') print('client_log_records_dropped.label Client log records dropped')
print('client_log_records_dropped.type DERIVE') print('client_log_records_dropped.type DERIVE')
print('client_log_records_dropped.min 0') print('client_log_records_dropped.min 0')
print('nts_ke_connections_accepted.label NTS-KE connections accepted')
print('nts_ke_connections_accepted.type DERIVE')
print('nts_ke_connections_accepted.min 0')
print('nts_ke_connections_dropped.label NTS-KE connections dropped')
print('nts_ke_connections_dropped.type DERIVE')
print('nts_ke_connections_dropped.min 0')
print('authenticated_packets.label Authenticated NTP packets')
print('authenticated_packets.type DERIVE')
print('authenticated_packets.min 0')
if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1': if os.environ.get('MUNIN_CAP_DIRTYCONFIG') == '1':
fetch() fetch()
@ -145,12 +175,16 @@ def config():
def fetch(): def fetch():
"""Print values.""" """Print values."""
values = get_values() values = get_values()
for key in FIELDS: for graph in GRAPHS:
print('multigraph chrony_{}'.format(key)) print('multigraph chrony_{}'.format(graph))
if key == 'stratum' and values[key] == 0: if graph == 'stratum' and values[graph] == 0:
print('{}.value U'.format(key)) print('{}.value U'.format(graph))
elif graph == 'serverstats':
for stat in SERVERSTATS:
if stat in values:
print('{}.value {}'.format(stat, values[stat]))
else: else:
print('{}.value {:.8f}'.format(key, values[key])) print('{}.value {}'.format(graph, values[graph]))
if __name__ == '__main__': if __name__ == '__main__':