bug fixes

mktxp/collector/connection_collector.py

@@ -24,7 +24,7 @@ class IPConnectionCollector(BaseCollector):
         if not router_entry.config_entry.connections:
            return
            
-        connection_records = IPConnectionDatasource.metric_records(router_entry, metric_labels = [])
+        connection_records = IPConnectionDatasource.metric_records(router_entry)
         if connection_records:
 
             connection_metrics = BaseCollector.gauge_collector('ip_connections_total', 'Number of IP connections', connection_records, 'count',)

mktxp/datasource/base_ds.py

@@ -17,7 +17,13 @@ class BaseDSProcessor:
     '''             
 
     @staticmethod
-    def trimmed_records(router_entry, *, router_records = [], metric_labels = [], add_router_id = True, translation_table = {}):
+    def trimmed_records(router_entry, *, router_records = None, metric_labels = None, add_router_id = True, translation_table = None):
+        if router_records is None:
+            router_records = []
+        if metric_labels is None:
+            metric_labels = []   
+        if translation_table is None:
+            translation_table = {}                 
         dash2_ = lambda x : x.replace('-', '_')
         if len(metric_labels) == 0 and len(router_records) > 0:
             metric_labels = [dash2_(key) for key in router_records[0].keys()]

mktxp/datasource/capsman_ds.py

@@ -19,7 +19,9 @@ class CapsmanCapsMetricsDataSource:
     ''' Caps Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             remote_caps_records = router_entry.api_connection.router_api().get_resource('/caps-man/remote-cap').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = remote_caps_records, metric_labels = metric_labels)
@@ -32,7 +34,9 @@ class CapsmanRegistrationsMetricsDataSource:
     ''' Capsman Registrations Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = [],  add_router_id = True):
+    def metric_records(router_entry, *, metric_labels = None,  add_router_id = True):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             registration_table_records = router_entry.api_connection.router_api().get_resource('/caps-man/registration-table').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = registration_table_records, metric_labels = metric_labels, add_router_id = add_router_id)

mktxp/datasource/connection_ds.py

@@ -19,7 +19,9 @@ class IPConnectionDatasource:
     ''' IP connections data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []        
         try:
             answer = router_entry.api_connection.router_api().get_binary_resource('/ip/firewall/connection/').call('print', {'count-only': b''})
             # answer looks and feels like an empty list: [], but it has a special attribute `done_message`

mktxp/datasource/dhcp_ds.py

@@ -20,7 +20,9 @@ class DHCPMetricsDataSource:
     ''' DHCP Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = [], add_router_id = True):
+    def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
+        if metric_labels is None:
+            metric_labels = []                
         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':''})

mktxp/datasource/firewall_ds.py

@@ -19,7 +19,9 @@ class FirewallMetricsDataSource:
     ''' Firewall Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = [], raw = False, matching_only = True):
+    def metric_records(router_entry, *, metric_labels = None, raw = False, matching_only = True):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             filter_path = '/ip/firewall/filter' if not raw else '/ip/firewall/raw'
             firewall_records = router_entry.api_connection.router_api().get_resource(filter_path).call('print', {'stats':'', 'all':''})

mktxp/datasource/health_ds.py

@@ -19,7 +19,9 @@ class HealthMetricsDataSource:
     ''' Health Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             health_records = router_entry.api_connection.router_api().get_resource('/system/health').get()
             for record in health_records:

mktxp/datasource/identity_ds.py

@@ -19,7 +19,9 @@ class IdentityMetricsDataSource:
     ''' Identity Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             identity_records = router_entry.api_connection.router_api().get_resource('/system/identity').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = identity_records, metric_labels = metric_labels)

mktxp/datasource/interface_ds.py

@@ -19,7 +19,9 @@ class InterfaceTrafficMetricsDataSource:
     ''' Interface Traffic Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             traffic_records = router_entry.api_connection.router_api().get_resource('/interface').get(running='yes', disabled='no')
             return BaseDSProcessor.trimmed_records(router_entry, router_records = traffic_records, metric_labels = metric_labels)
@@ -32,7 +34,9 @@ class InterfaceMonitorMetricsDataSource:
     ''' Interface Monitor Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = [], kind = 'ethernet', include_comments = False, running_only = True):
+    def metric_records(router_entry, *, metric_labels = None, kind = 'ethernet', include_comments = False, running_only = True):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             interfaces = router_entry.api_connection.router_api().get_resource(f'/interface/{kind}').get()
             interface_names = [(interface['name'], interface.get('comment'), interface.get('running')) for interface in interfaces]

mktxp/datasource/netwatch_ds.py

@@ -19,7 +19,9 @@ class NetwatchMetricsDataSource:
     ''' Netwatch Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             netwatch_records = router_entry.api_connection.router_api().get_resource('/tool/netwatch').get(disabled='false')
             if 'name' in metric_labels:

mktxp/datasource/poe_ds.py

@@ -19,7 +19,9 @@ class POEMetricsDataSource:
     ''' POE Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, include_comments = False, metric_labels = []):
+    def metric_records(router_entry, *, include_comments = False, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             poe_records = router_entry.api_connection.router_api().get_resource('/interface/ethernet/poe').get()
             for int_num, poe_record in enumerate(poe_records):

mktxp/datasource/pool_ds.py

@@ -19,7 +19,9 @@ class PoolMetricsDataSource:
     ''' Pool Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             pool_records = router_entry.api_connection.router_api().get_resource('/ip/pool').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = pool_records, metric_labels = metric_labels)
@@ -32,7 +34,9 @@ class PoolUsedMetricsDataSource:
     ''' Pool/Used Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             pool_used_records = router_entry.api_connection.router_api().get_resource('/ip/pool/used').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = pool_used_records, metric_labels = metric_labels)

mktxp/datasource/route_ds.py

@@ -19,7 +19,9 @@ class RouteMetricsDataSource:
     ''' Routes Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             route_records = router_entry.api_connection.router_api().get_resource('/ip/route').get(active='yes')
             return BaseDSProcessor.trimmed_records(router_entry, router_records = route_records, metric_labels = metric_labels)

mktxp/datasource/routerboard_ds.py

@@ -19,7 +19,9 @@ class RouterboardMetricsDataSource:
     ''' Routerboard Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             routerboard_records = router_entry.api_connection.router_api().get_resource('/system/routerboard').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = routerboard_records, metric_labels = metric_labels)

mktxp/datasource/system_resource_ds.py

@@ -19,7 +19,9 @@ class SystemResourceMetricsDataSource:
     ''' System Resource Metrics data provider
     '''             
     @staticmethod    
-    def metric_records(router_entry, *, metric_labels = []):
+    def metric_records(router_entry, *, metric_labels = None):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             system_resource_records = router_entry.api_connection.router_api().get_resource('/system/resource').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = system_resource_records, metric_labels = metric_labels)

mktxp/datasource/wireless_ds.py

@@ -19,7 +19,9 @@ class WirelessMetricsDataSource:
     ''' Wireless Metrics data provider
     '''             
     @staticmethod
-    def metric_records(router_entry, *, metric_labels = [], add_router_id = True):
+    def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
+        if metric_labels is None:
+            metric_labels = []                
         try:
             registration_table_records = router_entry.api_connection.router_api().get_resource('/interface/wireless/registration-table').get()
             return BaseDSProcessor.trimmed_records(router_entry, router_records = registration_table_records, metric_labels = metric_labels, add_router_id = add_router_id)

setup.py

@@ -20,7 +20,7 @@ with open(path.join(pkg_dir, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='mktxp',
-    version='0.35',
+    version='0.36',
 
     url='https://github.com/akpw/mktxp',