From 4b840a37fe473545593d0633fd5dc6c3675fd191 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 26 May 2016 17:59:42 -0700 Subject: [PATCH] munin: show events-per-hour, not events-per-second --- misc/munin/wormhole_errors | 11 +++++++---- misc/munin/wormhole_events | 5 ++++- misc/munin/wormhole_transit | 5 +++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/misc/munin/wormhole_errors b/misc/munin/wormhole_errors index 07f4a82..02b832d 100755 --- a/misc/munin/wormhole_errors +++ b/misc/munin/wormhole_errors @@ -65,20 +65,23 @@ def count_events(): CONFIG = """\ graph_title Magic-Wormhole Server Errors -graph_vlabel Events per time +graph_vlabel Events per Hour graph_category network nameplates.label Nameplates -nameplates.draw LINE +nameplates.draw LINE1 nameplates.type DERIVE nameplates.min 0 +nameplates.cdef nameplates,3600,* mailboxes.label Mailboxes -mailboxes.draw LINE +mailboxes.draw LINE1 mailboxes.type DERIVE mailboxes.min 0 +mailboxes.cdef mailboxes,3600,* transit.label Transit -transit.draw LINE +transit.draw LINE1 transit.type DERIVE transit.min 0 +transit.cdef transit,3600,* """ if len(sys.argv) > 1 and sys.argv[1] == "config": diff --git a/misc/munin/wormhole_events b/misc/munin/wormhole_events index c934bd5..3ca5d82 100755 --- a/misc/munin/wormhole_events +++ b/misc/munin/wormhole_events @@ -65,20 +65,23 @@ def count_events(): CONFIG = """\ graph_title Magic-Wormhole Server Events -graph_vlabel Events per time +graph_vlabel Events per Hour graph_category network nameplates.label Nameplates nameplates.draw LINE nameplates.type DERIVE nameplates.min 0 +nameplates.cdef nameplates,3600,* mailboxes.label Mailboxes mailboxes.draw LINE mailboxes.type DERIVE mailboxes.min 0 +mailboxes.cdef mailboxes,3600,* transit.label Transit transit.draw LINE transit.type DERIVE transit.min 0 +transit.cdef transit,3600,* """ if len(sys.argv) > 1 and sys.argv[1] == "config": diff --git a/misc/munin/wormhole_transit b/misc/munin/wormhole_transit index 4b881d5..3a30c9e 100755 --- a/misc/munin/wormhole_transit +++ b/misc/munin/wormhole_transit @@ -65,12 +65,13 @@ def count_events(): CONFIG = """\ graph_title Magic-Wormhole Transit Usage -graph_vlabel Bytes per time +graph_vlabel Bytes per Hour graph_category network transit.label Transit Bytes -transit.draw LINE +transit.draw LINE1 transit.type DERIVE transit.min 0 +transit.cdef transit,3600,* """ if len(sys.argv) > 1 and sys.argv[1] == "config":