id

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 *.json
+*.pyc
 __pycache__/

GraphiteManager.py

@@ -35,6 +35,7 @@ def prepareMessage(self, data):
         self.__addSingleMessage__("nodes."+self.domain+".location.count",data['locationcount'])
         self.__addSingleMessage__("nodes."+self.domain+".total.count",data['nodecount'])
         self.__addSingleMessage__("nodes."+self.domain+".totalclient.count",data['totalclients'])
+        self.__addSingleMessage__("nodes."+self.domain+"clients_per_node",data['totalclients']/float(data['nodecount']))
 
     def send(self):
         sock = socket.socket()

JsonManager.py

@@ -14,8 +14,7 @@
 #
 
 from subprocess import check_output
-import json
-import sys
+import json, sys, os.path
 
 class JsonManager:
     def __init__(self):
@@ -24,7 +23,7 @@ def __init__(self):
         self.json159 = []
         self.json160 = []
         self.result = {}
-        pass
+        self.__readAdvancedNodesFile__('/usr/src/node-stats/advnodes')
 
 
     def loadJson(self):
@@ -52,16 +51,14 @@ def processJson158(self):
         self.result["autoupdate"] = 0
         for id in self.json158:
             node = self.json158[id]
+            nodeID = id.replace(':','')
 
             # Check for advanced-stats feature
-            self.advStats[id] = {
-                'enabled' : False
-            }
-            try:
-                if node['advanced-stats']['store-stats'] == True:
-                    self.advStats[id]['enabled'] = True
-            except:
-                pass
+            if nodeID not in self.advStats:
+                if 'advanced-stats' in node and 'store-stats' in node['advanced-stats'] and node['advanced-stats']['store-stats'] == True:
+                    self.__addNode__(nodeID, True)
+                else:
+                    self.__addNode__(nodeID, False)
 
     # Nodes/Firmware
             if 'software' in node:
@@ -82,14 +79,14 @@ def processJson158(self):
                 self.__incCounter__('locationcount')
 
             # do advanced stats stuff in 158
-            if self.advStats[id]['enabled'] == True:
+            if self.advStats[nodeID]['enabled'] == True:
 
                 # generate mapping for interface names
                 if 'network' in node and 'mesh' in node['network'] and 'bat0' in node['network']['mesh'] and 'interfaces' in node['network']['mesh']['bat0']:
-                    self.advStats[id]['if_mapping'] = {}
+                    self.advStats[nodeID]['if_mapping'] = {}
                     for k, v in node['network']['mesh']['bat0']['interfaces'].iteritems():
                         for i, mac in enumerate(v):
-                            self.advStats[id]['if_mapping'][mac] = k + '_' + str(i)
+                            self.advStats[nodeID]['if_mapping'][mac] = k + '_' + str(i)
 
 
 
@@ -117,46 +114,24 @@ def processJson159(self):
                 sys.stderr.write("Error %s" % sys.exc_info()[0])
 
             try:
-                if id in self.advStats and self.advStats[id]['enabled'] == True:
+                if nodeID in self.advStats and self.advStats[nodeID]['enabled'] == True:
                     self.result['nodes'][nodeID].update(self.processAdvancedStats159(node))
             except:
                 sys.stderr.write("Error %s" % sys.exc_info()[0])
 
 
     def processJson160(self):
         for id, node in self.json160.iteritems():
-            if id in self.advStats and self.advStats[id]['enabled'] == True:
-                node_id = node['node_id']
+            nodeID = id.replace(':','')
+            if nodeID in self.advStats and self.advStats[nodeID]['enabled'] == True:
                 try:
                     if 'wifi' in node:
-                        self.result['nodes'][node_id]['wifi'] = self.__wifiAndBatmanStats__(id, node['wifi'], ['noise', 'inactive', 'signal'])
+                        self.result['nodes'][nodeID]['wifi'] = self.__wifiAndBatmanStats__(nodeID, node['wifi'], ['noise', 'inactive', 'signal'])
                     if 'batadv' in node:
