aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri@ouroboros.rocks>2022-03-17 01:00:10 +0100
committerDimitri Staessens <dimitri@ouroboros.rocks>2022-03-17 01:00:10 +0100
commit0afdeb5500ff26970cb050f16045ecbb9d39d614 (patch)
tree560dcc959e368b7ce864b73c89fd91203701d95d
parent67fa97549a195128f1aa122a4f4f556be36dad8a (diff)
downloadouroboros-metrics-0afdeb5500ff26970cb050f16045ecbb9d39d614.tar.gz
ouroboros-metrics-0afdeb5500ff26970cb050f16045ecbb9d39d614.zip
pyExporter: Support for Flow Control metrics0.19.1
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 <dimitri@ouroboros.rocks>
-rw-r--r--dashboards-grafana/general.json2
-rwxr-xr-xexporters-influxdb/pyExporter/oexport.py8
2 files changed, 9 insertions, 1 deletions
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])