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

feat: adds additional metrics for DHCP: last-seen, client-id, active-mac-address

Browse Source
This commit is contained in:
Leon Morten Richter
2024-03-24 11:41:53 +01:00
parent 0fe5417f48
commit 38cca12215
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mktxp/collector/dhcp_collector.py
View File

@@ -25,7 +25,7 @@ class DHCPCollector(BaseCollector):
if not router_entry.config_entry.dhcp: if not router_entry.config_entry.dhcp:
return return
dhcp_lease_labels = ['active_address', 'address', 'mac_address', 'host_name', 'comment', 'server', 'expires_after'] dhcp_lease_labels = ['active_address', 'address', 'mac_address', 'host_name', 'comment', 'server', 'expires_after', 'last_seen', 'client_id', 'active_mac_address']
dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels) dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels)
if dhcp_lease_records: if dhcp_lease_records:
# calculate number of leases per DHCP server # calculate number of leases per DHCP server
@@ -56,4 +56,3 @@ class DHCPCollector(BaseCollector):
#if router_entry.config_entry.dhcp_lease: #if router_entry.config_entry.dhcp_lease:
# dhcp_lease_metrics = BaseCollector.info_collector('dhcp_lease', 'DHCP Active Leases', dhcp_lease_records, dhcp_lease_labels) # dhcp_lease_metrics = BaseCollector.info_collector('dhcp_lease', 'DHCP Active Leases', dhcp_lease_records, dhcp_lease_labels)
# yield dhcp_lease_metrics # yield dhcp_lease_metrics

4
mktxp/datasource/dhcp_ds.py
View File

@@ -22,7 +22,7 @@ class DHCPMetricsDataSource:
@staticmethod @staticmethod
def metric_records(router_entry, *, metric_labels = None, add_router_id = True, dhcp_cache = True, translate = True, bound = False): def metric_records(router_entry, *, metric_labels = None, add_router_id = True, dhcp_cache = True, translate = True, bound = False):
if metric_labels is None or dhcp_cache: if metric_labels is None or dhcp_cache:
metric_labels = ['host_name', 'comment', 'active_address', 'address', 'mac_address', 'server', 'expires_after'] metric_labels = ['host_name', 'comment', 'active_address', 'address', 'mac_address', 'server', 'expires_after', 'last_seen', 'client_id', 'active_mac_address']
if dhcp_cache and router_entry.dhcp_records: if dhcp_cache and router_entry.dhcp_records:
return router_entry.dhcp_records return router_entry.dhcp_records
@@ -51,5 +51,3 @@ class DHCPMetricsDataSource:
except Exception as exc: except Exception as exc:
print(f'Error getting dhcp info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}') print(f'Error getting dhcp info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
return None return None