From 0afdeb5500ff26970cb050f16045ecbb9d39d614 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Thu, 17 Mar 2022 01:00:10 +0100 Subject: pyExporter: Support for Flow Control metrics Now supports some flow control metrics. Also more future proof as it will skip unknown future metrics instead of raising an Exception. Signed-off-by: Dimitri Staessens --- dashboards-grafana/general.json | 2 +- exporters-influxdb/pyExporter/oexport.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dashboards-grafana/general.json b/dashboards-grafana/general.json index f95b35e..15c7346 100644 --- a/dashboards-grafana/general.json +++ b/dashboards-grafana/general.json @@ -23,7 +23,7 @@ "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": 1, - "iteration": 1646989492864, + "iteration": 1647475126119, "links": [], "liveNow": false, "panels": [ diff --git a/exporters-influxdb/pyExporter/oexport.py b/exporters-influxdb/pyExporter/oexport.py index 5191907..e0edca0 100755 --- a/exporters-influxdb/pyExporter/oexport.py +++ b/exporters-influxdb/pyExporter/oexport.py @@ -327,6 +327,8 @@ class OuroborosRIBReader: for line in f.readlines(): split_line = line.split(':') phrase = split_line[0] + if phrase not in str_to_metric: + continue metric = str_to_metric[phrase] if metric is not None: value = self._get_trailing_number(split_line[1]) @@ -354,6 +356,10 @@ class OuroborosRIBReader: 'Receiver inactive (ns)': 'rcv_inact', 'Receiver last ack': 'rcv_seqno', 'Number of pkt retransmissions': 'n_rxm', + 'Number of duplicates received': 'n_dup', + 'Number of rendez-vous sent': 'n_rdv', + 'Number of packets out of window': 'n_out', + 'Number of packets out of rqueue': 'n_rqo' } ret = dict() @@ -369,6 +375,8 @@ class OuroborosRIBReader: for line in f.readlines(): split_line = line.split(':') phrase = split_line[0] + if phrase not in str_to_metric: + continue metric = str_to_metric[phrase] if metric is not None: value = self._get_trailing_number(split_line[1]) -- cgit v1.2.3