From 977ffc4c2aefdeb70cee048cfae190f508d63997 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Wed, 14 Dec 2016 13:05:04 +0000 Subject: [PATCH] Let all FEATURE()s use the same Prometheus metric. Without this change, every individual FEATURE() declaration would have an individual metric in Prometheus. Though this wouldn't be harmful, it would look very cluttered. By letting it use a single metric with the name of the feature attached as a label, it also becomes easier to search, as you can apply regex matching, etc. Reviewed by: cem Differential Revision: https://reviews.freebsd.org/D8775 --- sys/sys/sysctl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index 5f949f5a40c..799e69ed6a7 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -796,9 +796,9 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); * A macro to generate a read-only sysctl to indicate the presence of optional * kernel features. */ -#define FEATURE(name, desc) \ - SYSCTL_INT(_kern_features, OID_AUTO, name, CTLFLAG_RD | CTLFLAG_CAPRD, \ - SYSCTL_NULL_INT_PTR, 1, desc) +#define FEATURE(name, desc, label) \ + SYSCTL_INT_WITH_LABEL(_kern_features, OID_AUTO, name, \ + CTLFLAG_RD | CTLFLAG_CAPRD, SYSCTL_NULL_INT_PTR, 1, desc, "feature") #endif /* _KERNEL */