aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2020-10-07 18:05:37 +0200
committerNeale Ranns <nranns@cisco.com>2020-10-13 11:42:58 +0000
commit148c7b768721231325a349fa82db693190513b53 (patch)
tree94e0a9768eda3bc4923b1b3cc727dc637d877381 /src/vnet
parente7c8396982607634b4c747870499671ffa53868e (diff)
stats: counters data model
This adds a new data model for counters. Specifying the errors severity and unit. A later patch will update vpp_get_stats to take advantage of this. Only the map plugin is updates as an example. New .api language: A new "counters" keyword to define counter sets. counters map { none { severity info; type counter64; units "packets"; description "valid MAP packets"; }; bad_protocol { severity error; type counter64; units "packets"; description "bad protocol"; }; }; Each counter has 4 keywords. severity, which is one of error, info or warn. A type, which is one of counter64 or gauge64. units, which is a text field using units from YANG. paths { "/err/ip4-map" "map"; "/err/ip6-map" "map"; "/err/ip4-t-map" "map"; "/err/ip6-t-map" "map"; }; A new paths keyword that maps the counter-set to a path in the stats segment KV store. Updated VPP CLI to include severity so user can see error counter severity. DBGvpp# show errors Count Node Reason Severity 13 ethernet-input no error error Type: feature Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: Ib2177543f49d4c3aef4d7fa72476cff2068f7771 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/interface.c3
-rw-r--r--src/vnet/interface_output.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/vnet/interface.c b/src/vnet/interface.c
index 8ca9c1a2f1f..1cf63c75c67 100644
--- a/src/vnet/interface.c
+++ b/src/vnet/interface.c
@@ -736,9 +736,10 @@ setup_tx_node (vlib_main_t * vm,
n->function = dev_class->tx_function;
n->format_trace = dev_class->format_tx_trace;
+ /// XXX: Update this to use counter structure
vlib_register_errors (vm, node_index,
dev_class->tx_function_n_errors,
- dev_class->tx_function_error_strings);
+ dev_class->tx_function_error_strings, 0);
}
static void
diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index cb13f5361aa..913bac64df0 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -967,7 +967,7 @@ pcap_drop_trace (vlib_main_t * vm,
vlib_node_t *n;
/* Length of the error string */
int error_string_len =
- clib_strnlen (em->error_strings_heap[b0->error], 128);
+ clib_strnlen (em->counters_heap[b0->error].name, 128);
/* Dig up the drop node */
error_node_index = vm->node_main.node_by_error[b0->error];
@@ -996,7 +996,7 @@ pcap_drop_trace (vlib_main_t * vm,
": ", 2);
clib_memcpy_fast (last->data + last->current_data +
last->current_length + vec_len (n->name) +
- 2, em->error_strings_heap[b0->error],
+ 2, em->counters_heap[b0->error].name,
error_string_len);
last->current_length += drop_string_len;
b0->flags &= ~(VLIB_BUFFER_TOTAL_LENGTH_VALID);