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

add IPv6 reachable addresses

Browse Source
This commit is contained in:
Leon Morten Richter
2022-11-13 13:36:58 +01:00
parent 0a500f12c4
commit 70e5a64469
6 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mktxp/cli/config/config.py
View File

@@ -50,6 +50,7 @@ class MKTXPConfigKeys:
FE_CAPSMAN_CLIENTS_KEY = 'capsman_clients'
FE_POE_KEY = 'poe'
FE_PUBLIC_IP_KEY = 'public_ip'
FE_IPV6_NEIGHBOR_KEY = 'ipv6_neighbor'
FE_NETWATCH_KEY = 'netwatch'
MKTXP_SOCKET_TIMEOUT = 'socket_timeout'
@@ -86,7 +87,7 @@ class MKTXPConfigKeys:
BOOLEAN_KEYS_YES = {FE_DHCP_KEY, FE_DHCP_LEASE_KEY, FE_DHCP_POOL_KEY, FE_IP_CONNECTIONS_KEY, FE_INTERFACE_KEY, FE_FIREWALL_KEY,
FE_MONITOR_KEY, FE_ROUTE_KEY, MKTXP_USE_COMMENTS_OVER_NAMES,
FE_WIRELESS_KEY, FE_WIRELESS_CLIENTS_KEY, FE_CAPSMAN_KEY, FE_CAPSMAN_CLIENTS_KEY, FE_POE_KEY,
FE_NETWATCH_KEY, FE_PUBLIC_IP_KEY}
FE_NETWATCH_KEY, FE_PUBLIC_IP_KEY, FE_IPV6_NEIGHBOR_KEY}
SYSTEM_BOOLEAN_KEYS_YES = {MKTXP_BANDWIDTH_KEY}
SYSTEM_BOOLEAN_KEYS_NO = {MKTXP_VERBOSE_MODE}
@@ -106,7 +107,7 @@ class ConfigEntry:
MKTXPConfigKeys.FE_DHCP_KEY, MKTXPConfigKeys.FE_DHCP_LEASE_KEY, MKTXPConfigKeys.FE_DHCP_POOL_KEY, MKTXPConfigKeys.FE_INTERFACE_KEY, MKTXPConfigKeys.FE_FIREWALL_KEY,
MKTXPConfigKeys.FE_MONITOR_KEY, MKTXPConfigKeys.FE_ROUTE_KEY, MKTXPConfigKeys.FE_WIRELESS_KEY, MKTXPConfigKeys.FE_WIRELESS_CLIENTS_KEY, MKTXPConfigKeys.FE_IP_CONNECTIONS_KEY,
MKTXPConfigKeys.FE_CAPSMAN_KEY, MKTXPConfigKeys.FE_CAPSMAN_CLIENTS_KEY, MKTXPConfigKeys.FE_POE_KEY, MKTXPConfigKeys.FE_NETWATCH_KEY, MKTXPConfigKeys.MKTXP_USE_COMMENTS_OVER_NAMES,
MKTXPConfigKeys.FE_PUBLIC_IP_KEY,
MKTXPConfigKeys.FE_PUBLIC_IP_KEY, MKTXPConfigKeys.FE_IPV6_NEIGHBOR_KEY
])
MKTXPSystemEntry = namedtuple('MKTXPSystemEntry', [MKTXPConfigKeys.PORT_KEY, MKTXPConfigKeys.MKTXP_SOCKET_TIMEOUT,
MKTXPConfigKeys.MKTXP_INITIAL_DELAY, MKTXPConfigKeys.MKTXP_MAX_DELAY,

1
mktxp/cli/config/mktxp.conf
View File

@@ -33,6 +33,7 @@
monitor = True # Interface monitor metrics
poe = True # POE metrics
public_ip = True # Public IP metrics
ipv6_neighbor = False # Reachable IPv6 Neighbors
route = True # Routes metrics
wireless = True # WLAN general metrics
wireless_clients = True # WLAN clients metrics

40
mktxp/collector/ipv6_neighbor_collector.py Normal file
View File

@@ -0,0 +1,40 @@
# 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.collector.base_collector import BaseCollector
from mktxp.datasource.ipv6_neighbor_ds import IPv6NeighborDataSource
class IPv6NeighborCollector(BaseCollector):
'''IPv6 Neighbor Collector'''
@staticmethod
def collect(router_entry):
if not router_entry.config_entry.ipv6_neighbor:
return
metric_labels = ['address', 'interface', 'mac_address', 'status']
records = IPv6NeighborDataSource.metric_records(
router_entry,
metric_labels=metric_labels
)
metrics = BaseCollector.gauge_collector(
'ipv6_neighbor_info',
'Reachable IPv6 neighbors',
records,
'ipv6_neighbor',
metric_labels=metric_labels
)
yield metrics

23
mktxp/datasource/ipv6_neighbor_ds.py Normal file
View File

@@ -0,0 +1,23 @@
# 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.datasource.base_ds import BaseDSProcessor
class IPv6NeighborDataSource:
def metric_records(router_entry, metric_labels):
metric_labels = metric_labels or []
records = router_entry.api_connection.router_api().get_resource('/ipv6/neighbor').get(status='reachable')
return BaseDSProcessor.trimmed_records(router_entry, router_records=records, metric_labels=metric_labels, )

3
mktxp/flow/collector_registry.py
View File

@@ -19,6 +19,7 @@ from mktxp.collector.interface_collector import InterfaceCollector
from mktxp.collector.health_collector import HealthCollector
from mktxp.collector.identity_collector import IdentityCollector
from mktxp.collector.public_ip_collector import PublicIPAddressCollector
from mktxp.collector.ipv6_neighbor_collector import IPv6NeighborCollector
from mktxp.collector.monitor_collector import MonitorCollector
from mktxp.collector.poe_collector import POECollector
from mktxp.collector.netwatch_collector import NetwatchCollector
@@ -46,6 +47,8 @@ class CollectorRegistry:
self.register('HealthCollector', HealthCollector.collect)
self.register('PublicIPAddressCollector', PublicIPAddressCollector.collect)
self.register('IPv6NeighborCollector', IPv6NeighborCollector.collect)
self.register('DHCPCollector', DHCPCollector.collect)
self.register('IPConnectionCollector', IPConnectionCollector.collect)
self.register('PoolCollector', PoolCollector.collect)

1
mktxp/flow/router_entry.py
View File

@@ -31,6 +31,7 @@ class RouterEntry:
'SystemResourceCollector': 0,
'HealthCollector': 0,
'PublicIPAddressCollector': 0,
'IPv6NeighborCollector': 0,
'DHCPCollector': 0,
'PoolCollector': 0,
'IPConnectionCollector': 0,