-                        self.result['nodes'][node_id]['batadv'] = self.__wifiAndBatmanStats__(id, node['batadv'], ['tq', 'lastseen'])
+                        self.result['nodes'][nodeID]['batadv'] = self.__wifiAndBatmanStats__(nodeID, node['batadv'], ['tq', 'lastseen'])
                 except:
-                    sys.stderr.write("Error %s" % sys.exc_info()[0])
-
-
-    def __getIfName__(self, id, ifmac):
-        if ifmac in self.advStats[id]['if_mapping']:
-            return self.advStats[id]['if_mapping'][ifmac]
-        else:
-            return ifmac.replace(':', '_')
-
-    def __wifiAndBatmanStats__(self, id, data, keys):
-        dataStats = {
-            'count' : 0
-        }
-        for if_id, if_val in data.iteritems():
-            if_id_print = self.__getIfName__(id, if_id)
-            dataStats[if_id_print] = {
-                'count' : 0
-            }
-            if if_val and 'neighbours' in if_val:
-                for neigh_id, neigh_val in data[if_id]['neighbours'].iteritems():
-                    dataStats['count'] += 1
-                    dataStats[if_id_print]['count'] += 1
-                    dataStats[if_id_print][neigh_id.replace(':','_')] = self.__cherryPickEntries__(neigh_val, keys)
-        return dataStats
+                    pass
+#                    sys.stderr.write("Error %s" % sys.exc_info()[0])
 
 
     def processAdvancedStats159(self, node):
@@ -186,7 +161,8 @@ def processAdvancedStats159(self, node):
                     'running',
                     'total'
                 ]
-            ]
+            ],
+            'rootfs_usage'
         ]
 
         advancedStats.update(self.__cherryPickEntries__(node,entries))
@@ -195,7 +171,7 @@ def processAdvancedStats159(self, node):
         if 'traffic' in node:
             advancedStats['traffic'] = {}
             if 'rx' in node['traffic'] and 'tx' in node['traffic']:
-                advancedStats['traffic']['all'] = self.__ifStats__(node['traffic']['rx'], node['traffic']['tx'])
+                advancedStats['traffic']['node'] = self.__ifStats__(node['traffic']['rx'], node['traffic']['tx'])
             if 'mgmt_rx' in node['traffic'] and 'mgmt_tx' in node['traffic']:
                 advancedStats['traffic']['managed'] = self.__ifStats__(node['traffic']['mgmt_rx'], node['traffic']['mgmt_tx'])
             if 'forward' in node['traffic']:
@@ -204,7 +180,9 @@ def processAdvancedStats159(self, node):
         if 'mesh_vpn' in node:
                 advancedStats['mesh_vpn'] = self.__vpnStats__(node['mesh_vpn'])
         if 'gateway' in node:
-            advancedStats['bat_gw_id'] = node['gateway'].split(':')[-1]
+            advancedStats['bat_gw_id'] = node['gateway'].replace(':','')
+        if 'gateway_nexthop' in node:
+            advancedStats['bat_gw_next_hop_id'] = node['gateway_nexthop'].replace(':','')
         return advancedStats
 
 
@@ -254,6 +232,49 @@ def __cherryPickEntries__(self, data, entries):
         return dataStats
 
 
+    def __getIfName__(self, id, ifmac):
+        if ifmac in self.advStats[id]['if_mapping']:
+            return self.advStats[id]['if_mapping'][ifmac]
+        else:
+            return ifmac.replace(':', '_')
+
+
+    def __wifiAndBatmanStats__(self, id, data, keys):
+        dataStats = {
+            'count' : 0
+        }
+        #print("mark", self.result['nodes'][id])
+        gwid = self.result['nodes'][id]['bat_gw_id'] if 'bat_gw_id' in self.result['nodes'][id] else None
+        for if_id, if_val in data.iteritems():
+            if_id_print = self.__getIfName__(id, if_id)
+            if if_val and 'neighbours' in if_val:
+                for neigh_id, neigh_val in data[if_id]['neighbours'].iteritems():
+                    dataStats['count'] += 1
+                    if gwid == neigh_id.replace(':',''):
+                        if 'gateways' not in dataStats:
+                            dataStats['gateways'] = {'count' : 0}
+                        dataStats['gateways']['count'] += 1
+                        dataStats['gateways'][neigh_id.replace(':','_')] = self.__cherryPickEntries__(neigh_val, keys)
+                    else:
+                        if if_id_print not in dataStats:
+                            dataStats[if_id_print] = {'count' : 0}
+                        dataStats[if_id_print]['count'] += 1
+                        dataStats[if_id_print][neigh_id.replace(':','_')] = self.__cherryPickEntries__(neigh_val, keys)
+        return dataStats
+
+
+    def __readAdvancedNodesFile__(self,filename):
+        if os.path.isfile(filename):
+            with open(filename) as f:
+                for line in f:
+                    self.__addNode__(line.strip(),True)
+
+    def __addNode__(self,nodeID,advStats = False):
+        if nodeID not in self.advStats:
+            self.advStats[nodeID] = {
+                'enabled' : advStats
+            }
+
     def __incCounter__(self, key, value=None):
 
         if value is None:
