kid control fixes

akpw · Dec 18, 2023 · b38d099 · b38d099
1 parent 39ec208
commit b38d099
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 31 deletions.
diff --git a/mktxp/collector/kid_control_device_collector.py b/mktxp/collector/kid_control_device_collector.py
@@ -41,19 +41,19 @@ def collect(router_entry):
                         record[label] = KidDeviceCollector._translated_values(label, value)
 
             yield BaseCollector.info_collector('kid_control_device', 'Kid-control device Info', records, info_labels)
-            yield BaseCollector.gauge_collector('kid_control_device_bytes_down', 'Kid-control device bytes down', records, 'bytes_down', ['name', 'mac_address'])
-            yield BaseCollector.gauge_collector('kid_control_device_bytes_up', 'Kid-control device bytes up', records, 'bytes_up', ['name', 'mac_address'])
-            yield BaseCollector.gauge_collector('kid_control_device_rate_down', 'Kid-control device rate down', records, 'rate_down', ['name', 'mac_address'])
-            yield BaseCollector.gauge_collector('kid_control_device_rate_up', 'Kid-control device rate up', records, 'rate_up', ['name', 'mac_address'])
-            yield BaseCollector.gauge_collector('kid_control_device_idle_time', 'Kid-control device idle time', records, 'idle_time', ['name', 'mac_address'])
+            yield BaseCollector.gauge_collector('kid_control_device_bytes_down', 'Number of received bytes', records, 'bytes_down', ['name', 'mac_address', 'user'])
+            yield BaseCollector.gauge_collector('kid_control_device_bytes_up', 'Number of transmitted bytes', records, 'bytes_up', ['name', 'mac_address', 'user'])
+            yield BaseCollector.gauge_collector('kid_control_device_rate_down', 'Device rate down', records, 'rate_down', ['name', 'mac_address', 'user'])
+            yield BaseCollector.gauge_collector('kid_control_device_rate_up', 'Device rate up', records, 'rate_up', ['name', 'mac_address', 'user'])
+            yield BaseCollector.gauge_collector('kid_control_device_idle_time', 'Device idle time', records, 'idle_time', ['name', 'mac_address', 'user'])
 
     # Helpers
     @staticmethod
     def _translated_values(monitor_label, value):
         try:
             return {
-                'rate_up': lambda value: KidDeviceCollector._rates(value),
-                'rate_down': lambda value: KidDeviceCollector._rates(value),
+                'rate_up': lambda value: BaseOutputProcessor.parse_rates(value),
+                'rate_down': lambda value: BaseOutputProcessor.parse_rates(value),
                 'idle_time': lambda value: BaseOutputProcessor.parse_timedelta_seconds(value),
                 'blocked': lambda value: '1' if value == 'true' else '0',
                 'limited': lambda value: '1' if value == 'true' else '0',
@@ -63,21 +63,3 @@ def _translated_values(monitor_label, value):
         except KeyError:
             # default to just returning the value
             return value
-
-    @staticmethod
-    def _rates(rate_option):
-        # according mikrotik docs, an interface rate should be one of these
-        rate_value = {
-            '10Mbps': '10',
-            '100Mbps': '100',
-            '1Gbps': '1000',
-            '2.5Gbps': '2500',
-            '5Gbps': '5000',
-            '10Gbps': '10000',
-            '40Gbps': '40000'
-        }.get(rate_option, None)
-        if rate_value:
-            return rate_value
-
-        # ...or just calculate in case it's not
-        return BaseOutputProcessor.parse_interface_rate(rate_option)
diff --git a/mktxp/datasource/kid_control_device_ds.py b/mktxp/datasource/kid_control_device_ds.py
@@ -24,7 +24,11 @@ def metric_records(router_entry, *, metric_labels=None):
         if metric_labels is None:
             metric_labels = []
         try:
-            device_records = router_entry.api_connection.router_api().get_resource('/ip/kid-control/device').get()
+            device_records = []
+            records = router_entry.api_connection.router_api().get_resource('/ip/kid-control/device').get()
+            for record in records:
+                if record.get('user'):
+                    device_records.append(record)
             return BaseDSProcessor.trimmed_records(router_entry, router_records=device_records, metric_labels=metric_labels)
         except Exception as exc:
             print(

diff --git a/mktxp/flow/processor/output.py b/mktxp/flow/processor/output.py
@@ -97,11 +97,11 @@ def resolve_dhcp(router_entry, registration_record, id_key = 'mac_address', reso
 
     @staticmethod
     def parse_rates(rate):
-        wifi_rates_rgx = config_handler.re_compiled.get('wifi_rates_rgx')
-        if not wifi_rates_rgx:
-            wifi_rates_rgx = re.compile(r'(\d*(?:\.\d*)?)([GgMmKk]bps?)')
-            config_handler.re_compiled['wifi_rates_rgx'] = wifi_rates_rgx
-        rc = wifi_rates_rgx.search(rate)
+        rates_rgx = config_handler.re_compiled.get('rates_rgx')
+        if not rates_rgx:
+            rates_rgx = re.compile(r'(\d*(?:\.\d*)?)([GgMmKk]bps?)')
+            config_handler.re_compiled['rates_rgx'] = rates_rgx
+        rc = rates_rgx.search(rate)
         return f'{int(float(rc[1]))} {rc[2]}' if rc and len(rc.groups()) == 2 else rate
 
     @staticmethod