Merge branch 'pevans-merge' of github.com:pauljevans/pcp into pauljevans-pevans-merge

Author: natoscott

qa/657

@@ -25,6 +25,8 @@ root=$tmp.root
 export DM_SETUP_CACHE="cat $root/dmcache-caches"
 export DM_SETUP_THINPOOL="cat $root/dmthin-pool"
 export DM_SETUP_THIN="cat $root/dmthin-thin"
+export DM_SETUP_CRYPT="cat $root/dmsetup-crypt"
+export DM_SETUP_CRYPTSETUP="cat $root/cryptsetup-status"
 
 # don't want Install to possibly restart pmcd via systemctl, as this
 # will clobber the environment, ...
@@ -118,6 +120,18 @@ echo 'zz_cache: 0 1677721600 cache 8 10162/262144 128 39839/3276800 1087840 8217
 echo 'yy_pool: 0 409600 thin-pool 0 13/65536 0/3200 - rw no_discard_passdown queue_if_no_space' > $root/dmthin-pool
 echo 'vg_1-lv3: 0 8388608 thin 7000704 8388607
 vg_1-lv2: 0 8388608 thin 6832768 8388607' > $root/dmthin-thin
+echo 'luks-4456fe89-d09e-416f-8721-bedb66abda85: 0 996853760 crypt' > $root/dmsetup-crypt
+echo '/dev/mapper/luks-4456fe89-d09e-416f-8721-bedb66abda85 is disabled and is not in use.
+  type:    LUKS2
+  cipher:  aes-xts-plain64
+  keysize: 512 [bits]
+  key location: keyring
+  device:  /dev/nvme0n1p3
+  sector size:  512 [bytes]
+  offset:  32768 [512-byte units] (16777216 [bytes])
+  size:    996853760 [512-byte units] (510389125120 [bytes])
+  mode:    read/write
+  flags:   discards' > $root/cryptsetup-status
 cd $here
 
 echo
@@ -137,6 +151,10 @@ echo
 echo "=== Check dm-thin metrics for thin vol metrics ==="
 pminfo -dfmtT dmthin.vol
 
+echo
+echo "=== Check dm-crypt metrics for crypt metrics ==="
+pminfo -dfmtT dmcrypt
+
 # cleanup
 _remove_pmda
 

qa/657.out

@@ -10,6 +10,7 @@ Updating the PMCD control file, and notifying PMCD ...
 Check dmcache metrics have appeared ... 16 metrics and X values
 Check dmthin metrics have appeared ... 13 metrics and X values
 Check dmstats metrics have appeared ... 15 metrics and X values
+Check dmcrypt metrics have appeared ... 13 metrics and X values
 
 === Check dm-cache metrics ===
 
@@ -228,3 +229,96 @@ Help:
 The highest mapped sector of the thin volume.
     inst [0 or "vg_1-lv3"] value 8388607
     inst [1 or "vg_1-lv2"] value 8388607
+
+=== Check dm-crypt metrics for crypt metrics ===
+
+dmcrypt.active PMID: 129.6.0 [Whether the crypt device is active]
+    Data Type: 32-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Whether the crypt device is active
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 0
+
+dmcrypt.type PMID: 129.6.1 [Crypt device type]
+    Data Type: string  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Crypt device type
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value "LUKS2"
+
+dmcrypt.cipher PMID: 129.6.2 [Cipher used for the crypt device]
+    Data Type: string  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Cipher used for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value "aes-xts-plain64"
+
+dmcrypt.keysize PMID: 129.6.3 [Keysize for the crypt device]
+    Data Type: 32-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Keysize for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 512
+
+dmcrypt.key_location PMID: 129.6.4 [Decryption key location for the crypt device]
+    Data Type: string  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Decryption key location for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value "keyring"
+
+dmcrypt.device PMID: 129.6.5 [The crypt device]
+    Data Type: string  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+The crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value "/dev/nvme0n1p3"
+
+dmcrypt.sector_size PMID: 129.6.6 [Sector size for the crypt device]
+    Data Type: 32-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Sector size for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 512
+
+dmcrypt.offset PMID: 129.6.7 [Offset for the crypt device]
+    Data Type: 64-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Offset for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 32768
+
+dmcrypt.offset_bytes PMID: 129.6.8 [Offset in bytes for the crypt device]
+    Data Type: 64-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Offset in bytes for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 16777216
+
+dmcrypt.size PMID: 129.6.9 [Crypt device size]
+    Data Type: 64-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Crypt device size
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 996853760
+
+dmcrypt.size_bytes PMID: 129.6.10 [Crypt device size in bytes]
+    Data Type: 64-bit unsigned int  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Crypt device size in bytes
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value 510389125120
+
+dmcrypt.mode PMID: 129.6.11 [Current mode for the crypt device]
+    Data Type: string  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Current mode for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value "read/write"
+
+dmcrypt.flags PMID: 129.6.12 [Flags for the crypt device]
+    Data Type: string  InDom: 129.6 0x20400006
+    Semantics: instant  Units: none
+Help:
+Flags for the crypt device
+    inst [0 or "luks-4456fe89-d09e-416f-8721-bedb66abda85"] value "discards"

