feat(telemetry): Add telemetry export

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Ibb8a59fd4e08bc736494c7ab18e689a55f7a98dc

8 files changed, 372 insertions, 649 deletions

diff --git a/resources/templates/telemetry/vpp_clear_stats.yaml b/resources/templates/telemetry/vpp_clear_stats.yaml
index 2188588827..72c20604ee 100644
--- a/resources/templates/telemetry/vpp_clear_stats.yaml
+++ b/resources/templates/telemetry/vpp_clear_stats.yaml
@@ -41,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
@@ -86,66 +96,92 @@ 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
@@ -156,31 +192,43 @@ programs:
       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
@@ -191,6 +239,8 @@ programs:
       gauge:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason
@@ -204,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
diff --git a/resources/templates/telemetry/vpp_runtime.yaml b/resources/templates/telemetry/vpp_runtime.yaml
index b9a2368981..d7beb23cc6 100644
--- a/resources/templates/telemetry/vpp_runtime.yaml
+++ b/resources/templates/telemetry/vpp_runtime.yaml
@@ -38,24 +38,13 @@ scheduler:
 programs:
   - name: bundle_vpp
     metrics:
-      info:
-        - name: version
-          documentation: VPP version
-          namespace: vpp
-          subsystem: version
-          labelnames:
-            - version
-    code: |
-      show version
-  - name: bundle_vpp
-    metrics:
       gauge:
         - name: calls
           documentation: Number of calls total
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -65,7 +54,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -75,7 +64,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -85,7 +74,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -95,7 +84,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -107,166 +96,12 @@ programs:
   - name: bundle_vpp
     metrics:
       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
-      wait {duration}
-      show interface
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: node_counter
-          documentation: Node counter
-          namespace: vpp
-          subsystem: counters
-          labelnames:
-            - name
-            - reason
-            - severity
-            - thread_name
-            - thread_id
-    code: |
-      clear node counters
-      wait {duration}
-      show node counters verbose
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: context_switches
-          documentation: Per-thread context switches
-          namespace: vpp
-          subsystem: context_switches
-          labelnames:
-            - name
-            - id
-    code: |
-      perfmon reset
-      perfmon start bundle context-switches
-      wait {duration}
-      perfmon stop
-      show perfmon statistics
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: minor_page_faults
-          documentation: Per-thread page faults (minor)
-          namespace: vpp
-          subsystem: page_faults
-          labelnames:
-            - name
-            - id
-        - name: major_page_faults
-          documentation: Per-thread page faults (major)
-          namespace: vpp
-          subsystem: page_faults
-          labelnames:
-            - name
-            - id
-    code: |
-      perfmon reset
-      perfmon start bundle page-faults
-      wait {duration}
-      perfmon stop
-      show perfmon statistics
-  - name: bundle_vpp
-    metrics:
-      gauge:
         - name: calls
           documentation: Instructions/packet, cycles/packet and IPC (calls)
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: packets
@@ -274,7 +109,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: packets_per_call
@@ -282,7 +117,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: clocks_per_packets
@@ -290,7 +125,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: instructions_per_packets
@@ -298,7 +133,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: ipc
@@ -306,7 +141,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
     code: |
@@ -323,7 +158,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l1_miss
@@ -331,7 +166,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l2_hit
@@ -339,7 +174,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l2_miss
@@ -347,7 +182,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l3_hit
@@ -355,7 +190,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l3_miss
@@ -363,7 +198,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
     code: |
@@ -372,151 +207,3 @@ programs:
       wait {duration}
       perfmon stop
       show perfmon statistics
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: calls
-          documentation: Load operations (calls)
-          namespace: vpp
-          subsystem: load_blocks
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: packets
-          documentation: Load operations (packets)
-          namespace: vpp
-          subsystem: load_blocks
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-    code: |
-      perfmon reset
-      perfmon start bundle load-blocks
-      wait {duration}
-      perfmon stop
-      show perfmon statistics
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: branches_per_call
-          documentation: Branches/call
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: branches_per_packet
-          documentation: Branches/packet
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: taken_per_call
-          documentation: Taken/call
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: taken_per_packet
-          documentation: Taken/packet
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: mis_predictions
-          documentation: Mis-predictions
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-    code: |
-      perfmon reset
-      perfmon start bundle branch-mispred
-      wait {duration}
-      perfmon stop
-      show perfmon statistics
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: lvl0
-          documentation: Branches/call
-          namespace: vpp
-          subsystem: power_licensing
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: lvl1
-          documentation: Branches/packet
-          namespace: vpp
-          subsystem: power_licensing
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: lvl2
-          documentation: Taken/call
-          namespace: vpp
-          subsystem: power_licensing
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: throttle
-          documentation: Taken/packet
-          namespace: vpp
-          subsystem: power_licensing
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-    code: |
-      perfmon reset
-      perfmon start bundle power-licensing
-      wait {duration}
-      perfmon stop
-      show perfmon statistics
-  - name: bundle_vpp
-    metrics:
-      gauge:
-        - name: runtime
-          documentation: RunTime
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-        - name: reads_mbs
-          documentation: Reads (MB/s)
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-        - name: writes_mbs
-          documentation: Writes (MB/s)
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-        - name: total_mbs
-          documentation: Total (MB/s)
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-    code: |
-      perfmon reset
-      perfmon start bundle memory-bandwidth
-      wait {duration}
-      perfmon stop
-      show perfmon statistics
diff --git a/resources/templates/telemetry/vpp_show_stats.yaml b/resources/templates/telemetry/vpp_show_stats.yaml
index dc900e6386..626839f410 100644
--- a/resources/templates/telemetry/vpp_show_stats.yaml
+++ b/resources/templates/telemetry/vpp_show_stats.yaml
@@ -41,40 +41,50 @@ programs:
       counter:
         - 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
