ohai 8.25.1 → 8.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a1b3302250943cf188557ec78a2f4680599ba9a
-  data.tar.gz: 02bce3c0c52a84b45a434ef78804f4f33e341333
+SHA256:
+  metadata.gz: cd104199be412d5cd0393ceba805110d171918f2905e8243cb9d7b34e2e5c841
+  data.tar.gz: e2d4ede2e672df83e36fb16cfb44e84724c42aa7b19dec4cf8c97a2bf8406ef1
 SHA512:
-  metadata.gz: 6dbc95ed3640a4ae09726ae2e6dcd7895fd6470110c72539fdb8f0383a535cfcac6a03bc71397c1ef64651611ee244e696d7094e9dbce3d266452e8a71eaceee
-  data.tar.gz: 98806579f7b734f843fdcdbf1c636ee8da12be4d295078e1ca6742c13a9f708470157de4e392a19944301ca6e90de850e5dc0f7d5dbc263c396cee5af57bb0c7
+  metadata.gz: 5c4bf1435c0f135060dddfafc0d55106ba6bf40f627f4da9fcd45b1ca64ef5864194754211b235b03348b1f7aa3093579c9e1565c0fbe5e40f3d4270d9d839ee
+  data.tar.gz: 2651bbb8601e41097a0f64c6f5da5653e3b4291796cee530849659a5127ed966295879498d5b7c14455c757e5dbfb2b3abd23752632f39a27f1a7f2cdad40ac4

data/lib/ohai/plugins/ec2.rb

@@ -21,65 +21,94 @@
 # How we detect EC2 from easiest to hardest & least reliable
 # 1. Ohai ec2 hint exists. This always works
 # 2. Xen hypervisor UUID starts with 'ec2'. This catches Linux HVM & paravirt instances
-# 3. DMI data mentions amazon. This catches HVM instances in a VPC
+# 3. DMI bios version data mentions amazon. This catches HVM instances in a VPC on the Xen based hypervisor
+# 3. DMI bios vendor data mentions amazon. This catches HVM instances in a VPC on the non-Xen based hypervisor
 # 4. Kernel data mentioned Amazon. This catches Windows HVM & paravirt instances
 
-require "ohai/mixin/ec2_metadata"
-require "base64"
-
 Ohai.plugin(:EC2) do
+  require "ohai/mixin/ec2_metadata"
+  require "base64"
+
   include Ohai::Mixin::Ec2Metadata
 
   provides "ec2"
 
-  depends "dmi"
-  depends "kernel"
+  # look for amazon string in dmi vendor bios data within the sys tree.
+  # this works even if the system lacks dmidecode use by the Dmi plugin
+  # this gets us detection of new Xen-less HVM instances that are within a VPC
+  # @return [Boolean] do we have Amazon DMI data?
+  def has_ec2_amazon_dmi?
+    # detect a version of '4.2.amazon'
+    if file_val_if_exists("/sys/class/dmi/id/bios_vendor") =~ /Amazon/
+      Ohai::Log.debug("Plugin EC2: has_ec2_amazon_dmi? == true")
+      true
+    else
+      Ohai::Log.debug("Plugin EC2: has_ec2_amazon_dmi? == false")
+      false
+    end
+  end
 
-  # look for amazon string in dmi bios data
+  # look for amazon string in dmi bios version data within the sys tree.
+  # this works even if the system lacks dmidecode use by the Dmi plugin
   # this gets us detection of HVM instances that are within a VPC
-  def has_ec2_dmi?
+  # @return [Boolean] do we have Amazon DMI data?
+  def has_ec2_xen_dmi?
     # detect a version of '4.2.amazon'
-    if get_attribute(:dmi, :bios, :all_records, 0, :Version) =~ /amazon/
-      Ohai::Log.debug("Plugin EC2: has_ec2_dmi? == true")
-      return true
+    if file_val_if_exists("/sys/class/dmi/id/bios_version") =~ /amazon/
+      Ohai::Log.debug("Plugin EC2: has_ec2_xen_dmi? == true")
+      true
     else
-      Ohai::Log.debug("Plugin EC2: has_ec2_dmi? == false")
-      return false
+      Ohai::Log.debug("Plugin EC2: has_ec2_xen_dmi? == false")
+      false
     end
   end
 
-  # looks for a xen UUID that starts with ec2
-  # this gets us detection of Linux HVM and Paravirt hosts
+  # looks for a xen UUID that starts with ec2 from within the Linux sys tree
+  # @return [Boolean] do we have a Xen UUID or not?
   def has_ec2_xen_uuid?
