open.source/magic-wormhole-transit-relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename, edit munin plugins to match new moods

Browse Source 
Instead of an "errors" graph, we now just track all events (happy too).
This commit is contained in:
Brian Warner 2018-02-12 17:04:45 -08:00
parent 10e754fc9a
commit 7411d3cd73
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
misc/munin/wormhole_transit → misc/munin/wormhole_transit_bytes
View File

0
misc/munin/wormhole_transit_alltime → misc/munin/wormhole_transit_bytes_alltime
View File

22
misc/munin/wormhole_transit_errors → misc/munin/wormhole_transit_events
View File

@ -11,15 +11,21 @@ from __future__ import print_function
import os, sys, time, sqlite3 import os, sys, time, sqlite3
CONFIG = """\ CONFIG = """\
graph_title Magic-Wormhole Transit Server Errors (since reboot) graph_title Magic-Wormhole Transit Server Events (since reboot)
graph_vlabel Events Since Reboot graph_vlabel Events Since Reboot
graph_category network graph_category network
happy.label Happy
happy.draw LINE1
happy.type GAUGE
errory.label Errory errory.label Errory
errory.draw LINE1 errory.draw LINE1
errory.type GAUGE errory.type GAUGE
lonely.label Lonely lonely.label Lonely
lonely.draw LINE1 lonely.draw LINE1
lonely.type GAUGE lonely.type GAUGE
redundant.label Redundant
redundant.draw LINE1
redundant.type GAUGE
""" """
if len(sys.argv) > 1 and sys.argv[1] == "config": if len(sys.argv) > 1 and sys.argv[1] == "config":
@ -35,6 +41,13 @@ rebooted,updated = db.execute("SELECT `rebooted`, `updated` FROM `current`").fet
if time.time() > updated + 5*MINUTE: if time.time() > updated + 5*MINUTE:
sys.exit(1) # expired sys.exit(1) # expired
count = db.execute("SELECT COUNT() FROM `usage`"
" WHERE"
" `started` > ? AND"
" `result` = 'happy'",
(rebooted,)).fetchone()[0]
print("happy.value", count)
count = db.execute("SELECT COUNT() FROM `usage`" count = db.execute("SELECT COUNT() FROM `usage`"
" WHERE" " WHERE"
" `started` > ? AND" " `started` > ? AND"
@ -48,3 +61,10 @@ count = db.execute("SELECT COUNT() FROM `usage`"
" `result` = 'lonely'", " `result` = 'lonely'",
(rebooted,)).fetchone()[0] (rebooted,)).fetchone()[0]
print("lonely.value", count) print("lonely.value", count)
count = db.execute("SELECT COUNT() FROM `usage`"
" WHERE"
" `started` > ? AND"
" `result` = 'redundant'",
(rebooted,)).fetchone()[0]
print("redundant.value", count)