From 8d1ffe7aa2ab5551ad56657bf441a3d864ef501e Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 15 Apr 2014 14:33:19 +0200 Subject: [PATCH] Fix incorrect variable name in the auto-discovery script. Refs #6008 --- contrib/make-agent-config.py | 2 +- tools/icinga2-list-agents.cmake | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/make-agent-config.py b/contrib/make-agent-config.py index a6994575c..e1156726c 100755 --- a/contrib/make-agent-config.py +++ b/contrib/make-agent-config.py @@ -60,6 +60,6 @@ for agent, agent_info in inventory.items(): for service in host_info["services"]: print "object Service \"%s\" {" % (service) print " import \"agent-service\"" - print " host_name = \"%s\"" % (host) + print " host_name = \"%s\"" % (host_name) print "}" print "" diff --git a/tools/icinga2-list-agents.cmake b/tools/icinga2-list-agents.cmake index 30e626093..5d87a15c0 100644 --- a/tools/icinga2-list-agents.cmake +++ b/tools/icinga2-list-agents.cmake @@ -32,10 +32,16 @@ for root, dirs, files in os.walk(inventory_dir): inventory_info = json.load(fp) fp.close() + if not "params" in inventory_info: + continue + inventory[inventory_info["identity"]] = {} inventory[inventory_info["identity"]]["seen"] = inventory_info["params"]["seen"] inventory[inventory_info["identity"]]["hosts"] = {} + if not "hosts" in host_info in inventory_info["params"]: + continue + for host, host_info in inventory_info["params"]["hosts"].items(): inventory[inventory_info["identity"]]["hosts"][host] = { "services": host_info["services"].keys() } @@ -54,11 +60,11 @@ else: for agent, agent_info in inventory.items(): if "peer" in agent_info: peer_info = agent_info["peer"] - peer_addr = "peer address: %s:%s, " % (peer_info["agent_host"], peer_info["agent_port"]) + peer_addr = "peer address: %s:%s" % (peer_info["agent_host"], peer_info["agent_port"]) else: peer_addr = "no peer address" - print "* %s (%slast seen: %s)" % (agent, peer_addr, datetime.fromtimestamp(agent_info["seen"])) + print "* %s (%s, last seen: %s)" % (agent, peer_addr, datetime.fromtimestamp(agent_info["seen"])) for host, host_info in agent_info["hosts"].items(): print " * %s" % (host)