-    if ::File.exist?("/sys/hypervisor/uuid")
-      if ::File.read("/sys/hypervisor/uuid") =~ /^ec2/
-        Ohai::Log.debug("Plugin EC2: has_ec2_xen_uuid? == true")
-        return true
-      end
+    if file_val_if_exists("/sys/hypervisor/uuid") =~ /^ec2/
+      Ohai::Log.debug("Plugin EC2: has_ec2_xen_uuid? == true")
+      return true
     end
     Ohai::Log.debug("Plugin EC2: has_ec2_xen_uuid? == false")
-    return false
+    false
   end
 
-  # looks for the Amazon.com Organization in Windows Kernel data
-  # this gets us detection of Windows systems
-  def has_amazon_org?
-    # detect an Organization of 'Amazon.com'
-    if get_attribute(:kernel, :os_info, :organization) =~ /Amazon/
-      Ohai::Log.debug("Plugin EC2: has_amazon_org? == true")
-      return true
+  # looks at the identifying number WMI value to see if it starts with ec2.
+  # this is actually the same value we're looking at in has_ec2_xen_uuid? on
+  # linux hosts
+  # @return [Boolean] do we have a Xen Identifying Number or not?
+  def has_ec2_identifying_number?
+    if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      require "wmi-lite/wmi"
+      wmi = WmiLite::Wmi.new
+      if wmi.first_of("Win32_ComputerSystemProduct")["identifyingnumber"] =~ /^ec2/
+        Ohai::Log.debug("Plugin EC2: has_ec2_identifying_number? == true")
+        return true
+      end
     else
-      Ohai::Log.debug("Plugin EC2: has_amazon_org? == false")
-      return false
+      Ohai::Log.debug("Plugin EC2: has_ec2_identifying_number? == false")
+      false
+    end
+  end
+
+  # return the contents of a file if the file exists
+  # @param path[String] abs path to the file
+  # @return [String] contents of the file if it exists
+  def file_val_if_exists(path)
+    if ::File.exist?(path)
+      ::File.read(path)
     end
   end
 
+  # a single check that combines all the various detection methods for EC2
+  # @return [Boolean] Does the system appear to be on EC2
   def looks_like_ec2?
     return true if hint?("ec2")
 
     # Even if it looks like EC2 try to connect first
-    if has_ec2_xen_uuid? || has_ec2_dmi? || has_amazon_org?
-      return true if can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+    if has_ec2_xen_uuid? || has_ec2_amazon_dmi? || has_ec2_xen_dmi? || has_ec2_identifying_number?
+      return true if can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
     end
   end
 

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

