Merge pull request #68 from lkarsten/master

Minor changes to munin-node-from-hell

tools/munin-node-from-hell/basic.conf

@@ -5,10 +5,10 @@
 
 [instance:basic]
 pluginprofile = basic
-port = 4000
+port = 4001
 
 [pluginprofile:basic]
-plugins = always_warning, always_critical, graph_area
+plugins = graph_area
 
 [base]
 # when building an example config with --muninconf, what hostname to output.

tools/munin-node-from-hell/huge.conf

@@ -0,0 +1,14 @@
+# 
+# Quick estimate says 30 plugins is a good estimate for a common client.
+#
+
+[instance:huge]
+pluginprofile = huge
+portrange = 4000-4100
+
+[pluginprofile:huge]
+plugins = load, locks, load, locks, load, locks, load, locks, load, locks, load, locks, load, locks, load, locks ,load, locks, load, locks, load, locks, load, locks ,load, locks, load, locks, load, locks, load, locks 
+
+[base]
+# when building an example config with --muninconf, what hostname to output.
+hostname = localhost

tools/munin-node-from-hell/muninnode-from-hell

@@ -264,7 +264,7 @@ def start_servers(instances):
 
 
 def usage():
-    print "Usage: %s [--run] [--verbose] [--muninconf] <configfile>" % sys.argv[0]
+    print "Usage: %s [--run] [--verbose] [--muninconf] <configfile> <configfileN>" % sys.argv[0]
 
 def main():
     if len(sys.argv) <= 2:
@@ -276,7 +276,12 @@ def main():
         verbose = True
 
     config = ConfigParser.RawConfigParser()
-    config.read(sys.argv[-1])
+    for configfile in sys.argv[1:]:
+        if not configfile.endswith(".conf"):
+            continue
+        if verbose:
+            print "Reading config file %s" % configfile
+        config.read(configfile)
 
     instancekeys = [ key for key in config.sections() if key.startswith("instance:") ]
     servers = {}
@@ -330,14 +335,14 @@ def main():
                 instanceconfig[k] = v
 
             instanceconfig["plugins"] = plugins
-            if "--verbose" in sys.argv:
-                instanceconfig["verbose"] = True
+            instanceconfig["verbose"] = verbose
 
             instanceconfig["name"] = "%s-%s" % (instancename, portinstance)
             instanceconfig["expanded_port"] = portinstance
 
             instances.append(instanceconfig)
             # XXX: need to store what handlers we should have.
+    print instances
 
     # output sample munin config for the poller
     if "--muninconf" in sys.argv:

tools/munin-node-from-hell/notifications.conf

@@ -5,7 +5,7 @@
 
 [instance:notifications]
 pluginprofile = notif
-port = 3000
+port = 4010
 
 #
 #[instance:baz]

tools/munin-node-from-hell/tarpit.conf

@@ -3,14 +3,11 @@
 
 [instance:tarpit]
 pluginprofile = tarpit
-port = 3000
+port = 4005
 
 [pluginprofile:tarpit]
 plugins = load, locks, tarpit, load, locks
 
-[pluginprofile:base]
-plugins = load, locks, locks, load, load, locks, locks, load, load, load
-
 [base]
 # when building an example config with --muninconf, what hostname to output.
 hostname = localhost