tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect variable name in the auto-discovery script. 

Refs #6008
This commit is contained in:
Gunnar Beutner 2014-04-15 14:33:19 +02:00
parent 060a802d15
commit 8d1ffe7aa2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/make-agent-config.py
View File

@ -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 ""

10
tools/icinga2-list-agents.cmake
View File

@ -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)