From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Apr 2019 17:34:43 +0000 (+0100)
Subject: Fix SMART monitoring of nvme devices
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/65c9e8faf5ce93135f34acfd6ec4f8ecd5f06f4f?ds=sidebyside

Fix SMART monitoring of nvme devices
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index c281c7fc8..bd525babf 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -353,6 +353,9 @@ disks = disks.map do |disk|
         munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
       end
     end
+  elsif disk[:device] =~ %r{^/dev/(nvme\d+)n\d+$}
+    device = Regexp.last_match(1)
+    munin = device
   elsif disk[:device]
     device = disk[:device].sub("/dev/", "")
     munin = device
@@ -368,7 +371,7 @@ disks = disks.map do |disk|
   ]
 end
 
-disks = disks.compact
+disks = disks.compact.uniq
 
 if disks.count.positive?
   package "smartmontools"