ohai 6.24.0.rc.0 → 6.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f76d654069d4ef12d8a6a3d30e9348e5bb27e3
-  data.tar.gz: 7c95096035412a72d52dac6eb4acc0e9d0475f01
+  metadata.gz: ea95d6137035fa5e4065985fda8ee793152bfb70
+  data.tar.gz: b8f8ebc64d0d228542eca403be15715dae942e51
 SHA512:
-  metadata.gz: 488496d1bd45d87ef018be9593e4b6d42a1643e5bd4a9d8a297484d67bddc61d1ffaf30eb3b26d11d8a444a3402bee6426f7306a059c0d8a880faa080deb8e8f
-  data.tar.gz: e58cf67c4549c12ef3e6637300d704a1cfbb4204f05fe7a76c49398dcc345091159ffcf47b35c383330b05e49a50790bad5e37dcae941210d8f11fce8ded1b05
+  metadata.gz: 0a2bd36af0e8368ec8dcf6e95ef9833e546a956ba84c839c711ad8708a790468d3d3782f428e1ed58f662e48a4e5a4cee0d068f90332af71311f1c40ea088c23
+  data.tar.gz: cb3ec503e6c4fd6ec4d8aecaf338d5c3a1d2bcfc1b44bb98fd1eb8316dcc8579f739abd5dc8aad82fc53175c9627ebf49ed74046370a8344e23bd69d6b26a5b0

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

@@ -52,11 +52,21 @@ stdout.each_line do |line|
   end
 end
 
-# Gather more filesystem types via libuuid, even devices that's aren't mounted
-popen4("blkid -s TYPE") do |pid, stdin, stdout, stderr|
+have_lsblk = File.exists?('/bin/lsblk')
+
+# Gather more filesystem types via libuuid/libblkid even devices that
+# aren't mounted
+if have_lsblk
+  cmd = 'lsblk -r -o NAME,FSTYPE -n'
+  regex = /^(\S+) (\S+)/
+else
+  cmd = 'blkid -s TYPE'
+  regex = /^(\S+): TYPE="(\S+)"/
+end
+popen4(cmd) do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
-    if line =~ /^(\S+): TYPE="(\S+)"/
+    if line =~ regex
       filesystem = $1
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
       fs[filesystem][:fs_type] = $2
@@ -64,11 +74,18 @@ popen4("blkid -s TYPE") do |pid, stdin, stdout, stderr|
   end
 end
 
-# Gather device UUIDs via libuuid
-popen4("blkid -s UUID") do |pid, stdin, stdout, stderr|
+if have_lsblk
+  cmd = 'lsblk -r -o NAME,UUID -n'
+  regex = /^(\S+) (\S+)/
+else
+  cmd = 'blkid -s UUID'
+  regex = /^(\S+): UUID="(\S+)"/
+end
+
+popen4(cmd) do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
-    if line =~ /^(\S+): UUID="(\S+)"/
+    if line =~ regex
       filesystem = $1
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
       fs[filesystem][:uuid] = $2
@@ -76,11 +93,18 @@ popen4("blkid -s UUID") do |pid, stdin, stdout, stderr|
   end
 end
 
-# Gather device labels via libuuid
-popen4("blkid -s LABEL") do |pid, stdin, stdout, stderr|
+if have_lsblk
+  cmd = 'lsblk -r -o NAME,LABEL -n'
+  regex = /^(\S+) (\S+)/
+else
+  cmd = 'blkid -s LABEL'
+  regex = /^(\S+): LABEL="(\S+)"/
+end
+
+popen4(cmd) do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
-    if line =~ /^(\S+): LABEL="(\S+)"/
+    if line =~ regex
       filesystem = $1
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
       fs[filesystem][:label] = $2
@@ -90,7 +114,24 @@ end
 
 # Grab any missing mount information from /proc/mounts
 if File.exists?('/proc/mounts')
-  File.open('/proc/mounts').read_nonblock(4096).each_line do |line|
+  mounts = ''
+  # Due to https://tickets.opscode.com/browse/OHAI-196
+  # we have to non-block read dev files. Ew.
+  f = File.open('/proc/mounts')
+  loop do
+    begin
+      data = f.read_nonblock(4096)
+      mounts << data
+    # We should just catch EOFError, but the kernel had a period of
+    # bugginess with reading virtual files, so we're being extra
+    # cautious here, catching all exceptions, and then we'll read
+    # whatever data we might have
+    rescue Exception
+      break
+    end
+  end
+  f.close
+  mounts.each_line do |line|
     if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
       filesystem = $1
       next if fs.has_key?(filesystem)

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

@@ -201,13 +201,22 @@ if File.exist?("/sbin/ip")
     #    the routing table source field.
     # 3) and since we're at it, let's populate some :routes attributes
     # (going to do that for both inet and inet6 addresses)
