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

added update_hostname

Browse Source 
* gets the hostname from the the munin connection hello string
* does not override displayname if provided
This commit is contained in:
Yoav 2014-02-08 07:54:29 +01:00 committed by Zdenek Pizl
parent 25eab12604
commit 12e2057505
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
m2g-poller.py
View File

@ -12,6 +12,7 @@ import time
LOGGING_FORMAT = "%(asctime)s:%(levelname)s:%(message)s" LOGGING_FORMAT = "%(asctime)s:%(levelname)s:%(message)s"
RE_LEFTRIGHT = re.compile(r"^(?P<left>\S+)\s+(?P<right>\S+)$") RE_LEFTRIGHT = re.compile(r"^(?P<left>\S+)\s+(?P<right>\S+)$")
RE_MUNIN_NODE_NAME = re.compile(r"^# munin node at\s+(?P<nodename>\S+)$")
## TODO: Catch keyboard interrupt properly and die when requested ## TODO: Catch keyboard interrupt properly and die when requested
@ -33,6 +34,7 @@ class Munin():
def go(self): def go(self):
"""Bootstrap method to start processing hosts's Munin stats.""" """Bootstrap method to start processing hosts's Munin stats."""
self.connect() self.connect()
self.update_hostname()
self.process_host_stats() self.process_host_stats()
while True and self.args.interval != 0: while True and self.args.interval != 0:
@ -40,6 +42,18 @@ class Munin():
self.connect() self.connect()
self.process_host_stats() self.process_host_stats()
def update_hostname(self):
"""Updating hostname from connection hello string."""
if self.args.displayname:
return
try:
node_name = RE_MUNIN_NODE_NAME.search(self.hello_string).group(1)
self.displayname = node_name
except AttributeError:
logging.info("Unable to obtain munin node name from: %s",
self.hello_string)
return
def connect(self): def connect(self):
"""Initial connection to Munin host.""" """Initial connection to Munin host."""
try: try: