KevinMidboe/mktxp-no-cli
1
0
Fork 0
mirror of https://github.com/KevinMidboe/mktxp-no-cli.git synced 2025-10-29 17:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

RouterOS version 7.13 support

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2023-12-06 17:47:24 +01:00
parent 039be422ba
commit aea9ce2855
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -87,6 +87,8 @@ The default configuration file comes with a sample configuration, making it easy
capsman = True # CAPsMAN general metrics capsman = True # CAPsMAN general metrics
capsman_clients = True # CAPsMAN clients metrics capsman_clients = True # CAPsMAN clients metrics
kid_control_devices = False # Kid Control metrics
user = True # Active Users metrics user = True # Active Users metrics
queue = True # Queues metrics queue = True # Queues metrics

2
mktxp/cli/output/wifi_out.py
View File

@@ -43,7 +43,7 @@ class WirelessOutput:
output_records = 0 output_records = 0
registration_records = len(registration_records) registration_records = len(registration_records)
output_entry = BaseOutputProcessor.OutputWiFiEntry \ output_entry = BaseOutputProcessor.OutputWiFiEntry \
if WirelessMetricsDataSource.is_legacy(router_entry) else BaseOutputProcessor.OutputWirelessEntry if not WirelessMetricsDataSource.is_legacy(router_entry) else BaseOutputProcessor.OutputWirelessEntry
output_table = BaseOutputProcessor.output_table(output_entry) output_table = BaseOutputProcessor.output_table(output_entry)
for key in dhcp_rt_by_interface.keys(): for key in dhcp_rt_by_interface.keys():

11
mktxp/datasource/wireless_ds.py
View File

@@ -23,6 +23,9 @@ class WirelessMetricsDataSource:
WIRELESS = 'wireless' WIRELESS = 'wireless'
WIFI = 'wifi' WIFI = 'wifi'
WIFI_PACKAGE = 'wifi-qcom'
WIFI_AC_PACKAGE = 'wifi-qcom-ac'
@staticmethod @staticmethod
def metric_records(router_entry, *, metric_labels = None, add_router_id = True): def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
if metric_labels is None: if metric_labels is None:
@@ -46,12 +49,14 @@ class WirelessMetricsDataSource:
@staticmethod @staticmethod
def wireless_package(router_entry): def wireless_package(router_entry):
if not router_entry.wifi_package: if not router_entry.wifi_package:
if PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIRELESS): if PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFI_PACKAGE):
router_entry.wifi_package = WirelessMetricsDataSource.WIRELESS router_entry.wifi_package = WirelessMetricsDataSource.WIFI
elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFI_AC_PACKAGE):
router_entry.wifi_package = WirelessMetricsDataSource.WIFI
elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFIWAVE2): elif PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFIWAVE2):
router_entry.wifi_package = WirelessMetricsDataSource.WIFIWAVE2 router_entry.wifi_package = WirelessMetricsDataSource.WIFIWAVE2
else: else:
router_entry.wifi_package = WirelessMetricsDataSource.WIFI router_entry.wifi_package = WirelessMetricsDataSource.WIRELESS
return router_entry.wifi_package return router_entry.wifi_package
@staticmethod @staticmethod