Add label annotations to CAM sysctls.

Under kern.cam we have certain sysctls that are per-device, such as the
ones under kern.cam.ada.[0-9]+.*. Add a "device_index" label annotation
to such sysctls, so that the Prometheus metrics exporter will give all
of those metrics the same name. The device number will be added to the
metric name as the "device_index" label.

Reviewed by:	cem
Differential Revision:	https://reviews.freebsd.org/D8775

diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 808dc72afcb31f7fc9da8b85adffbaee524bce79..45a27e281cf5575e32577001c471f51ff3edd530 100644 (file)
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -1394,9 +1394,9 @@ adasysctlinit(void *context, int pending)
 
        sysctl_ctx_init(&softc->sysctl_ctx);
        softc->flags |= ADA_FLAG_SCTX_INIT;
-       softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
+       softc->sysctl_tree = SYSCTL_ADD_NODE_WITH_LABEL(&softc->sysctl_ctx,
                SYSCTL_STATIC_CHILDREN(_kern_cam_ada), OID_AUTO, tmpstr2,
-               CTLFLAG_RD, 0, tmpstr);
+               CTLFLAG_RD, 0, tmpstr, "device_index");
        if (softc->sysctl_tree == NULL) {
                printf("adasysctlinit: unable to allocate sysctl tree\n");
                cam_periph_release(periph);

diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c
index aa37de2270f9a96dd9d17288d4d4e852c3af181b..1b28fdd03388ab0b919bd8df0fb1108d67dda83b 100644 (file)
--- a/sys/cam/ata/ata_pmp.c
+++ b/sys/cam/ata/ata_pmp.c
@@ -350,9 +350,9 @@ pmpsysctlinit(void *context, int pending)
 
        sysctl_ctx_init(&softc->sysctl_ctx);
        softc->flags |= PMP_FLAG_SCTX_INIT;
-       softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
+       softc->sysctl_tree = SYSCTL_ADD_NODE_WITH_LABEL(&softc->sysctl_ctx,
                SYSCTL_STATIC_CHILDREN(_kern_cam_pmp), OID_AUTO, tmpstr2,
-               CTLFLAG_RD, 0, tmpstr);
+               CTLFLAG_RD, 0, tmpstr, "device_index");
        if (softc->sysctl_tree == NULL) {
                printf("pmpsysctlinit: unable to allocate sysctl tree\n");
                cam_periph_release(periph);

diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index 9628530edb20601113daab357405ff4932903841..5e316c365295a2adc1978ba546dcc7d75861f75b 100644 (file)
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -608,9 +608,9 @@ ndasysctlinit(void *context, int pending)
 
        sysctl_ctx_init(&softc->sysctl_ctx);
        softc->flags |= NDA_FLAG_SCTX_INIT;
-       softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
+       softc->sysctl_tree = SYSCTL_ADD_NODE_WITH_LABEL(&softc->sysctl_ctx,
                SYSCTL_STATIC_CHILDREN(_kern_cam_nda), OID_AUTO, tmpstr2,
-               CTLFLAG_RD, 0, tmpstr);
+               CTLFLAG_RD, 0, tmpstr, "device_index");
        if (softc->sysctl_tree == NULL) {
                printf("ndasysctlinit: unable to allocate sysctl tree\n");
                cam_periph_release(periph);

diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 42dd491f86d10fc34f8b1acf8ca32c704058c5ac..4a9f44cd72804fe8700e4c87e3fe5e59dce62bb4 100644 (file)
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -481,9 +481,9 @@ cdsysctlinit(void *context, int pending)
 
        sysctl_ctx_init(&softc->sysctl_ctx);
        softc->flags |= CD_FLAG_SCTX_INIT;
-       softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
+       softc->sysctl_tree = SYSCTL_ADD_NODE_WITH_LABEL(&softc->sysctl_ctx,
                SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO,
-               tmpstr2, CTLFLAG_RD, 0, tmpstr);
+               tmpstr2, CTLFLAG_RD, 0, tmpstr, "device_index");
 
        if (softc->sysctl_tree == NULL) {
                printf("cdsysctlinit: unable to allocate sysctl tree\n");

diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index ffceb23a7c66eca931723583122bbc6012cf21de..cad8f01a11cbcdb3942268fbad8faa35e06774d4 100644 (file)
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1924,9 +1924,9 @@ dasysctlinit(void *context, int pending)
 
        sysctl_ctx_init(&softc->sysctl_ctx);
        softc->flags |= DA_FLAG_SCTX_INIT;
-       softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
+       softc->sysctl_tree = SYSCTL_ADD_NODE_WITH_LABEL(&softc->sysctl_ctx,
                SYSCTL_STATIC_CHILDREN(_kern_cam_da), OID_AUTO, tmpstr2,
-               CTLFLAG_RD, 0, tmpstr);
+               CTLFLAG_RD, 0, tmpstr, "device_index");
        if (softc->sysctl_tree == NULL) {
                printf("dasysctlinit: unable to allocate sysctl tree\n");
                cam_periph_release(periph);

diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 3166b8a44c56226fdcf6553d6e92c7909154d3ee..2ed06abb820d4eff7a89a69bef325b15bb969070 100644 (file)
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -2308,9 +2308,9 @@ sasysctlinit(void *context, int pending)
 
        sysctl_ctx_init(&softc->sysctl_ctx);
        softc->flags |= SA_FLAG_SCTX_INIT;
-       softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx,
+       softc->sysctl_tree = SYSCTL_ADD_NODE_WITH_LABEL(&softc->sysctl_ctx,
            SYSCTL_STATIC_CHILDREN(_kern_cam_sa), OID_AUTO, tmpstr2,
-                    CTLFLAG_RD, 0, tmpstr);
+           CTLFLAG_RD, 0, tmpstr, "device_index");
        if (softc->sysctl_tree == NULL)
                goto bailout;