connections stats collector / cmd output, remote dhcp resolver, fixes / optimizations

mktxp/datasource/connection_ds.py

@@ -12,6 +12,7 @@
 ## GNU General Public License for more details.
 
 
+from collections import namedtuple
 from mktxp.datasource.base_ds import BaseDSProcessor
 
 
@@ -33,3 +34,44 @@ class IPConnectionDatasource:
         except Exception as exc:
             print(f'Error getting IP connection info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
             return None
+
+
+class IPConnectionStatsDatasource:
+    ''' IP connections stats data provider
+    '''             
+    @staticmethod
+    def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
+        if metric_labels is None:
+            metric_labels = []        
+        try:
+            connection_records = router_entry.api_connection.router_api().get_resource('/ip/firewall/connection/').call('print', \
+                                                                                            {'proplist':'src-address,dst-address,protocol'})
+             # calculate number of connections per src-address
+            connections_per_src_address = {}
+            for connection_record in connection_records:
+                #address, port = (connection_record['src-address'].split(':') + [None])[:2]
+                address = connection_record['src-address'].split(':')[0]
+                destination = f"{connection_record.get('dst-address')}({connection_record.get('protocol')})"
+
+                count, destinations = 0, set()
+                if connections_per_src_address.get(address):
+                    count, destinations = connections_per_src_address[address]
+                count += 1
+                destinations.add(destination)
+                connections_per_src_address[address] = ConnStatsEntry(count, destinations)
+
+            # compile connections-per-interface records
+            records = []
+            for key, entry in connections_per_src_address.items():
+                record = {'src_address': key, 'connection_count': entry.count, 'dst_addresses': ', '.join(entry.destinations)}
+                if add_router_id: 
+                    for router_key, router_value in router_entry.router_id.items():
+                        record[router_key] = router_value
+                records.append(record)
+            return records 
+        except Exception as exc:
+            print(f'Error getting IP connection stats info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
+            return None
+
+
+ConnStatsEntry = namedtuple('ConnStatsEntry', ['count', 'destinations'])

mktxp/datasource/dhcp_ds.py

@@ -20,12 +20,17 @@ class DHCPMetricsDataSource:
     ''' DHCP Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
-        if metric_labels is None:
-            metric_labels = []                
+    def metric_records(router_entry, *, metric_labels = None, add_router_id = True, dhcp_cache = True, translate = True, bound = False):
+        if metric_labels is None or dhcp_cache:
+            metric_labels = ['host_name', 'comment', 'active_address', 'address', 'mac_address', 'server', 'expires_after']  
+
+        if dhcp_cache and router_entry.dhcp_records:
+            return router_entry.dhcp_records
         try:
-            #dhcp_lease_records = router_entry.api_connection.router_api().get_resource('/ip/dhcp-server/lease').get(status='bound')
-            dhcp_lease_records = router_entry.api_connection.router_api().get_resource('/ip/dhcp-server/lease').call('print', {'active':''})
+            if bound:
+                dhcp_lease_records = router_entry.dhcp_entry.api_connection.router_api().get_resource('/ip/dhcp-server/lease').get(status='bound')
+            else:
+                dhcp_lease_records = router_entry.dhcp_entry.api_connection.router_api().get_resource('/ip/dhcp-server/lease').call('print', {'active':''})
 
             # translation rules
             translation_table = {}
@@ -33,12 +38,16 @@ class DHCPMetricsDataSource:
                 translation_table['comment'] = lambda c: c if c else ''           
             if 'host_name' in metric_labels:
                 translation_table['host_name'] = lambda c: c if c else ''           
-            if 'expires_after' in metric_labels:
+            if 'expires_after' in metric_labels and translate:
                 translation_table['expires_after'] = lambda c: parse_mkt_uptime(c) if c else 0       
             if 'active_address' in metric_labels:
                 translation_table['active_address'] = lambda c: c if c else ''        
 
-            return BaseDSProcessor.trimmed_records(router_entry, router_records = dhcp_lease_records, metric_labels = metric_labels, add_router_id = add_router_id, translation_table = translation_table)
+            records = BaseDSProcessor.trimmed_records(router_entry, router_records = dhcp_lease_records, metric_labels = metric_labels, add_router_id = add_router_id, translation_table = translation_table)
+            if dhcp_cache:
+                router_entry.dhcp_records = records
+            return records
+            
         except Exception as exc:
             print(f'Error getting dhcp info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
             return None

mktxp/datasource/wireless_ds.py

@@ -52,11 +52,3 @@ class WirelessMetricsDataSource:
     @staticmethod
     def wifiwave2_installed(router_entry):
         return WirelessMetricsDataSource.wireless_package(router_entry) == WirelessMetricsDataSource.WIFIWAVE2
-
-    @staticmethod
-    def dhcp_entry(router_entry):
-        if router_entry.dhcp_entry:
-            return router_entry.dhcp_entry
-        return router_entry
-
-