mirror of
https://github.com/KevinMidboe/mktxp-no-cli.git
synced 2025-10-29 17:50:23 +00:00
DS refactor, fixes/optimizations
This commit is contained in:
@@ -11,34 +11,37 @@
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
## GNU General Public License for more details.
|
||||
|
||||
from mktxp.collectors.base_collector import BaseCollector
|
||||
|
||||
from mktxp.cli.config.config import MKTXPConfigKeys
|
||||
from mktxp.collectors.base_collector import BaseCollector
|
||||
from mktxp.datasources.firewall_ds import FirewallMetricsDataSource
|
||||
|
||||
|
||||
class FirewallCollector(BaseCollector):
|
||||
''' Firewall rules traffic metrics collector
|
||||
'''
|
||||
@staticmethod
|
||||
def collect(router_metric):
|
||||
def collect(router_entry):
|
||||
# initialize all pool counts, including those currently not used
|
||||
firewall_labels = ['chain', 'action', 'bytes', 'comment']
|
||||
|
||||
firewall_filter_records = router_metric.firewall_records(firewall_labels)
|
||||
firewall_filter_records = FirewallMetricsDataSource.metric_records(router_entry, metric_labels = firewall_labels)
|
||||
if firewall_filter_records:
|
||||
metris_records = [FirewallCollector.metric_record(router_metric, record) for record in firewall_filter_records]
|
||||
metris_records = [FirewallCollector.metric_record(router_entry, record) for record in firewall_filter_records]
|
||||
firewall_filter_metrics = BaseCollector.counter_collector('firewall_filter', 'Total amount of bytes matched by firewall rules', metris_records, 'bytes', ['name'])
|
||||
yield firewall_filter_metrics
|
||||
|
||||
firewall_raw_records = router_metric.firewall_records(firewall_labels, raw = True)
|
||||
firewall_raw_records = FirewallMetricsDataSource.metric_records(router_entry, metric_labels = firewall_labels, raw = True)
|
||||
if firewall_raw_records:
|
||||
metris_records = [FirewallCollector.metric_record(router_metric, record) for record in firewall_raw_records]
|
||||
metris_records = [FirewallCollector.metric_record(router_entry, record) for record in firewall_raw_records]
|
||||
firewall_raw_metrics = BaseCollector.counter_collector('firewall_raw', 'Total amount of bytes matched by raw firewall rules', metris_records, 'bytes', ['name'])
|
||||
yield firewall_raw_metrics
|
||||
|
||||
# Helpers
|
||||
@staticmethod
|
||||
def metric_record(router_metric, firewall_record):
|
||||
def metric_record(router_entry, firewall_record):
|
||||
name = f"| {firewall_record['chain']} | {firewall_record['action']} | {firewall_record['comment']}"
|
||||
bytes = firewall_record['bytes']
|
||||
return {MKTXPConfigKeys.ROUTERBOARD_NAME: router_metric.router_id[MKTXPConfigKeys.ROUTERBOARD_NAME],
|
||||
MKTXPConfigKeys.ROUTERBOARD_ADDRESS: router_metric.router_id[MKTXPConfigKeys.ROUTERBOARD_ADDRESS],
|
||||
return {MKTXPConfigKeys.ROUTERBOARD_NAME: router_entry.router_id[MKTXPConfigKeys.ROUTERBOARD_NAME],
|
||||
MKTXPConfigKeys.ROUTERBOARD_ADDRESS: router_entry.router_id[MKTXPConfigKeys.ROUTERBOARD_ADDRESS],
|
||||
'name': name, 'bytes': bytes}
|
||||
|
||||
Reference in New Issue
Block a user