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

Merge pull request #4 from rodo/master

Browse Source 
Add option --prefix and --noprefix on targets name
This commit is contained in:
Jeffrey Forman 2013-03-28 17:04:14 -07:00
commit 00b34264b9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
m2g-poller.py
View File

@ -130,13 +130,17 @@ class Munin():
def send_to_carbon(self, timestamp, plugin_name, plugin_config, plugin_data): def send_to_carbon(self, timestamp, plugin_name, plugin_config, plugin_data):
"""Send plugin data to Carbon over Pickle format.""" """Send plugin data to Carbon over Pickle format."""
carbon_host, carbon_port = self.args.carbon.split(":") carbon_host, carbon_port = self.args.carbon.split(":")
if self.args.noprefix:
prefix = ''
else:
prefix = "%s." % self.args.prefix
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] 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 = "servers.%s.%s.%s.%s" % (short_hostname, plugin_category, plugin_name, data_key) metric = "%s%s.%s.%s.%s" % (prefix, short_hostname, 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)))
@ -170,6 +174,14 @@ def parse_args():
help="Don't actually send Munin data to Carbon.") help="Don't actually send Munin data to Carbon.")
parser.add_argument("--poolsize", type=int, default=1, parser.add_argument("--poolsize", type=int, default=1,
help="Pool size of simultaneous connections when polling multiple hosts.") help="Pool size of simultaneous connections when polling multiple hosts.")
parser.add_argument("--prefix",
action="store",
default="servers",
help="Prefix used on graphite target's name (default='servers')")
parser.add_argument("--noprefix",
action="store_true",
default=False,
help="Do not use a prefix on graphite target's name")
parser.add_argument("--verbose", parser.add_argument("--verbose",
choices=[1, 2, 3], choices=[1, 2, 3],
default=2, default=2,