@@ -0,0 +1,76 @@
+#
+# Author:: Joerg Herzinger <joerg.herzinger@oiml.at>
+# Author:: Phil Dibowitz <phil@ipom.com>
+# Copyright:: Copyright (c) 2011 GLOBAL 2000/Friends of the Earth Austria
+# Copyright:: Copyright (c) 2017 Facebook, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Ohai.plugin(:Lspci) do
+  depends "platform"
+  provides "pci"
+
+  collect_data(:linux) do
+    devices = Mash.new
+    lspci = shell_out("lspci -vnnmk")
+
+    h = /[0-9a-fA-F]/ #any hex digit
+    hh = /#{h}#{h}/ #any 2 hex digits
+    hhhh = /#{h}#{h}#{h}#{h}/ #any 4 hex digits
+
+    d_id = String.new #This identifies our pci devices
+
+    def standard_form(devices, d_id, hhhh, tag, line)
+      tmp = line.scan(/(.*)\s\[(#{hhhh})\]/)[0]
+      devices[d_id]["#{tag}_name"] = tmp[0]
+      devices[d_id]["#{tag}_id"] = tmp[1]
+    end
+
+    def standard_array(devices, d_id, tag, line)
+      if !devices[d_id][tag].kind_of?(Array)
+        devices[d_id][tag] = [line]
+      else
+        devices[d_id][tag].push(line)
+      end
+    end
+
+    lspci.stdout.split("\n").each do |line|
+      dev = line.scan(/^(.*):\s(.*)$/)[0]
+      next if dev.nil?
+      case dev[0]
+      when "Device" # There are two different Device tags
+        if tmp = dev[1].match(/(#{hh}:#{hh}.#{h})/)
+          # We have a device id
+          d_id = tmp[0] # From now on we will need this id
+          devices[d_id] = Mash.new
+        else
+          standard_form(devices, d_id, hhhh, "device", dev[1])
+        end
+      when "Class"
+        standard_form(devices, d_id, hhhh, "class", dev[1])
+      when "Vendor"
+        standard_form(devices, d_id, hhhh, "vendor", dev[1])
+      when "Driver"
+        standard_array(devices, d_id, "driver", dev[1])
+      when "Module"
+        standard_array(devices, d_id, "module", dev[1])
+      when "SDevice"
+        standard_form(devices, d_id, hhhh, "sdevice", dev[1])
+      else
+      end
+    end
+
+    pci devices
+  end
+end

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

@@ -64,10 +64,35 @@ Ohai.plugin(:Mdadm) do
           # 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
-
+          # and drop that too
           members.shift unless members.empty?
-          devices[device] = members.map { |s| s.match(/(.+)\[\d+\]/)[1] }
+          devices[device] = {
+            "active" => [],
+            "spare" => [],
+            "journal" => nil,
+          }
+          members.each do |member|
+            # We want to match the device, and optionally the type
+            # most entries will look like:
+            #   sdc1[5]
+            # but some will look like:
+            #   sdc1[5](J)
+            # where the format is:
+            #   <device>[<number in array>](<type>)
+            # Type can be things like "J" for a journal device, or "S" for
+            # a spare device.
+            m = member.match(/(.+)\[\d+\](?:\((\w)\))?/)
+            member_device = m[1]
+            member_type = m[2]
+            case member_type
+            when "J"
+              devices[device]["journal"] = member_device
+            when "S"
+              devices[device]["spare"] << member_device
+            else
+              devices[device]["active"] << member_device
+            end
+          end
         end
       end
 
@@ -82,7 +107,9 @@ Ohai.plugin(:Mdadm) do
 
           # if the mdadm command was sucessful pass so.stdout to create_raid_device_mash to grab the tidbits we want
           mdadm[device] = create_raid_device_mash(so.stdout) if so.stdout
-          mdadm[device]["members"] = devices[device]
+          mdadm[device]["members"] = devices[device]["active"]
+          mdadm[device]["spares"] = devices[device]["spare"]
+          mdadm[device]["journal"] = devices[device]["journal"]
         end
       end
     end

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

@@ -215,6 +215,31 @@ Ohai.plugin(:Network) do
         net_counters[tmp_int] = Mash.new unless net_counters[tmp_int]
       end
 
+      if line =~ /^\s+(ip6tnl|ipip)/
+        iface[tmp_int][:tunnel_info] = {}
+        words = line.split
+        words.each_with_index do |word, index|
+          case word
+          when "external"
+            iface[tmp_int][:tunnel_info][word] = true
+          when "any", "ipip6", "ip6ip6"
+            iface[tmp_int][:tunnel_info][:proto] = word
+          when "remote",
+               "local",
+               "encaplimit",
+               "hoplimit",
+               "tclass",
+               "flowlabel",
+               "addrgenmode",
+               "numtxqueues",
+               "numrxqueues",
+               "gso_max_size",
+               "gso_max_segs"
+            iface[tmp_int][:tunnel_info][word] = words[index + 1]
+          end
+        end
+      end
+
       if line =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
         int = on_rx ? :rx : :tx
         net_counters[tmp_int][int] = Mash.new unless net_counters[tmp_int][int]

data/lib/ohai/version.rb

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

data/spec/unit/plugins/ec2_spec.rb

@@ -17,20 +17,22 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
+require_relative "../../spec_helper.rb"
 require "open-uri"
 require "base64"
 
 describe Ohai::System, "plugin ec2" do
 
+  let(:plugin) { get_plugin("ec2") }
+
   before(:each) do
     allow(plugin).to receive(:hint?).with("ec2").and_return(false)
     allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(false)
+    allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(false)
+    allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(false)
   end
 
   shared_examples_for "!ec2" do
-    let(:plugin) { get_plugin("ec2") }
-
     it "DOESN'T attempt to fetch the ec2 metadata or set ec2 attribute" do
       expect(plugin).not_to receive(:http_client)
       expect(plugin[:ec2]).to be_nil
@@ -39,8 +41,6 @@ describe Ohai::System, "plugin ec2" do
   end
 
   shared_examples_for "ec2" do
-    let(:plugin) { get_plugin("ec2") }
-
     before(:each) do
       @http_client = double("Net::HTTP client")
       allow(plugin).to receive(:http_client).and_return(@http_client)
@@ -334,19 +334,39 @@ describe Ohai::System, "plugin ec2" do
     end
   end # shared examples for ec2
 
-  describe "with ec2 dmi data" do
+  describe "with amazon dmi bios version data" do
     it_behaves_like "ec2"
 
     before(:each) do
-      plugin[:dmi] = { :bios => { :all_records => [ { :Version => "4.2.amazon" } ] } }
+      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(true)
+      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_version").and_return("4.2.amazon\n")
     end
   end
 
-  describe "with amazon kernel data" do
+  describe "with non-amazon dmi bios version data" do
+    it_behaves_like "!ec2"
+
+    before(:each) do
+      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_version").and_return(true)
+      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_version").and_return("1.0\n")
+    end
+  end
+
+  describe "with amazon dmi bios vendor data" do
     it_behaves_like "ec2"
 
     before(:each) do
-      plugin[:kernel] = { :os_info => { :organization => "Amazon.com" } }
+      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(true)
+      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_vendor").and_return("Amazon EC2\n")
+    end
+  end
+
+  describe "with non-amazon dmi bios vendor data" do
+    it_behaves_like "!ec2"
+
+    before(:each) do
+      allow(File).to receive(:exist?).with("/sys/class/dmi/id/bios_vendor").and_return(true)
+      allow(File).to receive(:read).with("/sys/class/dmi/id/bios_vendor").and_return("Xen\n")
     end
   end
 
@@ -355,7 +375,7 @@ describe Ohai::System, "plugin ec2" do
 
     before(:each) do
       allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
-      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("ec2a0561-e4d6-8e15-d9c8-2e0e03adcde8")
+      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("ec2a0561-e4d6-8e15-d9c8-2e0e03adcde8\n")
     end
   end
 
@@ -364,7 +384,39 @@ describe Ohai::System, "plugin ec2" do
 
     before(:each) do
       allow(File).to receive(:exist?).with("/sys/hypervisor/uuid").and_return(true)
-      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("123a0561-e4d6-8e15-d9c8-2e0e03adcde8")
+      allow(File).to receive(:read).with("/sys/hypervisor/uuid").and_return("123a0561-e4d6-8e15-d9c8-2e0e03adcde8\n")
+    end
+  end
+
+  describe "with EC2 Identifying Number", :windows_only do
+    it_behaves_like "ec2"
+
+    before do
+      allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
+        { "caption" => "Computer System Product",
+          "description" => "Computer System Product",
+          "identifyingnumber" => "ec2a355a-91cd-5fe8-bbfc-cc891d0bf9d6",
+          "name" => "HVM domU",
+          "skunumber" => nil,
+          "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
+          "vendor" => "Xen",
+          "version" => "4.2.amazon" })
+    end
+  end
+
+  describe "without EC2 Identifying Number", :windows_only do
+    it_behaves_like "!ec2"
+
+    before do
+      allow_any_instance_of(WmiLite::Wmi).to receive(:first_of).and_return(
+        { "caption" => "Computer System Product",
+          "description" => "Computer System Product",
+          "identifyingnumber" => "1234",
+          "name" => "HVM domU",
+          "skunumber" => nil,
+          "uuid" => "5A352AEC-CD91-E85F-BBFC-CC891D0BF9D6",
+          "vendor" => "Xen",
+          "version" => "1.2.3" })
     end
   end
 

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

@@ -0,0 +1,133 @@
+#
+# Author:: Phil Dibowitz <phil@ipom.com>
+# Copyright:: Copyright (c) 2017 Facebook, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../../../spec_helper.rb"
+
+describe Ohai::System, "Linux lspci plugin" do
+  let (:plugin) { get_plugin("linux/lspci") }
+
+  before(:each) do
+    @stdout = <<LSPCI
+Device:	00:1f.3
+Class:	Audio device [0403]
+Vendor:	Intel Corporation [8086]
+Device:	Sunrise Point-LP HD Audio [9d71]
+SVendor:	Lenovo [17aa]
+SDevice:	Sunrise Point-LP HD Audio [224e]
+Rev:	21
+Driver:	snd_hda_intel
+Module:	snd_hda_intel
+Module:	snd_soc_skl
+
+Device:	00:1f.4
+Class:	SMBus [0c05]
+Vendor:	Intel Corporation [8086]
+Device:	Sunrise Point-LP SMBus [9d23]
+SVendor:	Lenovo [17aa]
+SDevice:	Sunrise Point-LP SMBus [224e]
+Rev:	21
+Driver:	i801_smbus
+Module:	i2c_i801
+
+Device:	00:1f.6
+Class:	Ethernet controller [0200]
+Vendor:	Intel Corporation [8086]
+Device:	Ethernet Connection (4) I219-LM [15d7]
+SVendor:	Lenovo [17aa]
+SDevice:	Ethernet Connection (4) I219-LM [224e]
+Rev:	21
+Driver:	e1000e
+Module:	e1000e
+
+Device:	02:00.0
+Class:	Unassigned class [ff00]
+Vendor:	Realtek Semiconductor Co., Ltd. [10ec]
+Device:	RTS525A PCI Express Card Reader [525a]
+SVendor:	Lenovo [17aa]
+SDevice:	RTS525A PCI Express Card Reader [224e]
+Rev:	01
+Driver:	rtsx_pci
+Module:	rtsx_pci
+
+Device:	04:00.0
+Class:	Network controller [0280]
+Vendor:	Intel Corporation [8086]
+Device:	Wireless 8265 / 8275 [24fd]
+SVendor:	Intel Corporation [8086]
+SDevice:	Wireless 8265 / 8275 [0130]
+Rev:	88
+Driver:	iwlwifi
+Module:	iwlwifi
+
+Device:	05:00.0
+Class:	Non-Volatile memory controller [0108]
+Vendor:	Toshiba America Info Systems [1179]
+Device:	Device [0115]
+SVendor:	Toshiba America Info Systems [1179]
+SDevice:	Device [0001]
+Rev:	01
+ProgIf:	02
+Driver:	nvme
+Module:	nvme
+NUMANode:	0
+LSPCI
+    allow(plugin).to receive(:shell_out).with("lspci -vnnmk").and_return(
+      mock_shell_out(0, @stdout, ""))
+
+    allow(plugin).to receive(:collect_os).and_return(:linux)
+  end
+
+  describe "when gathering data from lspci" do
+    it "lists all devices" do
+      plugin.run
+      expect(plugin[:pci].keys).to eq(
+        ["00:1f.3", "00:1f.4", "00:1f.6", "02:00.0", "04:00.0", "05:00.0"]
+      )
+    end
+
+    it "parses out device name vs id" do
+      plugin.run
+      expect(plugin[:pci]["04:00.0"]["device_name"]).to eq("Wireless 8265 / 8275")
+      expect(plugin[:pci]["04:00.0"]["device_id"]).to eq("24fd")
+    end
+
+    it "parses out sdevice name vs id" do
+      plugin.run
+      expect(plugin[:pci]["04:00.0"]["sdevice_name"]).to eq("Wireless 8265 / 8275")
+      expect(plugin[:pci]["04:00.0"]["sdevice_id"]).to eq("0130")
+    end
+
+    it "parses out class name vs id" do
+      plugin.run
+      expect(plugin[:pci]["04:00.0"]["class_name"]).to eq("Network controller")
+      expect(plugin[:pci]["04:00.0"]["class_id"]).to eq("0280")
+    end
+
+    it "parses out vendor name vs id" do
+      plugin.run
+      expect(plugin[:pci]["04:00.0"]["vendor_name"]).to eq("Intel Corporation")
+      expect(plugin[:pci]["04:00.0"]["vendor_id"]).to eq("8086")
+    end
+
+    it "provides drivers and modules" do
+      plugin.run
+      expect(plugin[:pci]["04:00.0"]["driver"]).to eq(["iwlwifi"])
+      expect(plugin[:pci]["04:00.0"]["module"]).to eq(["iwlwifi"])
+    end
+  end
+end

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

@@ -142,8 +142,29 @@ MD
       allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
 
       @plugin.run
-      expect(@plugin[:mdadm][:md0][:members].sort).to eq(%w{nvme2n1p3})
+      expect(@plugin[:mdadm][:md0][:spares]).to eq(%w{nvme2n1p3})
+    end
+
+    it "should report journal devices" do
+      new_mdstat = double("/proc/mdstat_journal")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalies : [raid6]").
+        and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] nvme2n1p3[0](J)")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:journal]).to eq("nvme2n1p3")
     end
-  end
 
+    it "should report spare devices" do
+      new_mdstat = double("/proc/mdstat_spare")
+      allow(new_mdstat).to receive(:each).
+        and_yield("Personalies : [raid6]").
+        and_yield("md0 : active (somecraphere) <morestuff raid6 sdbc1[7] sdd1[6] sde1[5] sdd1[4] sde1[3] sdf1[2] sdg1[1] sdh1[0](S)")
+      allow(File).to receive(:open).with("/proc/mdstat").and_return(new_mdstat)
+
+      @plugin.run
+      expect(@plugin[:mdadm][:md0][:spares]).to eq(%w{sdh1})
+    end
+  end
 end

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

@@ -240,6 +240,10 @@ EOM
        valid_lft forever preferred_lft forever
 13: fwdintf: <MULTICAST,NOARP,UP,LOWER_UP> mtu 1496 qdisc pfifo_fast state UNKNOWN group default qlen 1000
     link/ether 00:00:00:00:00:0a brd ff:ff:ff:ff:ff:ff
+14: ip6tnl0@NONE: <NOARP,UP,LOWER_UP> mtu 1452 qdisc noqueue state UNKNOWN group default qlen 1
+    link/tunnel6 :: brd ::
+    inet6 fe80::f47a:2aff:fef0:c6ef/64 scope link
+       valid_lft forever preferred_lft forever
 EOM
   end
 
@@ -300,6 +304,13 @@ EOM
     0          0        0       0       0       0
     TX: bytes  packets  errors  dropped carrier collsns
     140        2        0       1       0       0
+14: ip6tnl0@NONE: <NOARP> mtu 1452 qdisc noop state DOWN mode DEFAULT group default qlen 1
+    link/tunnel6 :: brd :: promiscuity 0
+    ip6tnl ip6ip6 remote :: local :: encaplimit 0 hoplimit 0 tclass 0x00 flowlabel 0x00000 (flowinfo 0x00000000) addrgenmode eui64 numtxqueues 1 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535
+    RX: bytes  packets  errors  dropped overrun mcast
+    0          0        0       0       0       0
+    TX: bytes  packets  errors  dropped carrier collsns
+    0          0        0       0       0       0
 EOM
   end
 
@@ -572,7 +583,11 @@ EOM
       end
 
       it "detects the interfaces" do
-        expect(plugin["network"]["interfaces"].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "fwdintf", "lo", "ovs-system", "tun0", "venet0", "venet0:0", "xapi1"])
+        if network_method == "iproute2"
+          expect(plugin["network"]["interfaces"].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "fwdintf", "ip6tnl0", "lo", "ovs-system", "tun0", "venet0", "venet0:0", "xapi1"])
+        else
+          expect(plugin["network"]["interfaces"].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "fwdintf", "lo", "ovs-system", "tun0", "venet0", "venet0:0", "xapi1"])
+        end
       end
 
       it "detects the layer one details of an ethernet interface" do
