svn commit: r310056 - head/sys/sys

[Ed Schouten]

Author: ed
Date: Wed Dec 14 13:05:04 2016
New Revision: 310056
URL: https://svnweb.freebsd.org/changeset/base/310056

Log:
  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

Modified:
  head/sys/sys/sysctl.h

Modified: head/sys/sys/sysctl.h
==============================================================================
--- head/sys/sys/sysctl.h	Wed Dec 14 13:03:01 2016	(r310055)
+++ head/sys/sys/sysctl.h	Wed Dec 14 13:05:04 2016	(r310056)
@@ -796,9 +796,9 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_e
  * 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 */