src/pmdas/dm/GNUmakefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015-2021 Red Hat.
+# Copyright (c) 2015-2025 Red Hat.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -17,7 +17,7 @@ include	$(TOPDIR)/src/include/builddefs
 
 IAM		= dm
 DOMAIN		= DM
-PMNSFILES	= pmns.dmcache pmns.dmthin pmns.dmstats pmns.vdo
+PMNSFILES	= pmns.dmcache pmns.dmthin pmns.dmstats pmns.vdo pmns.dmcrypt
 CMDTARGET	= pmda$(IAM)
 LIBTARGET	= pmda_$(IAM).$(DSOSUFFIX)
 PMDAINIT	= $(IAM)_init
@@ -26,8 +26,8 @@ PMDAADMDIR	= $(PCP_PMDASADM_DIR)/$(IAM)
 PMIEDIR		= $(PCP_SYSCONF_DIR)/pmieconf/$(IAM)
 PMIEVARDIR	= $(PCP_VAR_DIR)/config/pmieconf/$(IAM)
 
-CFILES		= pmda.c dmthin.c dmcache.c vdo.c
-HFILES		= indom.h dmthin.h dmcache.h dmstats.h vdo.h
+CFILES		= pmda.c dmthin.c dmcache.c vdo.c dmcrypt.c
+HFILES		= indom.h dmthin.h dmcache.h dmstats.h vdo.h dmcrypt.h
 LLDLIBS		= $(PCP_PMDALIB)
 LCFLAGS		= $(INVISIBILITY)
 
@@ -79,11 +79,12 @@ domain.h: ../../pmns/stdpmid
 	$(DOMAIN_MAKERULE)
 
 $(OBJECTS): domain.h
-pmda.o dmcache.o dmthin.o dm.o vdo.o: indom.h
+pmda.o dmcache.o dmthin.o dm.o vdo.o dmcrypt.o: indom.h
 pmda.o dmcache.o: dmcache.h
 pmda.o dmthin.o: dmthin.h
 ifeq "$(HAVE_DEVMAPPER)" "true"
 pmda.o dmstats.o: dmstats.h
+pmda.o dmcrypt.o: dmcrypt.h
 endif
 pmda.o vdo.o: vdo.h
 

src/pmdas/dm/Install

@@ -19,7 +19,7 @@
 . $PCP_SHARE_DIR/lib/pmdaproc.sh
 
 iam=dm
-pmns_name="dmcache dmthin dmstats vdo"
+pmns_name="dmcache dmthin dmstats vdo dmcrypt"
 
 which dmsetup >/dev/null 2>&1
 if [ $? -ne 0 ]

src/pmdas/dm/Remove

@@ -19,7 +19,7 @@
 . $PCP_SHARE_DIR/lib/pmdaproc.sh
 
 iam=dm
-pmns_name="dmcache dmthin dmstats vdo"
+pmns_name="dmcache dmthin dmstats vdo dmcrypt"
 pmdaSetup
 pmdaRemove
 exit