@@ -86,66 +96,92 @@ programs:
       counter:
         - 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
@@ -156,31 +192,43 @@ programs:
       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
@@ -191,6 +239,8 @@ programs:
       counter:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason
diff --git a/resources/templates/telemetry/vpp_test_teardown.yaml b/resources/templates/telemetry/vpp_test_teardown.yaml
index 37618bb852..ac096526ce 100644
--- a/resources/templates/telemetry/vpp_test_teardown.yaml
+++ b/resources/templates/telemetry/vpp_test_teardown.yaml
@@ -41,40 +41,50 @@ programs:
       counter:
         - 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
@@ -86,66 +96,92 @@ programs:
       counter:
         - 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
@@ -156,31 +192,43 @@ programs:
       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
@@ -191,6 +239,8 @@ programs:
       counter:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason
diff --git a/resources/templates/telemetry/vppctl_clear_stats.yaml b/resources/templates/telemetry/vppctl_clear_stats.yaml
index 7c5124eb03..b23081e4f2 100644
--- a/resources/templates/telemetry/vppctl_clear_stats.yaml
+++ b/resources/templates/telemetry/vppctl_clear_stats.yaml
@@ -41,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
@@ -86,66 +96,92 @@ 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
@@ -156,31 +192,43 @@ programs:
       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
@@ -191,6 +239,8 @@ programs:
       gauge:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason
@@ -204,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
diff --git a/resources/templates/telemetry/vppctl_runtime.yaml b/resources/templates/telemetry/vppctl_runtime.yaml
index d8ff734e84..2ac72c0b8a 100644
--- a/resources/templates/telemetry/vppctl_runtime.yaml
+++ b/resources/templates/telemetry/vppctl_runtime.yaml
@@ -38,24 +38,13 @@ scheduler:
 programs:
   - name: bundle_vppctl
     metrics:
-      info:
-        - name: version
-          documentation: VPP version
-          namespace: vpp
-          subsystem: version
-          labelnames:
-            - version
-    code: |
-      vppctl -s {socket} show version
-  - name: bundle_vppctl
-    metrics:
       gauge:
         - name: calls
           documentation: Number of calls total
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -65,7 +54,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -75,7 +64,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -85,7 +74,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -95,7 +84,7 @@ programs:
           namespace: vpp
           subsystem: runtime
           labelnames:
-            - name
+            - node_name
             - state
             - thread_name
             - thread_id
@@ -107,166 +96,12 @@ programs:
   - name: bundle_vppctl
     metrics:
       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: |
-      vppctl -s {socket} clear interfaces
-      sleep {duration}
-      vppctl -s {socket} show interface
-  - name: bundle_vppctl
-    metrics:
-      gauge:
-        - name: node_counter
-          documentation: Node counter
-          namespace: vpp
-          subsystem: counters
-          labelnames:
-            - name
-            - reason
-            - severity
-            - thread_name
-            - thread_id
-    code: |
-      vppctl -s {socket} clear node counters
-      sleep {duration}
-      vppctl -s {socket} show node counters verbose
-  - name: bundle_vppctl
-    metrics:
-      gauge:
-        - name: context_switches
-          documentation: Per-thread context switches
-          namespace: vpp
-          subsystem: context_switches
-          labelnames:
-            - name
-            - id
-    code: |
-      vppctl -s {socket} perfmon reset
-      vppctl -s {socket} perfmon start bundle context-switches
-      sleep {duration}
-      vppctl -s {socket} perfmon stop
-      vppctl -s {socket} show perfmon statistics
-  - name: bundle_vppctl
-    metrics:
-      gauge:
-        - name: minor_page_faults
-          documentation: Per-thread page faults (minor)
-          namespace: vpp
-          subsystem: page_faults
-          labelnames:
-            - name
-            - id
-        - name: major_page_faults
-          documentation: Per-thread page faults (major)
-          namespace: vpp
-          subsystem: page_faults
-          labelnames:
-            - name
-            - id
-    code: |
-      vppctl -s {socket} perfmon reset
-      vppctl -s {socket} perfmon start bundle page-faults
-      sleep {duration}
-      vppctl -s {socket} perfmon stop
-      vppctl -s {socket} show perfmon statistics
-  - name: bundle_vppctl
-    metrics:
-      gauge:
         - name: calls
           documentation: Instructions/packet, cycles/packet and IPC (calls)
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: packets
@@ -274,7 +109,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: packets_per_call
@@ -282,7 +117,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: clocks_per_packets
@@ -290,7 +125,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: instructions_per_packets
@@ -298,7 +133,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: ipc
@@ -306,7 +141,7 @@ programs:
           namespace: vpp
           subsystem: inst_and_clock
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
     code: |
