From f720d0856b896aee2b9685c2ff3fc430ddcad28f Mon Sep 17 00:00:00 2001 From: Lukas M Date: Wed, 20 Dec 2023 00:09:12 +0100 Subject: [PATCH 1/2] feat: export vg name in node_physical_volume_size for lvm collector Signed-off-by: Lukas M --- lvm-prom-collector | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lvm-prom-collector b/lvm-prom-collector index cf8171ee..b3db9cf4 100755 --- a/lvm-prom-collector +++ b/lvm-prom-collector @@ -86,14 +86,14 @@ if [ "$physical" = true ]; then echo "# HELP node_physical_volume_free Physical volume free space in bytes" echo "# TYPE node_physical_volume_free gauge" - pvs_output=$(pvs --noheadings --units b --nosuffix --nameprefixes --unquoted --options pv_name,pv_fmt,pv_free,pv_size,pv_uuid 2>/dev/null) + pvs_output=$(pvs --noheadings --units b --nosuffix --nameprefixes --unquoted --options pv_name,vg_name,pv_fmt,pv_free,pv_size,pv_uuid 2>/dev/null) echo "$pvs_output" | while IFS= read -r line; do # Skip if the line is empty [ -z "$line" ] && continue # shellcheck disable=SC2086 declare $line echo "node_physical_volume_size{name=\"$LVM2_PV_NAME\", uuid=\"$LVM2_PV_UUID\", format=\"$LVM2_PV_FMT\"} $LVM2_PV_SIZE" - echo "node_physical_volume_free{name=\"$LVM2_PV_NAME\", uuid=\"$LVM2_PV_UUID\", format=\"$LVM2_PV_FMT\"} $LVM2_PV_FREE" + echo "node_physical_volume_free{name=\"$LVM2_PV_NAME\",vg_name=\"$LVM2_VG_NAME\" uuid=\"$LVM2_PV_UUID\", format=\"$LVM2_PV_FMT\"} $LVM2_PV_FREE" done fi From 805cc3fac817c9a963e8fe9f627d20aad7e04086 Mon Sep 17 00:00:00 2001 From: Lukas M Date: Wed, 20 Dec 2023 00:09:57 +0100 Subject: [PATCH 2/2] Update lvm-prom-collector Signed-off-by: Lukas M --- lvm-prom-collector | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lvm-prom-collector b/lvm-prom-collector index b3db9cf4..bf14c9cc 100755 --- a/lvm-prom-collector +++ b/lvm-prom-collector @@ -93,7 +93,7 @@ if [ "$physical" = true ]; then # shellcheck disable=SC2086 declare $line echo "node_physical_volume_size{name=\"$LVM2_PV_NAME\", uuid=\"$LVM2_PV_UUID\", format=\"$LVM2_PV_FMT\"} $LVM2_PV_SIZE" - echo "node_physical_volume_free{name=\"$LVM2_PV_NAME\",vg_name=\"$LVM2_VG_NAME\" uuid=\"$LVM2_PV_UUID\", format=\"$LVM2_PV_FMT\"} $LVM2_PV_FREE" + echo "node_physical_volume_free{name=\"$LVM2_PV_NAME\",vg_name=\"$LVM2_VG_NAME\", uuid=\"$LVM2_PV_UUID\", format=\"$LVM2_PV_FMT\"} $LVM2_PV_FREE" done fi