ohai 8.25.0 → 8.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c6a195abed88b1939ee4a307af1ee95d93a3c7
-  data.tar.gz: 6772104fe5375365f284283dec75aef36e6c185b
+  metadata.gz: 5a1b3302250943cf188557ec78a2f4680599ba9a
+  data.tar.gz: 02bce3c0c52a84b45a434ef78804f4f33e341333
 SHA512:
-  metadata.gz: 4800a4c9c26c0b5aa02279009c73c85b4e5697c1b52183391c190531508a890100deeaa23e9d09874cca53c6b008b694e7da6bc6642f14c977edfb6de9ff3dce
-  data.tar.gz: dd2ea9399d4a1a416cdda93f3280a41df665654d83eda6fb119a3b6db2e3dd17a5364ca41e1ca9e955eaabdc672968466228f92cef40412a1c83eaff109b6f69
+  metadata.gz: 6dbc95ed3640a4ae09726ae2e6dcd7895fd6470110c72539fdb8f0383a535cfcac6a03bc71397c1ef64651611ee244e696d7094e9dbce3d266452e8a71eaceee
+  data.tar.gz: 98806579f7b734f843fdcdbf1c636ee8da12be4d295078e1ca6742c13a9f708470157de4e392a19944301ca6e90de850e5dc0f7d5dbc263c396cee5af57bb0c7

data/lib/ohai/plugins/linux/mdadm.rb

@@ -59,7 +59,15 @@ Ohai.plugin(:Mdadm) do
         if line =~ /(md[0-9]+)/
           device = Regexp.last_match[1]
           pieces = line.split(/\s+/)
-          devices[device] = pieces[4..-1].map { |s| s.match(/(.+)\[\d\]/)[1] }
+          # there are variable numbers of fields until you hit the raid level
+          # everything after that is members...
+          # unless the array is inactive, in which case you don't get a raid
+          # level.
+          members = pieces.drop_while { |x| !x.start_with?("raid", "inactive") }
+          # drop the 'raid' too
+
+          members.shift unless members.empty?
+          devices[device] = members.map { |s| s.match(/(.+)\[\d+\]/)[1] }
         end
       end
 

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.25.0"
+  VERSION = "8.25.1"
 end

data/spec/unit/plugins/linux/mdadm_spec.rb

@@ -105,6 +105,45 @@ MD
         %w{sdc sdd sde sdf sdg sdh}
       )
     end
+
+    it "should detect member devices even if there are multi-digit numbers" do
+      new_mdstat = double("/proc/mdstat2")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
+        and_yield("md0 : active raid10 sdj[2010] sdi[99] sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
+        and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(
+        %w{sdc sdd sde sdf sdg sdh sdi sdj}
+      )
+    end
+
+    it "should detect member devices even if mdstat has extra entries" do
+      new_mdstat = double("/proc/mdstat2")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalities : [raid1] [raid6] [raid5] [raid4] [linear] [multipath] [raid0] [raid10]").
+        and_yield("md0 : active (somecraphere) <morestuff> raid10 sdh[5] sdg[4] sdf[3] sde[2] sdd[1] sdc[0]").
+        and_yield("      2929893888 blocks super 1.2 256K chunks 2 near-copies [6/6] [UUUUUU]")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(
+        %w{sdc sdd sde sdf sdg sdh}
+      )
+    end
+
+    it "should accurately report inactive arrays" do
+      new_mdstat = double("/proc/mdstat_inactive")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalities :").
+        and_yield("md0 : inactive nvme2n1p3[2](S)")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:members].sort).to eq(%w{nvme2n1p3})
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.25.0
+  version: 8.25.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu