From 0aba63ff17d2bfda7bf887de763994625396c1f1 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 18 Oct 2007 12:49:22 -0700 Subject: [PATCH] munin: oops, fix that trailing-newline fix, the previous one mangled the config --- misc/munin/tahoe-dirnodes.py | 5 +++-- misc/munin/tahoe-files.py | 5 +++-- misc/munin/tahoe-sharesperfile.py | 5 +++-- misc/munin/tahoe-storagespace.py | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/misc/munin/tahoe-dirnodes.py b/misc/munin/tahoe-dirnodes.py index dc35b57a..22cfa79d 100644 --- a/misc/munin/tahoe-dirnodes.py +++ b/misc/munin/tahoe-dirnodes.py @@ -22,12 +22,13 @@ graph_vlabel dirnodes graph_category tahoe graph_info This graph shows the number of directory nodes hosted by this vdrive server dirnodes.label dirnodes -dirnodes.draw LINE2""" +dirnodes.draw LINE2 +""" if len(sys.argv) > 1: if sys.argv[1] == "config": - print configinfo + print configinfo.rstrip() sys.exit(0) dirnodes = len(os.listdir(os.path.join(nodedir, "vdrive"))) diff --git a/misc/munin/tahoe-files.py b/misc/munin/tahoe-files.py index f41e1b32..c6026de1 100644 --- a/misc/munin/tahoe-files.py +++ b/misc/munin/tahoe-files.py @@ -31,7 +31,8 @@ configinfo = \ """graph_title Allmydata Tahoe Filecount graph_vlabel files graph_category tahoe -graph_info This graph shows the number of files hosted by this node's StorageServer""" +graph_info This graph shows the number of files hosted by this node's StorageServer +""" for nodename, basedir in nodedirs: configinfo += "%s.label %s\n" % (nodename, nodename) @@ -40,7 +41,7 @@ for nodename, basedir in nodedirs: if len(sys.argv) > 1: if sys.argv[1] == "config": - print configinfo + print configinfo.rstrip() sys.exit(0) for nodename, basedir in nodedirs: diff --git a/misc/munin/tahoe-sharesperfile.py b/misc/munin/tahoe-sharesperfile.py index 4f0593c5..185e5cc7 100644 --- a/misc/munin/tahoe-sharesperfile.py +++ b/misc/munin/tahoe-sharesperfile.py @@ -31,7 +31,8 @@ configinfo = \ """graph_title Allmydata Tahoe Shares Per File graph_vlabel shares per file graph_category tahoe -graph_info This graph shows the number of shares present for each file hosted by this node's StorageServer""" +graph_info This graph shows the number of shares present for each file hosted by this node's StorageServer +""" for nodename, basedir in nodedirs: configinfo += "%s.label %s\n" % (nodename, nodename) @@ -40,7 +41,7 @@ for nodename, basedir in nodedirs: if len(sys.argv) > 1: if sys.argv[1] == "config": - print configinfo + print configinfo.rstrip() sys.exit(0) for nodename, basedir in nodedirs: diff --git a/misc/munin/tahoe-storagespace.py b/misc/munin/tahoe-storagespace.py index 7983af5e..ad4375b9 100644 --- a/misc/munin/tahoe-storagespace.py +++ b/misc/munin/tahoe-storagespace.py @@ -34,7 +34,8 @@ configinfo = \ """graph_title Allmydata Tahoe Shareholder Space graph_vlabel bytes graph_category tahoe -graph_info This graph shows the space consumed by this node's StorageServer""" +graph_info This graph shows the space consumed by this node's StorageServer +""" for nodename, basedir in nodedirs: configinfo += "%s.label %s\n" % (nodename, nodename) @@ -43,7 +44,7 @@ for nodename, basedir in nodedirs: if len(sys.argv) > 1: if sys.argv[1] == "config": - print configinfo + print configinfo.rstrip() sys.exit(0) for nodename, basedir in nodedirs: -- 2.45.2