mirrors
/
munin-contrib
mirror of https://github.com/munin-monitoring/contrib.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1423 from ap-wtioit/master-fix_nvme_github 

nvme: fix handling namespaces prefixed with 0x
This commit is contained in:
Kenyon Ralph 2024-04-09 16:31:42 -07:00 committed by GitHub
parent 2e8f4da189 2eab6784c0
commit ed0cd4c9cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/disk/nvme
View File

@ -160,6 +160,10 @@ sub nvme_list {
# --------------------- --------------------- -------------------- ---------------------------------------- --------- -------------------------- ---------------- --------
# /dev/nvme1n1 /dev/ng1n1 23103F009522 Micron_3400_MTFDKBA1T0TFH 1 1.02 TB / 1.02 TB 512 B + 0 B P7MU002
# /dev/nvme0n1 /dev/ng0n1 23103F00956D Micron_3400_MTFDKBA1T0TFH 1 1.02 TB / 1.02 TB 512 B + 0 B P7MU002
# version 2.5 (Namespace prefixed with 0x)
# Node Generic SN Model Namespace Usage Format FW Rev
# --------------------- --------------------- -------------------- ---------------------------------------- ---------- -------------------------- ---------------- --------
# /dev/nvme0n1 /dev/ng0n1 50026B7684E7EA69 KINGSTON SKC2500M82000G 0x1 1,36 TB / 2,00 TB 512 B + 0 B S7781101
my %devices;
my $recognised_output;
@ -172,7 +176,7 @@ sub nvme_list {
} elsif (m:^Node\s+Generic\s+SN\s+Model\s+Namespace\s+Usage\s+:) {
# version 2 header
++$recognised_output;
} elsif (m:^(/\S+)\s+(/\S+)\s+(\S+)\s+(\S.*\S)\s{3,}(\d+)\s+(\S+\s+.B)\s+/\s+(\S+\s+.B):) {
} elsif (m:^(/\S+)\s+(/\S+)\s+(\S+)\s+(\S.*\S)\s{3,}((0x)?\d+)\s+(\S+\s+.B)\s+/\s+(\S+\s+.B):) {
# version 2 data (first 2 columns start with /)
$devices{'SN_'.$3} = {
device => $1,