inneek@gmail.com has uploaded this change for review. ( https://review.gerrithub.io/c/ffilz/nfs-ganesha/+/1255857?usp=email ) Change subject: monitoring: Standardize subsystem metric names and suffixes Clean up two naming inconsistencies in <subsystem>__<metric> metrics: 1. Gauges and histograms ending in "_count" or "_total": In Prometheus, "_total" is for counters and histograms automatically append "_count", "_sum" and "_bucket" (producing series such as compound__ops_count_count). Drop these suffixes from gauges and histograms, and rename locks__count to state__locks (SAL lock entries). 2. Counter suffixes and histogram plurals: Most subsystem counters already use "_count" (as in dynamic_metrics.h) and newer histograms in connection_manager_metrics.c and prometheus_exposer.cc use plural "_latencies". Align the idmapper counters on "_count" and the remaining latency/duration histograms on plural nouns. Gauges: clients__confirmed_count -> clients__confirmed_clients locks__count -> state__locks idmapping__cache_entries_total -> idmapping__cache_entries Histograms: compound__ops_count -> compound__ops session__connections_count -> session__connections xprt__sessions_count -> xprt__sessions idmapping__user_groups_total -> idmapping__user_groups nfsv4__op_latency -> nfsv4__op_latencies compound__latency -> compound__latencies idmapping__external_request_latency -> idmapping__external_request_latencies idmapping__evicted_entries_cached_duration -> idmapping__evicted_entries_cached_durations Counters: idmapping__cache_uses_total -> idmapping__cache_uses_count idmapping__resolutions_total -> idmapping__resolutions_count idmapping__cache_entries_reaped_total -> idmapping__cache_entries_reaped_count idmapping__max_groups_exceeded -> idmapping__max_groups_exceeded_count ...................................................................... monitoring: Standardize subsystem metric names and suffixes Clean up two naming inconsistencies in <subsystem>__<metric> metrics: 1. Gauges and histograms ending in "_count" or "_total": In Prometheus, "_total" is for counters and histograms automatically append "_count", "_sum" and "_bucket" (producing series such as compound__ops_count_count). Drop these suffixes from gauges and histograms, and rename locks__count to state__locks (SAL lock entries). 2. Counter suffixes and histogram plurals: Most subsystem counters already use "_count" (as in dynamic_metrics.h) and newer histograms in connection_manager_metrics.c and prometheus_exposer.cc use plural "_latencies". Align the idmapper counters on "_count" and the remaining latency/duration histograms on plural nouns. Gauges: clients__confirmed_count -> clients__confirmed_clients locks__count -> state__locks idmapping__cache_entries_total -> idmapping__cache_entries Histograms: compound__ops_count -> compound__ops session__connections_count -> session__connections xprt__sessions_count -> xprt__sessions idmapping__user_groups_total -> idmapping__user_groups nfsv4__op_latency -> nfsv4__op_latencies compound__latency -> compound__latencies idmapping__external_request_latency -> idmapping__external_request_latencies idmapping__evicted_entries_cached_duration -> idmapping__evicted_entries_cached_durations Counters: idmapping__cache_uses_total -> idmapping__cache_uses_count idmapping__resolutions_total -> idmapping__resolutions_count idmapping__cache_entries_reaped_total -> idmapping__cache_entries_reaped_count idmapping__max_groups_exceeded -> idmapping__max_groups_exceeded_count Change-Id: Ia7ee6c384ee1131c886d869260f489fcddd541c6 Signed-off-by: Inna Batenkov <inneek@gmail.com> --- M src/MainNFSD/nfs_metrics.c M src/SAL/sal_metrics.c M src/config_samples/grafana.dashboard.json M src/idmapper/idmapper_monitoring.c M src/monitoring/prometheus_exposer.cc 5 files changed, 17 insertions(+), 17 deletions(-) git pull ssh://review.gerrithub.io:29418/ffilz/nfs-ganesha refs/changes/57/1255857/1 -- To view, visit https://review.gerrithub.io/c/ffilz/nfs-ganesha/+/1255857?usp=email To unsubscribe, or for help writing mail filters, visit https://review.gerrithub.io/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: ffilz/nfs-ganesha Gerrit-Branch: next Gerrit-Change-Id: Ia7ee6c384ee1131c886d869260f489fcddd541c6 Gerrit-Change-Number: 1255857 Gerrit-PatchSet: 1 Gerrit-Owner: inneek@gmail.com