@@ -275,4 +296,4 @@ def ___cleanstr___(self, cleanstr):
         for char in specialChars:
             cleanstr = cleanstr.replace(char,"_")
         cleanstr = cleanstr.replace(":","")
-        return cleanstr
+        return cleanstr

advnodes

@@ -0,0 +1,114 @@
+f4f26d303de6
+60e327d61254
+30b5c2bd7162
+c4e984f7bc52
+0418d6ad9dcc
+0418d6ad9ccc
+0418d6ad9f3f
+0418d6ad9c62
+0418d6ad9dc9
+0418d6ad9f3e
+6872512ee40d
+0050fc5a94d1
+e8de27dd7524
+c4e984b5c9ae
+f4f26d3fdd90
+24a43cdfa10e
+14cc20709f02
+e894f66d40a8
+e894f62a03cc
+60e327ed9ce6
+c46e1f878558
+a42bb0b49a72
+c46e1f7a9a00
+60e3279ae306
+f81a67873615
+60e327cef960
+60e327b2d5a2
+60e327ceced0
+60e327ced0a4
+30b5c2216d04
+52540044d942
+6872514e97ae
+a0f3c15b4180
+c4e984b0d8ec
+c4e984b0b798
+c4e9846d8fd2
+00199968f41f
+14cc2097f6fc
+5254009c34a4
+c4e984be268c
+60e3278139e6
+6872512ee0a3
+f4f26d499114
+f4f26d68ca2e
+ec086ba4dd28
+525400ceedc5
+525400751a8d
+98ded0d5b790
+f4f26d357d78
+24a43cd88ed6
+c4e984b607ca
+e894f6428f86
+0418d66d054a
+e894f69084b8
+0418d60ba795
+c46e1ffeb440
+14cc206e122e
+c46e1fa23450
+c46e1ff4d9fa
+c46e1ff4d6e0
+c46e1fa23498
+c46e1ff4d9b2
+c46e1f8cef60
+c46e1f8ceed2
+c46e1fa232d0
+f81a678c76f6
+c46e1fa233a2
+c46e1fa2344e
+e894f6518a3e
+525400e6d519
+e894f6521862
+c46e1f2b8abc
+60e327cce6f2
+6872516867ff
+30b5c2b0492c
+802aa8c20ec1
+802aa8c2032e
+802aa8c20ae2
+802aa8c21051
+802aa8c20f22
+802aa8c20762
+802aa8c20762
+802aa89ba508
+802aa89ba667
+802aa89ba6f8
+802aa89ba69c
+802aa8c2214e
+802aa89ba5bd
+802aa8c2235e
+802aa8c2213a
+802aa89ba682
+802aa89ba516
+802aa8c222d0
+802aa89ba5e6
+802aa89ba6ed
+802aa8c21823
+802aa89ba50a
+f4f26d5280e6
+c46e1fbd19c4
+5254005a363b
+52540011ebd6
+14cc2097d1f2
+68725128a438
+6872512063f9
+60e327c783cc
+c46e1ffe44e6
+60e327c78374
+44d9e7ace223
+60e32776947a
+60e327cee38e
+c46e1fb2c802
+687251206213
+6872510886fc
+24a43c92be8d