Changeset 8321 in genesis for nodes/status-monitoring.py

Timestamp:

Aug 12, 2010, 3:33:42 PM (14 years ago)

Author:

rick

Message:

Grumble keys got confused everywhere

File:

• nodes/status-monitoring.py (modified) (3 diffs)

nodes/status-monitoring.py

@@ -257 +257 @@
 
   # List of hosts which has some kind of problem
-  for host in list(set(configs.keys()) - set(host_processed.keys())):
+  print host_processed.keys()
+  print configs.keys()
+  for host in configs.keys():
+     fqdn = host + ".wLeiden.NET"
+     if fqdn in host_processed.keys():
+       continue
      config = configs[host]
      print "# Problems in host '%s'" % host
      host_down = True
      for ip in gformat.get_used_ips([config]):
+       if not gformat.valid_addr(ip):
+         continue
        if status[ip]['state'] == "up":
          host_down = False
@@ -267 +274 @@
      if host_down:
        print "## HOST is DOWN!"
-       nodemap['node'][host] = gformat.DOWN
+       nodemap['node'][fqdn] = gformat.DOWN
      else:
        print "## SNMP problems (not reachable, deamon not running, etc)"
-       nodemap['node'][host] = gformat.UNKNOWN
+       nodemap['node'][fqdn] = gformat.UNKNOWN
 
        
 
   # Correlation mapping
-  for host, details in host_processed.iteritems():
-    nodemap['node'][host] = gformat.OK
-    print "# Working on %s" % host
+  for fqdn, details in host_processed.iteritems():
+    nodemap['node'][fqdn] = gformat.OK
+    print "# Working on %s" % fqdn
     for ip, arpmac in details['arpmac'].iteritems():
       if arpmac in details['mac'].keys():
@@ -285 +292 @@
         print "## [WARN] No parent host for MAC %s (%s) found" % (arpmac, ip)
       else:
-        print "## Interlink %s - %s"  % (host, mac_to_host[arpmac])
-        nodemap['link'][(host,mac_to_host[arpmac])] = gformat.OK
+        print "## Interlink %s - %s"  % (fqdn, mac_to_host[arpmac])
+        nodemap['link'][(fqdn,mac_to_host[arpmac])] = gformat.OK
 
   stream = file(nodemap_status_file,'w')