diff options
| author | Oleg Pykhalov <go.wigust@gmail.com> | 2022-02-06 21:28:48 +0300 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2022-02-07 00:00:55 +0300 |
| commit | 69f073ae80448d5b9e65ce2d572c650aeaa925b7 (patch) | |
| tree | 83e761985b515505154446e0d4d9720bb3353cc8 | |
| parent | Fix negative numbers error. (diff) | |
| download | python-prometheus-ssh-exporter-69f073ae80448d5b9e65ce2d572c650aeaa925b7.tar.gz | |
Join process_node_network functions.
| -rw-r--r-- | prometheus_tp_link_exporter/__main__.py | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/prometheus_tp_link_exporter/__main__.py b/prometheus_tp_link_exporter/__main__.py index 049578b..06a5bd2 100644 --- a/prometheus_tp_link_exporter/__main__.py +++ b/prometheus_tp_link_exporter/__main__.py @@ -29,20 +29,6 @@ node_network_receive_bytes_total = Counter( ["device"], ) - -def process_node_network_receive_bytes_total(): - """Process request.""" - for device in ifconfig_devices(): - if (device["name"],) in node_network_receive_bytes_total._metrics: - previos_value = node_network_receive_bytes_total._metrics[(device["name"],)]._value._value - if previos_value < device["rx_bytes"]: - node_network_receive_bytes_total.labels(device=device["name"]).inc( - device["rx_bytes"] - previos_value - ) - else: - node_network_receive_bytes_total.labels(device=device["name"]).inc(device["rx_bytes"]) - - node_network_transmit_bytes_total = Counter( "node_network_transmit_bytes_total", "Network device statistic transmit_bytes.", @@ -50,19 +36,29 @@ node_network_transmit_bytes_total = Counter( ) -def process_node_network_transmit_bytes_total(): +def process_node_network(): """Process request.""" - for device in ifconfig_devices(): + devices = ifconfig_devices() + for device in devices: if (device["name"],) in node_network_transmit_bytes_total._metrics: previos_value = node_network_transmit_bytes_total._metrics[ (device["name"],) ]._value._value - if previos_value < device["tx_bytes"]: + if previos_value <= device["tx_bytes"]: node_network_transmit_bytes_total.labels(device=device["name"]).inc( device["tx_bytes"] - previos_value ) else: node_network_transmit_bytes_total.labels(device=device["name"]).inc(device["tx_bytes"]) + for device in devices: + if (device["name"],) in node_network_receive_bytes_total._metrics: + previos_value = node_network_receive_bytes_total._metrics[(device["name"],)]._value._value + if previos_value <= device["rx_bytes"]: + node_network_receive_bytes_total.labels(device=device["name"]).inc( + device["rx_bytes"] - previos_value + ) + else: + node_network_receive_bytes_total.labels(device=device["name"]).inc(device["rx_bytes"]) def main(): @@ -71,8 +67,7 @@ def main(): port=int(listen_addresses.split(":")[1]), addr=listen_addresses.split(":")[0] ) while True: - process_node_network_receive_bytes_total() - process_node_network_transmit_bytes_total() + process_node_network() time.sleep(interval) |