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

Merge pull request #784 from munin-monitoring/revert-701-master

Browse source 
Revert "python3 dependency fixed (backport)"
This commit is contained in:
Kenyon Ralph 2016-12-14 22:13:03 -08:00 • committed by GitHub
commit 0e486d4453
1 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

62
plugins/time/ntp_packets
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
# -*- python -*-
# This plugin graphs the rate of sent, received, ignored, and dropped
@ -13,7 +13,7 @@
# Symlink this plugin into the node's plugins directory (like
# /etc/munin/plugins).
#
# Copyright [c] 2013 Kenyon Ralph <kenyon@kenyonralph.com>
# Copyright © 2013 Kenyon Ralph <kenyon@kenyonralph.com>
#
# This program is free software. It comes without any warranty, to the
# extent permitted by applicable law. You can redistribute it and/or
@ -31,48 +31,48 @@ import os
import subprocess
import sys
if len(sys.argv) == 2 and sys.argv[1] == u'config':
print u'graph_title NTP packets'
print u'graph_vlabel Packets/${graph_period} received(-)/sent(+)'
print u'graph_info This graph shows the packet rates of this ntpd. Ignored and dropped packets are graphed as positive values.'
print u'graph_category time'
print u'received.label Received'
print u'received.type DERIVE'
print u'received.graph no'
print u'received.min 0'
print u'sent.label Rx/Tx'
print u'sent.type DERIVE'
print u'sent.negative received'
print u'sent.min 0'
print u'dropped.label Dropped'
print u'dropped.type DERIVE'
print u'dropped.min 0'
print u'ignored.label Ignored'
print u'ignored.type DERIVE'
print u'ignored.min 0'
if len(sys.argv) == 2 and sys.argv[1] == 'config':
print('graph_title NTP traffic')
print('graph_vlabel Packets/${graph_period} received(-)/sent(+)')
print('graph_info This graph shows the packet rates of this ntpd. Ignored and dropped packets are graphed as positive values.')
print('graph_category time')
print('received.label Received')
print('received.type DERIVE')
print('received.graph no')
print('received.min 0')
print('sent.label Rx/Tx')
print('sent.type DERIVE')
print('sent.negative received')
print('sent.min 0')
print('dropped.label Dropped')
print('dropped.type DERIVE')
print('dropped.min 0')
print('ignored.label Ignored')
print('ignored.type DERIVE')
print('ignored.min 0')
sys.exit(0)
os.environ[u'PATH'] = u'/usr/local/sbin:/usr/local/bin:' + os.environ[u'PATH']
os.environ['PATH'] = '/usr/local/sbin:/usr/local/bin:' + os.environ['PATH']
# Assuming that the ntpd version is the same as the ntpq or ntpdc
# version. This is how a proper install should be.
version = subprocess.check_output([u'ntpq', u'-c', u'version'], universal_newlines=True).split()[1][0:5].replace(u'.', u'')
version = subprocess.check_output(['ntpq', '-c', 'version'], universal_newlines=True).split()[1][0:5].replace('.', '')
if int(version) >= 427:
cmd = u'ntpq'
cmd = 'ntpq'
else:
cmd = u'ntpdc'
cmd = 'ntpdc'
iostats = dict()
iostats_output = subprocess.check_output([cmd, u'-c', u'iostats'], universal_newlines=True).splitlines()
iostats_output = subprocess.check_output([cmd, '-c', 'iostats'], universal_newlines=True).splitlines()
for line in iostats_output: iostats[line.split(u':')[0]] = int(line.split(u':')[1])
for line in iostats_output: iostats[line.split(':')[0]] = int(line.split(':')[1])
print u'received.value ' + unicode(iostats[u'received packets'])
print u'sent.value ' + unicode(iostats[u'packets sent'])
print u'dropped.value ' + unicode(iostats[u'dropped packets'])
print u'ignored.value ' + unicode(iostats[u'ignored packets'])
print('received.value ' + str(iostats['received packets']))
print('sent.value ' + str(iostats['packets sent']))
print('dropped.value ' + str(iostats['dropped packets']))
print('ignored.value ' + str(iostats['ignored packets']))
sys.exit(0)