NAS-132049 / 24.04.2.4 / add ixnvdimm output to debug (by yocalebo) (…

…by bugclerk) (by bugclerk) (#237)

* add nvdimm_info

(cherry picked from commit 4de661f)
(cherry picked from commit adc8740)
(cherry picked from commit 997b989)

* Nvdimm info is not serializable

(cherry picked from commit b865ed2)
(cherry picked from commit a2c0b87)
(cherry picked from commit 6b4ed6f)

---------

Co-authored-by: Caleb <[email protected]>
Co-authored-by: M. Rehan <[email protected]>

ixdiagnose/plugins/hardware.py

@@ -1,8 +1,27 @@
+import os
+import re
+import typing
+
 from ixdiagnose.utils.command import Command
-from ixdiagnose.utils.middleware import MiddlewareCommand
+from ixdiagnose.utils.middleware import MiddlewareClient, MiddlewareCommand
+from ixdiagnose.utils.run import run
 
 from .base import Plugin
-from .metrics import CommandMetric, FileMetric, MiddlewareClientMetric
+from .metrics import CommandMetric, FileMetric, MiddlewareClientMetric, PythonMetric
+
+
+def nvdimm_info(client: MiddlewareClient, context: typing.Any) -> str:
+    nmem = re.compile(r'^nmem\d+$')
+    output = ''
+    with os.scandir('/dev/') as sdir:
+        for i in filter(lambda x: nmem.match(x.name), sdir):
+            output += f"{'=' * 20} {i.path} {'=' * 20}"
+            cp = run(f'/usr/local/sbin/ixnvdimm {i.path}', check=False)
+            if cp.returncode:
+                output += f'Failed to retrieve nvdimm info: {cp.stderr}\n\n'
+            else:
+                output += f'{cp.stdout}\n\n'
+    return output
 
 
 class Hardware(Plugin):
@@ -28,6 +47,7 @@ class Hardware(Plugin):
         MiddlewareClientMetric('disks_config', [MiddlewareCommand('disk.query')]),
         MiddlewareClientMetric('enclosure2', [MiddlewareCommand('enclosure2.query')]),
         MiddlewareClientMetric('enclosures', [MiddlewareCommand('enclosure.query')]),
+        PythonMetric('nvdimm_info', nvdimm_info, serializable=False),
     ]
     raw_metrics = [
         CommandMetric(