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

optional ipv6 firewall, disabled by default

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2022-11-14 20:50:26 +01:00
parent 2953cf418a
commit 9a30555e39
2 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,3 +23,4 @@
bandwidth_test_interval = 420 # Interval for colllecting bandwidth metrics bandwidth_test_interval = 420 # Interval for colllecting bandwidth metrics
verbose_mode = False # Set it on for troubleshooting verbose_mode = False # Set it on for troubleshooting

7
mktxp/collector/firewall_collector.py
View File

@@ -22,13 +22,11 @@ class FirewallCollector(BaseCollector):
''' '''
@staticmethod @staticmethod
def collect(router_entry): def collect(router_entry):
if not router_entry.config_entry.firewall:
return
# Initialize all pool counts, including those currently not used # Initialize all pool counts, including those currently not used
# These are the same for both IPv4 and IPv6 # These are the same for both IPv4 and IPv6
firewall_labels = ['chain', 'action', 'bytes', 'comment', 'log'] firewall_labels = ['chain', 'action', 'bytes', 'comment', 'log']
if router_entry.config_entry.firewall:
# ~*~*~*~*~*~ IPv4 ~*~*~*~*~*~ # ~*~*~*~*~*~ IPv4 ~*~*~*~*~*~
firewall_filter_records = FirewallMetricsDataSource.metric_records_ipv4(router_entry, metric_labels = firewall_labels) firewall_filter_records = FirewallMetricsDataSource.metric_records_ipv4(router_entry, metric_labels = firewall_labels)
if firewall_filter_records: if firewall_filter_records:
@@ -43,8 +41,7 @@ class FirewallCollector(BaseCollector):
yield firewall_raw_metrics yield firewall_raw_metrics
# ~*~*~*~*~*~ IPv6 ~*~*~*~*~*~ # ~*~*~*~*~*~ IPv6 ~*~*~*~*~*~
if not router_entry.config_entry.ipv6_firewall: if router_entry.config_entry.ipv6_firewall:
return
firewall_filter_records_ipv6 = FirewallMetricsDataSource.metric_records_ipv6(router_entry, metric_labels = firewall_labels) firewall_filter_records_ipv6 = FirewallMetricsDataSource.metric_records_ipv6(router_entry, metric_labels = firewall_labels)
if firewall_filter_records_ipv6: if firewall_filter_records_ipv6:
metrics_records_ipv6 = [FirewallCollector.metric_record(router_entry, record) for record in firewall_filter_records_ipv6] metrics_records_ipv6 = [FirewallCollector.metric_record(router_entry, record) for record in firewall_filter_records_ipv6]