farrokhi/munin-graphite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be able to specify a displayname for a host other than its actual hostname.

Browse Source 
hopefully take care of issue #5
This commit is contained in:
Jeffrey Forman 2013-11-24 21:39:35 -05:00
parent c599753e87
commit ac45705410
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
m2g-poller.py
View File

@ -21,6 +21,10 @@ class Munin():
self.hostname = hostname self.hostname = hostname
self.port = port self.port = port
self.args = args self.args = args
self.displayname = self.hostname.split(".")[0]
if self.args.displayname:
self.displayname = self.args.displayname
def go(self): def go(self):
"""Bootstrap method to start processing hosts's Munin stats.""" """Bootstrap method to start processing hosts's Munin stats."""
@ -139,10 +143,10 @@ class Munin():
data_list = [] data_list = []
logging.info("Creating metric for plugin %s, timestamp: %d", logging.info("Creating metric for plugin %s, timestamp: %d",
plugin_name, timestamp) plugin_name, timestamp)
short_hostname = self.hostname.split(".")[0]
for data_key in plugin_data: for data_key in plugin_data:
plugin_category = plugin_config["graph_category"] plugin_category = plugin_config["graph_category"]
metric = "%s%s.%s.%s.%s" % (prefix, short_hostname, plugin_category, plugin_name, data_key) metric = "%s%s.%s.%s.%s" % (prefix, self.displayname, plugin_category, plugin_name, data_key)
value = plugin_data[data_key] value = plugin_data[data_key]
logging.debug("Creating metric %s, value: %s", metric, value) logging.debug("Creating metric %s, value: %s", metric, value)
data_list.append((metric, (timestamp, value))) data_list.append((metric, (timestamp, value)))
@ -171,7 +175,10 @@ def parse_args():
parser.add_argument("--host", parser.add_argument("--host",
action="store", action="store",
default="localhost", default="localhost",
help="Comma separated list of hosts running Munin to query for stats. Default: %(default)s") help="Munin host to query for stats. Default: %(default)s")
parser.add_argument("--displayname",
default=False,
help="If defined, use this as the name to store metrics in Graphite instead of the Munin hostname.")
parser.add_argument("--interval", parser.add_argument("--interval",
type=int, type=int,
default=60, default=60,
@ -179,14 +186,14 @@ def parse_args():
parser.add_argument("--noop", parser.add_argument("--noop",
action="store_true", action="store_true",
help="Don't actually send Munin data to Carbon. Default: %(default)s") help="Don't actually send Munin data to Carbon. Default: %(default)s")
parser.add_argument("--prefix",
action="store",
default="servers",
help="Prefix used on graphite target's name. Default: %(default)s")
parser.add_argument("--noprefix", parser.add_argument("--noprefix",
action="store_true", action="store_true",
default=False, default=False,
help="Do not use a prefix on graphite target's name. Default: %(default)s") help="Do not use a prefix on graphite target's name. Default: %(default)s")
parser.add_argument("--prefix",
action="store",
default="servers",
help="Prefix used on graphite target's name. Default: %(default)s")
parser.add_argument("--verbose","-v", parser.add_argument("--verbose","-v",
choices=[1, 2, 3], choices=[1, 2, 3],
default=2, default=2,