-    popen4("ip -f #{family[:name]} route show") do |pid, stdin, stdout, stderr|
+    popen4("ip -o -f #{family[:name]} route show") do |pid, stdin, stdout, stderr|
       stdin.close
       stdout.each do |line|
-        if line =~ /^([^\s]+)\s(.*)$/
+        line.strip!
+        Ohai::Log.debug("Parsing #{line}")
+        if line =~ /\\/
+          parts = line.split('\\')
+          route_dest = parts.shift.strip
+          route_endings = parts
+        elsif line =~ /^([^\s]+)\s(.*)$/
           route_dest = $1
-          route_ending = $2
-          #
+          route_endings = [$2]
+        else
+          next
+        end
+        route_endings.each do |route_ending|
           if route_ending =~ /\bdev\s+([^\s]+)\b/
             route_int = $1
           else

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '6.24.0.rc.0'
+  VERSION = '6.24.0'
 end

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

@@ -42,10 +42,15 @@ describe Ohai::System, "Linux filesystem plugin" do
 
     @ohai.stub!(:run_command).with(@df_cmd).and_return([0,stdout,stderr])
     @ohai.stub!(:run_command).with(@mount_cmd).and_return([0,stdout,stderr])
+    File.stub!(:exists?).with("/bin/lsblk").and_return(false)
     @ohai.stub!(:popen4).with("blkid -s TYPE").and_return(false)
     @ohai.stub!(:popen4).with("blkid -s UUID").and_return(false)
     @ohai.stub!(:popen4).with("blkid -s LABEL").and_return(false)
 
+    @ohai.stub!(:popen4).with("lsblk -r -o NAME,FSTYPE -n").and_return(false)
+    @ohai.stub!(:popen4).with("lsblk -r -o NAME,UUID -n").and_return(false)
+    @ohai.stub!(:popen4).with("lsblk -r -o NAME,LABEL -n").and_return(false)
+
     File.stub!(:exists?).with("/proc/mounts").and_return(false)
   end
 
@@ -192,6 +197,37 @@ describe Ohai::System, "Linux filesystem plugin" do
     end
   end
 
+  describe "when gathering filesystem type data from lsblk" do
+    before(:each) do
+      File.stub!(:exists?).with('/bin/lsblk').and_return(true)
+      @stdin = mock("STDIN", { :close => true })
+      @pid = 10
+      @stderr = mock("STDERR")
+      @stdout = mock("STDOUT")
+      @status = 0
+
+      @stdout.stub!(:each).
+        and_yield("/dev/sdb1 linux_raid_member").
+        and_yield("/dev/sdb2 linux_raid_member").
+        and_yield("/dev/sda1 linux_raid_member").
+        and_yield("/dev/sda2 linux_raid_member").
+        and_yield("/dev/md0 ext3").
+        and_yield("/dev/md1 LVM2_member").
+        and_yield("/dev/mapper/sys.vg-root.lv ext4").
+        and_yield("/dev/mapper/sys.vg-swap.lv swap").
+        and_yield("/dev/mapper/sys.vg-tmp.lv ext4").
+        and_yield("/dev/mapper/sys.vg-usr.lv ext4").
+        and_yield("/dev/mapper/sys.vg-var.lv ext4").
+        and_yield("/dev/mapper/sys.vg-home.lv xfs")
+    end
+
+    it "should run lsblk -r -o NAME,FSTYPE -n" do
+      @ohai.should_receive(:popen4).with("lsblk -r -o NAME,FSTYPE -n").
+        and_return(true)
+      @ohai._require_plugin("linux::filesystem")
+    end
+  end
+
   describe "when gathering filesystem uuid data from blkid" do
     before(:each) do
       @stdin = mock("STDIN", { :close => true })
@@ -227,6 +263,44 @@ describe Ohai::System, "Linux filesystem plugin" do
     end
   end
 