@@ -676,6 +691,26 @@ EOM
         expect(plugin["network"]["interfaces"]["eth0"]["arp"]["10.116.201.1"]).to eq("fe:ff:ff:ff:ff:ff")
       end
 
+      if network_method == "iproute2"
+        it "detects the tunnel information" do
+          expect(plugin["network"]["interfaces"]["ip6tnl0"]["tunnel_info"]).to eq(
+            {
+              "proto" => "ip6ip6",
+              "remote" => "::",
+              "local" => "::",
+              "encaplimit" => "0",
+              "hoplimit" => "0",
+              "tclass" => "0x00",
+              "flowlabel" => "0x00000",
+              "addrgenmode" => "eui64",
+              "numtxqueues" => "1",
+              "numrxqueues" => "1",
+              "gso_max_size" => "65536",
+              "gso_max_segs" => "65535",
+            }
+          )
+        end
+      end
     end
 
     describe "gathering interface counters via #{network_method}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.25.1
+  version: 8.26.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -275,6 +275,7 @@ files:
 - lib/ohai/plugins/linux/fips.rb
 - lib/ohai/plugins/linux/hostnamectl.rb
 - lib/ohai/plugins/linux/lsb.rb
+- lib/ohai/plugins/linux/lspci.rb
 - lib/ohai/plugins/linux/machineid.rb
 - lib/ohai/plugins/linux/mdadm.rb
 - lib/ohai/plugins/linux/memory.rb
@@ -463,6 +464,7 @@ files:
 - spec/unit/plugins/linux/hostnamectl_spec.rb
 - spec/unit/plugins/linux/kernel_spec.rb
 - spec/unit/plugins/linux/lsb_spec.rb
+- spec/unit/plugins/linux/lspci_spec.rb
 - spec/unit/plugins/linux/machineid_spec.rb
 - spec/unit/plugins/linux/mdadm_spec.rb
 - spec/unit/plugins/linux/memory_spec.rb
@@ -546,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON