From 148c7b768721231325a349fa82db693190513b53 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Wed, 7 Oct 2020 18:05:37 +0200 Subject: 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 Change-Id: Ib2177543f49d4c3aef4d7fa72476cff2068f7771 Signed-off-by: Ole Troan --- src/plugins/map/ip6_map.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/plugins/map/ip6_map.c') diff --git a/src/plugins/map/ip6_map.c b/src/plugins/map/ip6_map.c index 136f548db50..1193dda0a80 100644 --- a/src/plugins/map/ip6_map.c +++ b/src/plugins/map/ip6_map.c @@ -803,12 +803,6 @@ ip6_map_icmp_relay (vlib_main_t * vm, } -static char *map_error_strings[] = { -#define _(sym,string) string, - foreach_map_error -#undef _ -}; - /* *INDENT-OFF* */ VNET_FEATURE_INIT (ip6_map_feature, static) = { @@ -826,7 +820,7 @@ VLIB_REGISTER_NODE(ip6_map_node) = { .type = VLIB_NODE_TYPE_INTERNAL, .n_errors = MAP_N_ERROR, - .error_strings = map_error_strings, + .error_counters = map_error_counters, .n_next_nodes = IP6_MAP_N_NEXT, .next_nodes = { @@ -852,7 +846,7 @@ VLIB_REGISTER_NODE(ip6_map_post_ip4_reass_node) = { .format_trace = format_ip6_map_post_ip4_reass_trace, .type = VLIB_NODE_TYPE_INTERNAL, .n_errors = MAP_N_ERROR, - .error_strings = map_error_strings, + .error_counters = map_error_counters, .n_next_nodes = IP6_MAP_POST_IP4_REASS_N_NEXT, .next_nodes = { [IP6_MAP_POST_IP4_REASS_NEXT_IP4_LOOKUP] = "ip4-lookup", @@ -870,7 +864,7 @@ VLIB_REGISTER_NODE(ip6_map_icmp_relay_node, static) = { .format_trace = format_map_trace, //FIXME .type = VLIB_NODE_TYPE_INTERNAL, .n_errors = MAP_N_ERROR, - .error_strings = map_error_strings, + .error_counters = map_error_counters, .n_next_nodes = IP6_ICMP_RELAY_N_NEXT, .next_nodes = { [IP6_ICMP_RELAY_NEXT_IP4_LOOKUP] = "ip4-lookup", -- cgit