+  describe "when gathering filesystem uuid data from lsblk" do
+    before(:each) do
+      File.stub!(:exists?).with('/bin/lsblk').and_return(true)
+      @stdin = mock("STDIN", { :close => true })
+      @pid = 10
+      @stderr = mock("STDERR")
+      @stdout = mock("STDOUT")
+      @status = 0
+
+      @stdout.stub!(:each).
+        and_yield("/dev/sdb1 bd1197e0-6997-1f3a-e27e-7801388308b5").
+        and_yield("/dev/sdb2 e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa").
+        and_yield("/dev/sda1 bd1197e0-6997-1f3a-e27e-7801388308b5").
+        and_yield("/dev/sda2 e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa").
+        and_yield("/dev/md0 37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32").
+        and_yield("/dev/md1 YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK").
+        and_yield("/dev/mapper/sys.vg-root.lv 7742d14b-80a3-4e97-9a32-478be9ea9aea").
+        and_yield("/dev/mapper/sys.vg-swap.lv 9bc2e515-8ddc-41c3-9f63-4eaebde9ce96").
+        and_yield("/dev/mapper/sys.vg-tmp.lv 74cf7eb9-428f-479e-9a4a-9943401e81e5").
+        and_yield("/dev/mapper/sys.vg-usr.lv 26ec33c5-d00b-4f88-a550-492def013bbc").
+        and_yield("/dev/mapper/sys.vg-var.lv 6b559c35-7847-4ae2-b512-c99012d3f5b3").
+        and_yield("/dev/mapper/sys.vg-home.lv d6efda02-1b73-453c-8c74-7d8dee78fa5e")
+    end
+
+    it "should run lsblk -r -o NAME,UUID -n" do
+      @ohai.should_receive(:popen4).with("lsblk -r -o NAME,UUID -n").
+        and_return(true)
+      @ohai._require_plugin("linux::filesystem")
+    end
+
+    it "should set kb_size to value from lsblk -r -o NAME,UUID -n" do
+      @ohai.stub!(:popen4).with("lsblk -r -o NAME,UUID -n").
+        and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai._require_plugin("linux::filesystem")
+      @ohai[:filesystem]["/dev/sda2"][:uuid].should be == "e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa"
+    end
+  end
+
   describe "when gathering filesystem label data from blkid" do
     before(:each) do
       @stdin = mock("STDIN", { :close => true })
@@ -260,28 +334,73 @@ describe Ohai::System, "Linux filesystem plugin" do
     end
   end
 
+  describe "when gathering filesystem label data from lsblk" do
+    before(:each) do
+      File.stub!(:exists?).with('/bin/lsblk').and_return(true)
+      @stdin = mock("STDIN", { :close => true })
+      @pid = 10
+      @stderr = mock("STDERR")
+      @stdout = mock("STDOUT")
+      @status = 0
+
+      @stdout.stub!(:each).
+        and_yield("/dev/sda1 fuego:0").
+        and_yield("/dev/sda2 fuego:1").
+        and_yield("/dev/sdb1 fuego:0").
+        and_yield("/dev/sdb2 fuego:1").
+        and_yield("/dev/md0 /boot").
+        and_yield("/dev/mapper/sys.vg-root.lv /").
+        and_yield("/dev/mapper/sys.vg-tmp.lv /tmp").
+        and_yield("/dev/mapper/sys.vg-usr.lv /usr").
+        and_yield("/dev/mapper/sys.vg-var.lv /var").
+        and_yield("/dev/mapper/sys.vg-home.lv /home")
+    end
+
+    it "should run lsblk -r -o NAME,LABEL -n" do
+      @ohai.should_receive(:popen4).with("lsblk -r -o NAME,LABEL -n").
+        and_return(true)
+      @ohai._require_plugin("linux::filesystem")
+    end
+
+    it "should set kb_size to value from lsblk -r -o NAME,LABEL -n" do
+      @ohai.stub!(:popen4).with("lsblk -r -o NAME,LABEL -n").
+        and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai._require_plugin("linux::filesystem")
+      @ohai[:filesystem]["/dev/md0"][:label].should be == "/boot"
+    end
+  end
+
+
   describe "when gathering data from /proc/mounts" do
     before(:each) do
       File.stub!(:exists?).with("/proc/mounts").and_return(true)
       @mock_file = mock("/proc/mounts")
       @mock_file.stub!(:read_nonblock).and_return(@mock_file)