@@ -323,7 +158,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l1_miss
@@ -331,7 +166,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l2_hit
@@ -339,7 +174,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l2_miss
@@ -347,7 +182,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l3_hit
@@ -355,7 +190,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
         - name: l3_miss
@@ -363,7 +198,7 @@ programs:
           namespace: vpp
           subsystem: cache_hierarchy
           labelnames:
-            - name
+            - node_name
             - thread_name
             - thread_id
     code: |
@@ -372,110 +207,3 @@ programs:
       sleep {duration}
       vppctl -s {socket} perfmon stop
       vppctl -s {socket} show perfmon statistics
-  - name: bundle_vppctl
-    metrics:
-      gauge:
-        - name: calls
-          documentation: Load operations (calls)
-          namespace: vpp
-          subsystem: load_blocks
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: packets
-          documentation: Load operations (packets)
-          namespace: vpp
-          subsystem: load_blocks
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-    code: |
-      vppctl -s {socket} perfmon reset
-      vppctl -s {socket} perfmon start bundle load-blocks
-      sleep {duration}
-      vppctl -s {socket} perfmon stop
-      vppctl -s {socket} show perfmon statistics
-  - name: bundle_vppctl
-    metrics:
-      gauge:
-        - name: branches_per_call
-          documentation: Branches/call
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: branches_per_packet
-          documentation: Branches/packet
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: taken_per_call
-          documentation: Taken/call
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: taken_per_packet
-          documentation: Taken/packet
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-        - name: mis_predictions
-          documentation: Mis-predictions
-          namespace: vpp
-          subsystem: branch_mispred
-          labelnames:
-            - name
-            - thread_name
-            - thread_id
-    code: |
-      vppctl -s {socket} perfmon reset
-      vppctl -s {socket} perfmon start bundle branch-mispred
-      sleep {duration}
-      vppctl -s {socket} perfmon stop
-      vppctl -s {socket} show perfmon statistics
-  - name: bundle_vppctl
-    metrics:
-      gauge:
-        - name: runtime
-          documentation: RunTime
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-        - name: reads_mbs
-          documentation: Reads (MB/s)
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-        - name: writes_mbs
-          documentation: Writes (MB/s)
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-        - name: total_mbs
-          documentation: Total (MB/s)
-          namespace: vpp
-          subsystem: memory_bandwidth
-          labelnames:
-            - name
-    code: |
-      vppctl -s {socket} perfmon reset
-      vppctl -s {socket} perfmon start bundle memory-bandwidth
-      sleep {duration}
-      vppctl -s {socket} perfmon stop
-      vppctl -s {socket} show perfmon statistics
diff --git a/resources/templates/telemetry/vppctl_show_stats.yaml b/resources/templates/telemetry/vppctl_show_stats.yaml
index 83bb746773..9f5a0240a1 100644
--- a/resources/templates/telemetry/vppctl_show_stats.yaml
+++ b/resources/templates/telemetry/vppctl_show_stats.yaml
@@ -41,40 +41,50 @@ programs:
       counter:
         - 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
@@ -86,66 +96,92 @@ programs:
       counter:
         - 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
@@ -156,31 +192,43 @@ programs:
       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
@@ -191,6 +239,8 @@ programs:
       counter:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason
diff --git a/resources/templates/telemetry/vppctl_test_teardown.yaml b/resources/templates/telemetry/vppctl_test_teardown.yaml
index 10f2077137..e8458f7198 100644
--- a/resources/templates/telemetry/vppctl_test_teardown.yaml
+++ b/resources/templates/telemetry/vppctl_test_teardown.yaml
@@ -41,40 +41,50 @@ programs:
       counter:
         - 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
@@ -86,66 +96,92 @@ programs:
       counter:
         - 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
@@ -156,31 +192,43 @@ programs:
       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
@@ -191,6 +239,8 @@ programs:
       counter:
         - name: node_counter
           documentation: Node counter
+          namespace: vpp
+          subsystem: node
           labelnames:
             - name
             - reason