summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-19 03:27:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-19 03:27:57 +0000
commit2d55ca2996755ea25012001e499c4ac0dc54b765 (patch)
treef15d8119d4f7ac818be5d7e6f5ccf11300e60102 /resources
parent86f10e318baa875d2b729f3bf7b5bb588a43f4ff (diff)
parent65d6bc2e403b17cd951b001d4c050192c541c109 (diff)
Merge "Collect dpi metrics and report"
Diffstat (limited to 'resources')
-rw-r--r--resources/metric/nDPI.yaml4
-rw-r--r--resources/template/dpi-metrics.j27
2 files changed, 10 insertions, 1 deletions
diff --git a/resources/metric/nDPI.yaml b/resources/metric/nDPI.yaml
index 79225443..0391302a 100644
--- a/resources/metric/nDPI.yaml
+++ b/resources/metric/nDPI.yaml
@@ -73,6 +73,8 @@
collect:
string: "{{ nDPI_out.stdout }}"
patterns:
- - '^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\s.+\spps.+?(?P<bps>\d+.\d+)\s.+\/sec'
+ # nDPI throughput: 1.46 M pps / 13.69 Gb/sec
+ # TODO(yujunz) convert "M pps" and "K pps" to number
+ - 'nDPI throughput:\s+?(?P<dpi_pps>\d+.\d+.*) \/ (?P<dpi_bps>\d+.\d+.*)$'
dump: 'nDPI.log'
register: dpi_metrics
diff --git a/resources/template/dpi-metrics.j2 b/resources/template/dpi-metrics.j2
new file mode 100644
index 00000000..4de200b6
--- /dev/null
+++ b/resources/template/dpi-metrics.j2
@@ -0,0 +1,7 @@
+nDPI throughput
+===============
+
+{% for host in groups['compute'] %}
+{% set dpi_metrics=hostvars[host].dpi_metrics %}
+{{ (hostvars[host].ansible_hostname, "{} / {}".format(dpi_metrics.dpi_pps[0], dpi_metrics.dpi_bps[0]))|justify }}
+{% endfor %}