From d813138bd84810b4cc2224605e47948c6340f54e Mon Sep 17 00:00:00 2001 From: Leon Morten Richter Date: Fri, 21 Oct 2022 13:53:13 +0200 Subject: [PATCH] adds capsman interface datasource --- mktxp/collector/capsman_collector.py | 10 ++++++++-- mktxp/datasource/capsman_ds.py | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/mktxp/collector/capsman_collector.py b/mktxp/collector/capsman_collector.py index 9b5fcc8..2cfe810 100644 --- a/mktxp/collector/capsman_collector.py +++ b/mktxp/collector/capsman_collector.py @@ -16,7 +16,7 @@ from mktxp.cli.config.config import MKTXPConfigKeys from mktxp.flow.processor.output import BaseOutputProcessor from mktxp.collector.base_collector import BaseCollector from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource -from mktxp.datasource.capsman_ds import CapsmanCapsMetricsDataSource, CapsmanRegistrationsMetricsDataSource +from mktxp.datasource.capsman_ds import CapsmanCapsMetricsDataSource, CapsmanRegistrationsMetricsDataSource, CapsmanInterfacesDatasource class CapsmanCollector(BaseCollector): @@ -68,5 +68,11 @@ class CapsmanCollector(BaseCollector): registration_metrics = BaseCollector.info_collector('capsman_clients_devices', 'Registered client devices info', registration_records, ['dhcp_name', 'dhcp_address', 'rx_signal', 'ssid', 'tx_rate', 'rx_rate', 'interface', 'mac_address', 'uptime']) yield registration_metrics - + + + remote_cap_interface_labels = ['name', 'configuration', 'mac_address', 'current_state', 'current_channel', 'current_registered_clients'] + remote_cap_interface_records = CapsmanInterfacesDatasource.metric_records(router_entry, metric_labels = remote_cap_interface_labels) + if remote_cap_interface_records: + remote_caps_metrics = BaseCollector.info_collector('capsman_interfaces', 'CAPsMAN interfaces', remote_cap_interface_records, remote_cap_interface_labels) + yield remote_caps_metrics diff --git a/mktxp/datasource/capsman_ds.py b/mktxp/datasource/capsman_ds.py index 2fc8759..42b3b14 100644 --- a/mktxp/datasource/capsman_ds.py +++ b/mktxp/datasource/capsman_ds.py @@ -14,7 +14,6 @@ from mktxp.datasource.base_ds import BaseDSProcessor - class CapsmanCapsMetricsDataSource: ''' Caps Metrics data provider ''' @@ -43,3 +42,19 @@ class CapsmanRegistrationsMetricsDataSource: except Exception as exc: print(f'Error getting caps-man registration table info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}') return None + + +class CapsmanInterfacesDatasource: + ''' Data provider for CAPsMaN interfaces + ''' + + @staticmethod + def metric_records(router_entry, *, metric_labels = None): + if metric_labels is None: + metric_labels = [] + try: + caps_interfaces = router_entry.api_connection.router_api().get_resource('/caps-man/interface').get() + return BaseDSProcessor.trimmed_records(router_entry, router_records = caps_interfaces, metric_labels = metric_labels) + except Exception as exc: + print(f'Error getting caps-man interfaces info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}') + return None