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/map.h | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) (limited to 'src/plugins/map/map.h') diff --git a/src/plugins/map/map.h b/src/plugins/map/map.h index 16fc60478b5..215a832f431 100644 --- a/src/plugins/map/map.h +++ b/src/plugins/map/map.h @@ -23,6 +23,7 @@ #include #include "lpm.h" #include +#include #define MAP_SKIP_IP6_LOOKUP 1 @@ -205,37 +206,7 @@ typedef struct uword ip4_sv_reass_custom_next_index; } map_main_t; -/* - * MAP Error counters/messages - */ -#define foreach_map_error \ - /* Must be first. */ \ - _(NONE, "valid MAP packets") \ - _(BAD_PROTOCOL, "bad protocol") \ - _(SEC_CHECK, "security check failed") \ - _(ENCAP_SEC_CHECK, "encap security check failed") \ - _(DECAP_SEC_CHECK, "decap security check failed") \ - _(ICMP, "unable to translate ICMP") \ - _(ICMP_RELAY, "unable to relay ICMP") \ - _(UNKNOWN, "unknown") \ - _(NO_BINDING, "no binding") \ - _(NO_DOMAIN, "no domain") \ - _(FRAGMENTED, "packet is a fragment") \ - _(FRAGMENT_MEMORY, "could not cache fragment") \ - _(FRAGMENT_MALFORMED, "fragment has unexpected format")\ - _(FRAGMENT_DROPPED, "dropped cached fragment") \ - _(MALFORMED, "malformed packet") \ - _(DF_SET, "can't fragment, DF set") \ - _(TIME_EXCEEDED, "time exceeded") \ - -typedef enum -{ -#define _(sym,str) MAP_ERROR_##sym, - foreach_map_error -#undef _ - MAP_N_ERROR, -} map_error_t; - +typedef vl_counter_map_enum_t map_error_t; u64 map_error_counter_get (u32 node_index, map_error_t map_error); typedef struct -- cgit 1.2.3-korg