KevinMidboe/mktxp-no-cli
1
0
Fork 0
mirror of https://github.com/KevinMidboe/mktxp-no-cli.git synced 2026-04-25 08:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

connections stats collector / cmd output, remote dhcp resolver, fixes / optimizations

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2023-02-04 20:48:51 +01:00
parent 18ddbe3311
commit 9a381d028c
21 changed files with 351 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mktxp/cli/output/capsman_out.py
View File

@@ -13,8 +13,6 @@
from mktxp.flow.processor.output import BaseOutputProcessor
from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
from mktxp.datasource.capsman_ds import CapsmanRegistrationsMetricsDataSource
class CapsmanOutput:
@@ -29,13 +27,9 @@ class CapsmanOutput:
return
# translate / trim / augment registration records
dhcp_lease_labels = ['host_name', 'comment', 'address', 'mac_address']
dhcp_entry = WirelessMetricsDataSource.dhcp_entry(router_entry)
dhcp_lease_records = DHCPMetricsDataSource.metric_records(dhcp_entry, metric_labels = dhcp_lease_labels, add_router_id = False)
dhcp_rt_by_interface = {}
for registration_record in sorted(registration_records, key = lambda rt_record: rt_record['rx_signal'], reverse=True):
BaseOutputProcessor.augment_record(router_entry, registration_record, dhcp_lease_records)
BaseOutputProcessor.augment_record(router_entry, registration_record)
interface = registration_record['interface']
if interface in dhcp_rt_by_interface.keys():

49
mktxp/cli/output/conn_stats_out.py Normal file
View File

@@ -0,0 +1,49 @@
# coding=utf8
## Copyright (c) 2020 Arseniy Kuznetsov
##
## This program is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License
## as published by the Free Software Foundation; either version 2
## of the License, or (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
from mktxp.flow.processor.output import BaseOutputProcessor
from mktxp.datasource.connection_ds import IPConnectionStatsDatasource
class ConnectionsStatsOutput:
''' Connections Stats Output
'''
@staticmethod
def clients_summary(router_entry):
connection_records = IPConnectionStatsDatasource.metric_records(router_entry, add_router_id = False)
if not connection_records:
print('No connection stats records')
return
conn_cnt = 0
output_records = []
for registration_record in sorted(connection_records, key = lambda rt_record: rt_record['connection_count'], reverse=True):
BaseOutputProcessor.resolve_dhcp(router_entry, registration_record, id_key = 'src_address', resolve_address = False)
output_records.append(registration_record)
conn_cnt += registration_record['connection_count']
output_records_cnt = 0
output_entry = BaseOutputProcessor.OutputConnStatsEntry
output_table = BaseOutputProcessor.output_table(output_entry)
for record in output_records:
output_table.add_row(output_entry(**record))
output_table.add_row(output_entry())
output_records_cnt += 1
print (output_table.draw())
print(f'Distinct source addresses: {output_records_cnt}')
print(f'Total open connections: {conn_cnt}', '\n')

4
mktxp/cli/output/dhcp_out.py
View File

@@ -22,13 +22,13 @@ class DHCPOutput:
@staticmethod
def clients_summary(router_entry):
dhcp_lease_labels = ['host_name', 'comment', 'active_address', 'address', 'mac_address', 'server', 'expires_after']
dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels, add_router_id = False)
dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels, add_router_id = False, translate = False, dhcp_cache = False)
if not dhcp_lease_records:
print('No DHCP registration records')
return
dhcp_by_server = {}
for dhcp_lease_record in sorted(dhcp_lease_records, key = lambda dhcp_record: dhcp_record['active_address'], reverse=True):
for dhcp_lease_record in sorted(dhcp_lease_records, key = lambda dhcp_record: dhcp_record['address'], reverse=True):
server = dhcp_lease_record.get('server', 'all')
if server == 'all':
dhcp_lease_record['server'] = server

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

@@ -13,9 +13,7 @@
from mktxp.flow.processor.output import BaseOutputProcessor
from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
from mktxp.flow.router_entries_handler import RouterEntriesHandler
class WirelessOutput:
@@ -30,15 +28,11 @@ class WirelessOutput:
return
# translate / trim / augment registration records
dhcp_lease_labels = ['host_name', 'comment', 'address', 'mac_address']
dhcp_entry = WirelessMetricsDataSource.dhcp_entry(router_entry)
dhcp_lease_records = DHCPMetricsDataSource.metric_records(dhcp_entry, metric_labels = dhcp_lease_labels, add_router_id = False)
dhcp_rt_by_interface = {}
key = lambda rt_record: rt_record['signal_strength'] if rt_record.get('signal_strength') else rt_record['interface']
for registration_record in sorted(registration_records, key = key, reverse=True):
BaseOutputProcessor.augment_record(router_entry, registration_record, dhcp_lease_records)
BaseOutputProcessor.augment_record(router_entry, registration_record)
interface = registration_record['interface']
if interface in dhcp_rt_by_interface.keys():