lsblk.py: add devid in output

Add a function to obtain devid from the device path
and add it to the output

Signed-off-by: Damien Thenot <[email protected]>

Author: Nambrok

SOURCES/etc/xapi.d/plugins/lsblk.py

@@ -8,6 +8,11 @@
 
 from xcpngutils import run_command, error_wrapped
 
+def get_devid_from_device_path(device_path):
+    result = run_command(["find", "-L", "/dev/disk/by-id", "-samefile", device_path])
+    result_output = result["stdout"].decode("utf-8").strip()
+    return result_output.split("\n")
+
 @error_wrapped
 def list_block_devices(session, args):
     result = run_command(["lsblk", "-P", "-b", "-o", "NAME,KNAME,PKNAME,SIZE,TYPE,RO,MOUNTPOINT"])
@@ -20,6 +25,7 @@ def list_block_devices(session, args):
         output_dict = {key.lower(): output_dict[key].strip('"') for key in output_dict}
         kname = output_dict["kname"]
         pkname = output_dict["pkname"]
+        output_dict["devid"] = get_devid_from_device_path("/dev/" + kname)
         if pkname != "":
             parent = blockdevices[pkname]
             if "children" not in parent: