From 65d6bc2e403b17cd951b001d4c050192c541c109 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Tue, 18 Apr 2017 17:26:20 +0800
Subject: Collect dpi metrics and report

Change-Id: I0e02cff9a5bfc123b3227803289fc03abe27f112
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/metric/nDPI.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'resources/metric/nDPI.yaml')

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
-- 
cgit 1.2.3-korg