From: Brian Warner Date: Mon, 14 Jul 2008 20:25:01 +0000 (-0700) Subject: munin/tahoe_stats: rearrange config a bit, no functional changes X-Git-Url: https://git.rkrishnan.org/maximilian?a=commitdiff_plain;h=0f231e2e66eb58868f1ce2dc5554b8fb63549778;p=tahoe-lafs%2Ftahoe-lafs.git munin/tahoe_stats: rearrange config a bit, no functional changes --- diff --git a/misc/munin/tahoe_stats b/misc/munin/tahoe_stats index 57d18e78..46f3c25f 100644 --- a/misc/munin/tahoe_stats +++ b/misc/munin/tahoe_stats @@ -9,14 +9,14 @@ import time STAT_VALIDITY = 300 # 5min limit on reporting stats PLUGINS = { - 'tahoe_storage_consumed': - { 'statid': 'storage_server.consumed', + # LOAD AVERAGE + 'tahoe_runtime_load_avg': + { 'statid': 'load_monitor.avg_load', 'category': 'stats', - 'configheader': '\n'.join(['graph_title Tahoe Storage Server Space Consumed', - 'graph_vlabel bytes', - 'graph_category tahoe_storage_server', - 'graph_info This graph shows space consumed', - 'graph_args --base 1024', + 'configheader': '\n'.join(['graph_title Tahoe Runtime Load Average', + 'graph_vlabel load', + 'graph_category tahoe', + 'graph_info This graph shows average reactor delay', ]), 'graph_config': '\n'.join(['%(name)s.label %(name)s', '%(name)s.draw LINE1', @@ -24,14 +24,14 @@ PLUGINS = { 'graph_render': '\n'.join(['%(name)s.value %(value)s', ]), }, - 'tahoe_storage_allocated': - { 'statid': 'storage_server.allocated', + + 'tahoe_runtime_load_peak': + { 'statid': 'load_monitor.max_load', 'category': 'stats', - 'configheader': '\n'.join(['graph_title Tahoe Storage Server Space Allocated', - 'graph_vlabel bytes', - 'graph_category tahoe_storage_server', - 'graph_info This graph shows space allocated', - 'graph_args --base 1024', + 'configheader': '\n'.join(['graph_title Tahoe Runtime Load Peak', + 'graph_vlabel load', + 'graph_category tahoe', + 'graph_info This graph shows peak reactor delay', ]), 'graph_config': '\n'.join(['%(name)s.label %(name)s', '%(name)s.draw LINE1', @@ -40,13 +40,15 @@ PLUGINS = { ]), }, - 'tahoe_runtime_load_avg': - { 'statid': 'load_monitor.avg_load', + # STORAGE ALLOCATION (BYTES) + 'tahoe_storage_consumed': + { 'statid': 'storage_server.consumed', 'category': 'stats', - 'configheader': '\n'.join(['graph_title Tahoe Runtime Load Average', - 'graph_vlabel load', - 'graph_category tahoe', - 'graph_info This graph shows average reactor delay', + 'configheader': '\n'.join(['graph_title Tahoe Storage Server Space Consumed', + 'graph_vlabel bytes', + 'graph_category tahoe_storage_server', + 'graph_info This graph shows space consumed', + 'graph_args --base 1024', ]), 'graph_config': '\n'.join(['%(name)s.label %(name)s', '%(name)s.draw LINE1', @@ -54,13 +56,15 @@ PLUGINS = { 'graph_render': '\n'.join(['%(name)s.value %(value)s', ]), }, - 'tahoe_runtime_load_peak': - { 'statid': 'load_monitor.max_load', + + 'tahoe_storage_allocated': + { 'statid': 'storage_server.allocated', 'category': 'stats', - 'configheader': '\n'.join(['graph_title Tahoe Runtime Load Peak', - 'graph_vlabel load', - 'graph_category tahoe', - 'graph_info This graph shows peak reactor delay', + 'configheader': '\n'.join(['graph_title Tahoe Storage Server Space Allocated', + 'graph_vlabel bytes', + 'graph_category tahoe_storage_server', + 'graph_info This graph shows space allocated', + 'graph_args --base 1024', ]), 'graph_config': '\n'.join(['%(name)s.label %(name)s', '%(name)s.draw LINE1', @@ -83,6 +87,7 @@ PLUGINS = { 'graph_render': '\n'.join(['%(name)s.value %(value)s', ]), }, + 'tahoe_storage_bytes_freed': { 'statid': 'storage_server.bytes_freed', 'category': 'counters', @@ -98,6 +103,8 @@ PLUGINS = { ]), }, + + # HELPER 'tahoe_helper_incoming_files': { 'statid': 'chk_upload_helper.incoming_count', 'category': 'stats', @@ -280,6 +287,7 @@ PLUGINS = { ]), }, + # WEBAPI 'tahoe_uploader_bytes_uploaded': { 'statid': 'uploader.bytes_uploaded', 'category': 'counters',