From: pmikus <pmikus@cisco.com>
Date: Wed, 22 Dec 2021 08:49:25 +0000 (+0100)
Subject: feat(telemetry): show hardware
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=a93f42dff3a1a1d5073c36455cda0537eac5bb12

feat(telemetry): show hardware

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I0c0bf055e5963ac794f66cce9d5d45bb628facee
---

diff --git a/resources/templates/telemetry/vpp_clear_stats.yaml b/resources/templates/telemetry/vpp_clear_stats.yaml
index 9391502654..bc80c590d0 100644
--- a/resources/templates/telemetry/vpp_clear_stats.yaml
+++ b/resources/templates/telemetry/vpp_clear_stats.yaml
@@ -139,6 +139,41 @@ programs:
             - index
     code: |
       clear interfaces
+  - name: bundle_vpp
+    metrics:
+      gauge:
+        - name: rx_frames
+          documentation: Number of RX frames for interface
+          labelnames:
+            - name
+            - index
+        - name: rx_bytes
+          documentation: Number of RX bytes for interface
+          labelnames:
+            - name
+            - index
+        - name: tx_frames
+          documentation: Number of TX frames for interface
+          labelnames:
+            - name
+            - index
+        - name: tx_bytes
+          documentation: Number of TX bytes for interface
+          labelnames:
+            - name
+            - index
+        - name: rx_missed
+          documentation: Number of missed RX packets on interface
+          labelnames:
+            - name
+            - index
+        - name: tx_missed
+          documentation: Number of missed TX packets on interface
+          labelnames:
+            - name
+            - index
+    code: |
+      clear hardware
   - name: bundle_vpp
     metrics:
       gauge:
diff --git a/resources/templates/telemetry/vpp_show_stats.yaml b/resources/templates/telemetry/vpp_show_stats.yaml
index 16c895447c..81176c668d 100644
--- a/resources/templates/telemetry/vpp_show_stats.yaml
+++ b/resources/templates/telemetry/vpp_show_stats.yaml
@@ -139,6 +139,41 @@ programs:
             - index
     code: |
       show interface
+  - name: bundle_vpp
+    metrics:
+      gauge:
+        - name: rx_frames
+          documentation: Number of RX frames for interface
+          labelnames:
+            - name
+            - index
+        - name: rx_bytes
+          documentation: Number of RX bytes for interface
+          labelnames:
+            - name
+            - index
+        - name: tx_frames
+          documentation: Number of TX frames for interface
+          labelnames:
+            - name
+            - index
+        - name: tx_bytes
+          documentation: Number of TX bytes for interface
+          labelnames:
+            - name
+            - index
+        - name: rx_missed
+          documentation: Number of missed RX packets on interface
+          labelnames:
+            - name
+            - index
+        - name: tx_missed
+          documentation: Number of missed TX packets on interface
+          labelnames:
+            - name
+            - index
+    code: |
+      show hardware verbose
   - name: bundle_vpp
     metrics:
       counter:
diff --git a/resources/templates/telemetry/vpp_test_teardown.yaml b/resources/templates/telemetry/vpp_test_teardown.yaml
index a1372da19a..f3357ba2c8 100644
--- a/resources/templates/telemetry/vpp_test_teardown.yaml
+++ b/resources/templates/telemetry/vpp_test_teardown.yaml
@@ -139,6 +139,41 @@ programs:
             - index
     code: |
       show interface
+  - name: bundle_vpp
+    metrics:
+      gauge:
+        - name: rx_frames
+          documentation: Number of RX frames for interface
+          labelnames:
+            - name
+            - index
+        - name: rx_bytes
+          documentation: Number of RX bytes for interface
+          labelnames:
+            - name
+            - index
+        - name: tx_frames
+          documentation: Number of TX frames for interface
+          labelnames:
+            - name
+            - index
+        - name: tx_bytes
+          documentation: Number of TX bytes for interface
+          labelnames:
+            - name
+            - index
+        - name: rx_missed
+          documentation: Number of missed RX packets on interface
+          labelnames:
+            - name
+            - index
+        - name: tx_missed
+          documentation: Number of missed TX packets on interface
+          labelnames:
+            - name
+            - index
+    code: |
+      show hardware verbose
   - name: bundle_vpp
     metrics:
       counter:
diff --git a/resources/tools/telemetry/bundle_vpp.py b/resources/tools/telemetry/bundle_vpp.py
index 01526fe83f..64c4c5e4f8 100644
--- a/resources/tools/telemetry/bundle_vpp.py
+++ b/resources/tools/telemetry/bundle_vpp.py
@@ -264,16 +264,6 @@ class BundleVpp:
         """
         Parse the show interface output.
 
-        Output format:
-        {
-            "name": "rx_packets",
-            "labels": {
-                "name": "tap0",
-                "index": "0",
-            },
-            "value": "31",
-        },
-
         :param reply: API reply.
         :type reply: str
         """
@@ -302,19 +292,6 @@ class BundleVpp:
         """
         Parse the show runtime output.
 
-        Output format:
-        {
-            "name": "clocks",
-            "labels": {
-                "name": "virtio-input",
-                "state": "polling",
-                "thread_name": "vpp_wk_1",
-                "thread_id": "2",
-                "thread_lcore": "3",
-            },
-            "value": "3.17e2",
-        },
-
         :param reply: API reply.
         :type reply: str
         """
@@ -347,19 +324,6 @@ class BundleVpp:
         """
         Parse the show node conuter output.
 
-        Output format:
-        {
-            "name": "node_counters",
-            "labels": {
-                "name": "dpdk-input",
-                "reason": "no_error",
-                "severity": "error",
-                "thread_name": "vpp_wk_1",
-                "thread_id": "2",
-            },
-            "value": "1",
-        },
-
         :param reply: API reply.
         :type reply: str
         """
@@ -391,19 +355,6 @@ class BundleVpp:
         """
         Parse the permon output.
 
-        Output format:
-        {
-            "name": "clocks",
-            "labels": {
-                "name": "virtio-input",
-                "state": "polling",
-                "thread_name": "vpp_wk_1",
-                "thread_id": "2",
-                "thread_lcore": "3",
-            },
-            "value": "3.17e2",
-        },
-
         :param reply: API reply.
         :type reply: str
         """
@@ -480,15 +431,6 @@ class BundleVpp:
         """
         Parse the version output.
 
-        Output format:
-        {
-            "name": "version",
-            "labels": {
-                "version": "v21.06-rc0~596-g1ca6c65e5~b1065",
-            },
-            "value": 1.0,
-        },
-
         :param reply: API reply.
         :type reply: str
         """