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

bug fixes

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2022-10-02 12:34:54 +01:00
parent 76aa9acd9f
commit a902c15b6f
2 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mktxp/collector/base_collector.py
View File

@@ -16,26 +16,6 @@ from prometheus_client.core import GaugeMetricFamily, CounterMetricFamily, InfoM
from mktxp.cli.config.config import MKTXPConfigKeys from mktxp.cli.config.config import MKTXPConfigKeys
def get_values(record, labels, default=''):
"""Get a set of metrics by label.
None values are replaced with a default value.
>>> get_values(
... {'interface': 'cap3', 'tx_rate': '12 Mbps', 'rx_rate': '390 Mbps', 'comment': None},
... ['interface', 'tx_rate', 'rx_rate', 'comment']
... )
{'interface': 'cap3', 'tx_rate': '12 Mbps', 'rx_rate': '390 Mbps', 'comment': ''}
"""
values = {}
for label in labels:
val = record.get(label)
if val is None:
val = default
values[label] = val
return values
class BaseCollector: class BaseCollector:
''' Base Collector methods ''' Base Collector methods
For use by custom collector For use by custom collector
@@ -48,7 +28,7 @@ class BaseCollector:
collector = InfoMetricFamily(f'mktxp_{name}', decription) collector = InfoMetricFamily(f'mktxp_{name}', decription)
for router_record in router_records: for router_record in router_records:
label_values = get_values(router_record, metric_labels) label_values = {label: router_record.get(label) if router_record.get(label) else '' for label in metric_labels}
collector.add_metric(metric_labels, label_values) collector.add_metric(metric_labels, label_values)
return collector return collector
@@ -60,12 +40,12 @@ class BaseCollector:
collector = CounterMetricFamily(f'mktxp_{name}', decription, labels=metric_labels) collector = CounterMetricFamily(f'mktxp_{name}', decription, labels=metric_labels)
for router_record in router_records: for router_record in router_records:
label_values = get_values(router_record, metric_labels) label_values = [router_record.get(label) if router_record.get(label) else '' for label in metric_labels]
collector.add_metric(label_values, router_record.get(metric_key, 0)) collector.add_metric(label_values, router_record.get(metric_key, 0))
return collector return collector
@staticmethod @staticmethod
def gauge_collector(name, decription, router_records, metric_key, metric_labels=None, add_id_labels = True): def gauge_collector(name, decription, router_records, metric_key, metric_labels = None, add_id_labels = True):
if metric_labels is None: if metric_labels is None:
metric_labels = [] metric_labels = []
if add_id_labels: if add_id_labels:
@@ -73,7 +53,7 @@ class BaseCollector:
collector = GaugeMetricFamily(f'mktxp_{name}', decription, labels=metric_labels) collector = GaugeMetricFamily(f'mktxp_{name}', decription, labels=metric_labels)
for router_record in router_records: for router_record in router_records:
label_values = get_values(router_record, metric_labels) label_values = [router_record.get(label) if router_record.get(label) else '' for label in metric_labels]
collector.add_metric(label_values, router_record.get(metric_key, 0)) collector.add_metric(label_values, router_record.get(metric_key, 0))
return collector return collector

2
setup.py
View File

@@ -20,7 +20,7 @@ with open(path.join(pkg_dir, 'README.md'), encoding='utf-8') as f:
setup( setup(
name='mktxp', name='mktxp',
version='0.36', version='0.37',
url='https://github.com/akpw/mktxp', url='https://github.com/akpw/mktxp',