Merge pull request #44 from M0r13n/add-capsman-interfaces

adds capsman interface datasource
This commit is contained in:
Arseniy Kuznetsov
2022-10-23 03:33:50 -05:00
committed by GitHub
2 changed files with 24 additions and 3 deletions

View File

@@ -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

View File

@@ -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