-      @mock_file.stub!(:each_line).
-        and_yield("rootfs / rootfs rw 0 0").
-        and_yield("none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0").
-        and_yield("none /proc proc rw,nosuid,nodev,noexec,relatime 0 0").
-        and_yield("none /dev devtmpfs rw,relatime,size=2025576k,nr_inodes=506394,mode=755 0 0").
-        and_yield("none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0").
-        and_yield("/dev/mapper/sys.vg-root.lv / ext4 rw,noatime,errors=remount-ro,barrier=1,data=ordered 0 0").
-        and_yield("tmpfs /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0").
-        and_yield("tmpfs /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0").
-        and_yield("/dev/mapper/sys.vg-home.lv /home xfs rw,noatime,attr2,noquota 0 0").
-        and_yield("/dev/mapper/sys.vg-special.lv /special xfs ro,noatime,attr2,noquota 0 0").
-        and_yield("/dev/mapper/sys.vg-tmp.lv /tmp ext4 rw,noatime,barrier=1,data=ordered 0 0").
-        and_yield("/dev/mapper/sys.vg-usr.lv /usr ext4 rw,noatime,barrier=1,data=ordered 0 0").
-        and_yield("/dev/mapper/sys.vg-var.lv /var ext4 rw,noatime,barrier=1,data=ordered 0 0").
-        and_yield("/dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0").
-        and_yield("fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0").
-        and_yield("binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0")
+      @mounts = <<-MOUNTS
+rootfs / rootfs rw 0 0
+none /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
+none /proc proc rw,nosuid,nodev,noexec,relatime 0 0
+none /dev devtmpfs rw,relatime,size=2025576k,nr_inodes=506394,mode=755 0 0
+none /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
+/dev/mapper/sys.vg-root.lv / ext4 rw,noatime,errors=remount-ro,barrier=1,data=ordered 0 0
+tmpfs /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0
+tmpfs /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0
+/dev/mapper/sys.vg-home.lv /home xfs rw,noatime,attr2,noquota 0 0
+/dev/mapper/sys.vg-special.lv /special xfs ro,noatime,attr2,noquota 0 0
+/dev/mapper/sys.vg-tmp.lv /tmp ext4 rw,noatime,barrier=1,data=ordered 0 0
+/dev/mapper/sys.vg-usr.lv /usr ext4 rw,noatime,barrier=1,data=ordered 0 0
+/dev/mapper/sys.vg-var.lv /var ext4 rw,noatime,barrier=1,data=ordered 0 0
+/dev/md0 /boot ext3 rw,noatime,errors=remount-ro,data=ordered 0 0
+fusectl /sys/fs/fuse/connections fusectl rw,relatime 0 0
+binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
+MOUNTS
+      @counter = 0
+      @mock_file.stub(:read_nonblock) do
+        @counter += 1
+        raise EOFError if @counter == 2
+        @mounts
+      end
+      @mock_file.stub(:close)
       File.stub!(:open).with("/proc/mounts").and_return(@mock_file)
     end
 
@@ -300,5 +419,4 @@ describe Ohai::System, "Linux filesystem plugin" do
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount_options].should be == [ "ro", "noatime", "attr2", "noquota" ]
     end
   end
-
 end

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

@@ -45,8 +45,8 @@ def do_stubs
   @ohai.stub!(:popen4).with("ip -f inet6 neigh show").and_yield(nil, @stdin_ipneighbor_inet6, @ipneighbor_lines_inet6, nil)
   @ohai.stub!(:popen4).with("ip addr").and_yield(nil, @stdin_ipaddr, @ipaddr_lines, nil)
   @ohai.stub!(:popen4).with("ip -d -s link").and_yield(nil, @stdin_iplink, @iplink_lines, nil)
-  @ohai.stub!(:popen4).with("ip -f inet route show").and_yield(nil, @stdin_ip_route, @ip_route_lines, nil)
-  @ohai.stub!(:popen4).with("ip -f inet6 route show").and_yield(nil, @stdin_ip_route_inet6, @ip_route_inet6_lines, nil)
+  @ohai.stub!(:popen4).with("ip -o -f inet route show").and_yield(nil, @stdin_ip_route, @ip_route_lines, nil)
+  @ohai.stub!(:popen4).with("ip -o -f inet6 route show").and_yield(nil, @stdin_ip_route_inet6, @ip_route_inet6_lines, nil)
 end
 
 describe Ohai::System, "Linux Network Plugin" do
@@ -256,6 +256,7 @@ NEIGHBOR_SHOW
 192.168.212.0/24 dev foo:veth0@eth0  proto kernel  src 192.168.212.2
 172.16.151.0/24 dev eth0  proto kernel  src 172.16.151.100
 192.168.0.0/24 dev eth0  proto kernel  src 192.168.0.2
+10.5.4.0/24 \\        nexthop via 10.5.4.1 dev eth0 weight 1\\        nexthop via 10.5.4.2 dev eth0 weight 1
 default via 10.116.201.1 dev eth0
 IP_ROUTE_SCOPE
 
@@ -584,6 +585,8 @@ ROUTE_N
       it "adds routes" do
         @ohai._require_plugin("linux::network")
         @ohai['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "10.116.201.0/24", :proto => "kernel", :family =>"inet" )
+        @ohai['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "10.5.4.0/24", :family =>"inet", :via => "10.5.4.1")
+        @ohai['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "10.5.4.0/24", :family =>"inet", :via => "10.5.4.2")
         @ohai['network']['interfaces']['foo:veth0@eth0']['routes'].should include Mash.new( :destination => "192.168.212.0/24", :proto => "kernel", :src => "192.168.212.2", :family =>"inet" )
         @ohai['network']['interfaces']['eth0']['routes'].should include Mash.new( :destination => "fe80::/64", :metric => "256", :proto => "kernel", :family => "inet6" )
         @ohai['network']['interfaces']['eth0.11']['routes'].should include Mash.new( :destination => "1111:2222:3333:4444::/64", :metric => "1024", :family => "inet6" )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 6.24.0.rc.0
+  version: 6.24.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -430,9 +430,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2