Changeset 8321 in genesis

Timestamp:

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

Author:

rick

Message:

Grumble keys got confused everywhere

Location:

nodes

Files:

• gformat.py (modified) (2 diffs)
• make-map.py (modified) (4 diffs)
• make-network-graph.py (modified) (1 diff)
• status-monitoring.py (modified) (3 diffs)

nodes/gformat.py

@@ -42 +42 @@
   return proxylist
 
+
+
+def valid_addr(addr):
+  """ Show which address is valid in which are not """
+  return str(addr).startswith('172.')
 
 
@@ -307 +312 @@
         addr, mask = l.split('/')
         # Special case do not process
-        if addr not in ["0.0.0.0"]:
+        if not valid_addr(addr):
            ip_list.append(addr)
     return sorted(ip_list)

nodes/make-map.py

@@ -152 +152 @@
   try:
     for host in gformat.get_hostlist():
+      fqdn = host + ".wLeiden.NET"
       print "## Processing host", host
       datadump = gformat.get_yaml(host)
@@ -178 +179 @@
         # By default assume up
         node_status = "up"
-      elif status['node'][host] == gformat.OK:
+      elif status['node'][fqdn] == gformat.OK:
         node_status = "up"
-      elif status['node'][host] == gformat.DOWN:
+      elif status['node'][fqdn] == gformat.DOWN:
         node_status = "down"
-      elif status['node'][host] == gformat.UNKNOWN:
+      elif status['node'][fqdn] == gformat.UNKNOWN:
         node_status = "unknown"
       else:
         assert False, "Status cannot be generated"
+
+      print "### Node status is '%s'" % node_status
       f.write("""
       <description>All active nodes</description>
@@ -209 +212 @@
   """)
   for addr,leden in poel.iteritems():
+    if not gformat.valid_addr(gformat.showaddr(addr)):
+      print "## Adres '%s' met leden '%s' ignored'" % (gformat.showaddr(addr), ','.join(leden))
+      continue
     if link_type[addr] == '11a':
       weight = 2
@@ -243 +249 @@
           assert False, "Link status not mapped properly"
 
-           
         f.write("""
       <Placemark>

nodes/make-network-graph.py

@@ -26 +26 @@
 
         # Not parsing of these folks please
-        if "192.168" in addr:
-          continue
-        if "0.0.0.0" in addr:
+        if not gformat.valid_addr(addr):
           continue
 

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