X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftemplates%2Ftelemetry%2Fvpp_clear_stats.yaml;h=72c20604eeea3d117b2630ab27c1cb981d9124a6;hb=5466cc69f18a480dbff7e39d28abbbccf683ba2f;hp=9391502654d7f007f62f6b78e45cdd215670a0ec;hpb=d255d2545ee6cdc871bc35314fad72c3c48b225b;p=csit.git

diff --git a/resources/templates/telemetry/vpp_clear_stats.yaml b/resources/templates/telemetry/vpp_clear_stats.yaml
index 9391502654..72c20604ee 100644
--- a/resources/templates/telemetry/vpp_clear_stats.yaml
+++ b/resources/templates/telemetry/vpp_clear_stats.yaml
@@ -2,16 +2,23 @@
 logging:
   version: 1
   formatters:
-    console:
+    console_stdout:
       format: '%(asctime)s - %(name)s - %(message)s'
+    console_stderr:
+      format: '%(message)s'
     prom:
       format: '%(message)s'
   handlers:
-    console:
+    console_stdout:
       class: logging.StreamHandler
       level: INFO
-      formatter: console
+      formatter: console_stdout
       stream: ext://sys.stdout
+    console_stderr:
+      class: logging.StreamHandler
+      level: ERROR
+      formatter: console_stderr
+      stream: ext://sys.stderr
     prom:
       class: logging.handlers.RotatingFileHandler
       level: INFO
@@ -25,7 +32,7 @@ logging:
       propagate: False
   root:
     level: INFO
-    handlers: [console]
+    handlers: [console_stdout, console_stderr]
 scheduler:
   duration: 1
 programs:
@@ -34,40 +41,50 @@ programs:
       gauge:
         - name: calls
           documentation: Number of calls total
+          namespace: vpp
+          subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
             - thread_lcore
         - name: vectors
           documentation: Number of vectors total
+          namespace: vpp
+          subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
             - thread_lcore
         - name: suspends
           documentation: Number of suspends total
+          namespace: vpp
+          subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
             - thread_lcore
         - name: clocks
           documentation: Number of clocks total
+          namespace: vpp
+          subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
             - thread_lcore
         - name: vectors_calls
           documentation: Number of vectors per call
+          namespace: vpp
+          subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -79,71 +96,151 @@ programs:
       gauge:
         - name: rx_packets
           documentation: Number of received packets for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: rx_bytes
           documentation: Number of received bytes for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: rx_error
           documentation: Number of errors on interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: tx_packets
           documentation: Number of transitted packets for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: tx_bytes
           documentation: Number of transitted bytes for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: tx_error
           documentation: Number of errors on interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: drops
           documentation: Number of dropped packets for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: punt
           documentation: Number of punted packets for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: ip4
           documentation: Number of IPv4 packets for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: ip6
           documentation: Number of IPv6 packets for interface
+          namespace: vpp
+          subsystem: interface
+          labelnames:
+            - name
+            - index
+        - name: mpls
+          documentation: Number of MPLS packets for interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: rx_no_buf
           documentation: Number of out of buffer RX packets on interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
         - name: rx_miss
           documentation: Number of missed RX packets on interface
+          namespace: vpp
+          subsystem: interface
           labelnames:
             - name
             - index
     code: |
       clear interfaces
+  - name: bundle_vpp
+    metrics:
+      gauge:
+        - name: rx_frames
+          documentation: Number of RX frames for interface
+          namespace: vpp
+          subsystem: hardware
+          labelnames:
+            - name
+            - index
+        - name: rx_bytes
+          documentation: Number of RX bytes for interface
+          namespace: vpp
+          subsystem: hardware
+          labelnames:
+            - name
+            - index
+        - name: tx_frames
+          documentation: Number of TX frames for interface
+          namespace: vpp
+          subsystem: hardware
+          labelnames:
+            - name
+            - index
+        - name: tx_bytes
+          documentation: Number of TX bytes for interface
+          namespace: vpp
+          subsystem: hardware
+          labelnames:
+            - name
+            - index
+        - name: rx_missed
+          documentation: Number of missed RX packets on interface
+          namespace: vpp
+          subsystem: hardware
+          labelnames:
+            - name
+            - index
+        - name: tx_missed
+          documentation: Number of missed TX packets on interface
+          namespace: vpp
+          subsystem: hardware
+          labelnames:
+            - name
+            - index
+    code: |
+      clear hardware
   - name: bundle_vpp
     metrics:
       gauge:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason
@@ -157,12 +254,16 @@ programs:
       gauge:
         - name: calls
           documentation: Load operations
+          namespace: vpp
+          subsystem: perfmon
           labelnames:
             - name
             - thread_name
             - thread_id
         - name: packets
           documentation: Load operations
+          namespace: vpp
+          subsystem: perfmon
           labelnames:
             - name
             - thread_name