ohai 13.1.0 → 13.2.0

data/spec/unit/plugins/packages_spec.rb

@@ -210,6 +210,10 @@ describe Ohai::System, "plugin packages" do
     it "gets packages with version" do
       expect(plugin[:packages]["chef"][:version]).to eq("12.5.1.1")
     end
+
+    it "properly parses package names for RPMs" do
+      expect(plugin[:packages]["wget"][:version]).to eq("1.9.1-3")
+    end
   end
 
   context "on freebsd" do

data/spec/unit/plugins/rackspace_spec.rb

@@ -151,7 +151,7 @@ OUT
 
       expect(Ohai::Log).
         to receive(:debug).
-        with("rackspace plugin: Unable to find xenstore-ls, cannot capture " \
+        with("Plugin Rackspace: Unable to find xenstore-ls, cannot capture " \
              "region information for Rackspace cloud")
 
       plugin.run
@@ -174,7 +174,7 @@ OUT
 
       expect(Ohai::Log).
         to receive(:debug).
-        with("rackspace plugin: Unable to find xenstore-read, cannot capture " \
+        with("Plugin Rackspace: Unable to find xenstore-read, cannot capture " \
              "instance ID information for Rackspace cloud")
 
       plugin.run
@@ -266,7 +266,7 @@ OUT
 
       expect(Ohai::Log).
         to receive(:debug).
-        with("rackspace plugin: Unable to capture custom private networking " \
+        with("Plugin Rackspace: Unable to capture custom private networking " \
              "information for Rackspace cloud")
 
       plugin.run

data/spec/unit/plugins/zpools_spec.rb

@@ -0,0 +1,242 @@
+# 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, "zpools plugin" do
+  let(:plugin) { get_plugin("zpools") }
+
+  context "on Linux" do
+    let(:zpool_status_tank) do
+      <<-EOST
+  pool: tank
+  state: ONLINE
+  scan: scrub repaired 0 in 0h0m with 0 errors on Fri Jun  6 14:43:40 2014
+  config:
+
+    NAME                       STATE     READ WRITE CKSUM
+    tank                       ONLINE       0     0     0
+      raidz2-0                 ONLINE       0     0     0
+        sdc                    ONLINE       0     0     0
+        sdd                    ONLINE       0     0     0
+        sde                    ONLINE       0     0     0
+        sdf                    ONLINE       0     0     0
+        sdg                    ONLINE       0     0     0
+        sdh                    ONLINE       0     0     0
+      raidz2-1                 ONLINE       0     0     0
+        sdi                    ONLINE       0     0     0
+        sdj                    ONLINE       0     0     0
+        sdk                    ONLINE       0     0     0
+        sdl                    ONLINE       0     0     0
+        sdm                    ONLINE       0     0     0
+        sdn                    ONLINE       0     0     0
+EOST
+    end
+    let(:zpool_out) do
+      <<-EOZO
+rpool	109G	66.2G	42.8G	60%	1.00x	ONLINE	-
+tank	130T	4.91M	130T	0%	1.00x	ONLINE	-
+EOZO
+    end
+    let(:zpool_status_rpool) do
+      <<-EOSR
+  pool: rpool
+  state: ONLINE
+  scan: none requested
+  config:
+
+    NAME          STATE     READ WRITE CKSUM
+    rpool         ONLINE       0     0     0
+      mirror-0    ONLINE       0     0     0
+        sda       ONLINE       0     0     0
+        sdb       ONLINE       0     0     0
+
+  errors: No known data errors
+EOSR
+    end
+    before do
+      allow(plugin).to receive(:platform_family).and_return("rhel")
+      allow(plugin).to receive(:collect_os).and_return(:linux)
+      allow(plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0, zpool_out, ""))
+      allow(plugin).to receive(:shell_out).with("zpool status rpool").and_return(mock_shell_out(0, zpool_status_rpool, ""))
+      allow(plugin).to receive(:shell_out).with("zpool status tank").and_return(mock_shell_out(0, zpool_status_tank, ""))
+    end
+
+    it "Has entries for both zpools" do
+      plugin.run
+      expect(plugin[:zpools][:rpool]).to be
+      expect(plugin[:zpools][:tank]).to be
+    end
+
+    it "Has the correct pool size" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:pool_size]).to match("109G")
+      expect(plugin[:zpools][:tank][:pool_size]).to match("130T")
+    end
+
+    it "Has the correct pool allocated size" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:pool_allocated]).to match("66.2G")
+      expect(plugin[:zpools][:tank][:pool_allocated]).to match("4.91M")
+    end
+
+    it "Has the correct pool free size" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:pool_free]).to match("42.8G")
+      expect(plugin[:zpools][:tank][:pool_free]).to match("130T")
+    end
+
+    it "Has the correct capacity_used" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:capacity_used]).to match("60%")
+      expect(plugin[:zpools][:tank][:capacity_used]).to match("0%")
+    end
+
+    it "Has the correct dedup_factor" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:dedup_factor]).to match("1.00x")
+      expect(plugin[:zpools][:tank][:dedup_factor]).to match("1.00x")
+    end
+
+    it "Has the correct health" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:health]).to match("ONLINE")
+      expect(plugin[:zpools][:tank][:health]).to match("ONLINE")
+    end
+
+    it "Has the correct number of devices" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:devices].keys.size).to match(2)
+      expect(plugin[:zpools][:tank][:devices].keys.size).to match(12)
+    end
+
+    it "Won't have a version number" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:zpool_version]).to be_nil
+      expect(plugin[:zpools][:tank][:zpool_version]).to be_nil
+    end
+  end
+
+  context "on Solaris2" do
+    let(:zpool_status_tank) do
+      <<-EOST
+pool: tank
+state: ONLINE
+scan: scrub repaired 0 in 0h0m with 0 errors on Fri Jun  6 14:43:40 2014
+config:
+
+      NAME                       STATE     READ WRITE CKSUM
+      tank                       ONLINE       0     0     0
+        raidz2-0                 ONLINE       0     0     0
+          c1t50014EE209D1DBA9d0  ONLINE       0     0     0
+          c1t50014EE20A0ECED2d0  ONLINE       0     0     0
+          c1t50014EE20A106BFFd0  ONLINE       0     0     0
+          c1t50014EE20A1423E8d0  ONLINE       0     0     0
+          c1t50014EE20A145447d0  ONLINE       0     0     0
+          c1t50014EE20A29EE56d0  ONLINE       0     0     0
+        raidz2-1                 ONLINE       0     0     0
+          c1t50014EE20A2B984Cd0  ONLINE       0     0     0
+          c1t50014EE20A2BBC78d0  ONLINE       0     0     0
+          c1t50014EE20A2BDCA9d0  ONLINE       0     0     0
+          c1t50014EE25F697DC4d0  ONLINE       0     0     0
+          c1t50014EE25F698BECd0  ONLINE       0     0     0
+          c1t50014EE25F6998DAd0  ONLINE       0     0     0
+EOST
+    end
+    let(:zpool_out) do
+      <<-EOZO
+rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
+tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
+EOZO
+    end
+    let(:zpool_status_rpool) do
+      <<-EOSR
+pool: rpool
+state: ONLINE
+scan: resilvered 65.6G in 0h8m with 0 errors on Fri Jun  6 14:22:40 2014
+config:
+
+      NAME          STATE     READ WRITE CKSUM
+      rpool         ONLINE       0     0     0
+        mirror-0    ONLINE       0     0     0
+          c3t5d0s0  ONLINE       0     0     0
+          c3t4d0s0  ONLINE       0     0     0
+
+errors: No known data errors
+EOSR
+    end
+    before do
+      allow(plugin).to receive(:platform_family).and_return("solaris2")
+      allow(plugin).to receive(:collect_os).and_return(:solaris2)
+      allow(plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0, zpool_out, ""))
+      allow(plugin).to receive(:shell_out).with("su adm -c \"zpool status rpool\"").and_return(mock_shell_out(0, zpool_status_rpool, ""))
+      allow(plugin).to receive(:shell_out).with("su adm -c \"zpool status tank\"").and_return(mock_shell_out(0, zpool_status_tank, ""))
+    end
+
+    it "Has entries for both zpools" do
+      plugin.run
+      expect(plugin[:zpools][:rpool]).to be
+      expect(plugin[:zpools][:tank]).to be
+    end
+
+    it "Has the correct pool size" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:pool_size]).to match("109G")
+      expect(plugin[:zpools][:tank][:pool_size]).to match("130T")
+    end
+
+    it "Has the correct pool allocated size" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:pool_allocated]).to match("66.2G")
+      expect(plugin[:zpools][:tank][:pool_allocated]).to match("4.91M")
+    end
+
+    it "Has the correct pool free size" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:pool_free]).to match("42.8G")
+      expect(plugin[:zpools][:tank][:pool_free]).to match("130T")
+    end
+
+    it "Has the correct capacity_used" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:capacity_used]).to match("60%")
+      expect(plugin[:zpools][:tank][:capacity_used]).to match("0%")
+    end
+
+    it "Has the correct dedup_factor" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:dedup_factor]).to match("1.00x")
+      expect(plugin[:zpools][:tank][:dedup_factor]).to match("1.00x")
+    end
+
+    it "Has the correct health" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:health]).to match("ONLINE")
+      expect(plugin[:zpools][:tank][:health]).to match("ONLINE")
+    end
+
+    it "Has the correct number of devices" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:devices].keys.size).to match(2)
+      expect(plugin[:zpools][:tank][:devices].keys.size).to match(12)
+    end
+
+    it "Has a version number" do
+      plugin.run
+      expect(plugin[:zpools][:rpool][:zpool_version]).to match("34")
+      expect(plugin[:zpools][:tank][:zpool_version]).to match("34")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -280,6 +280,7 @@ files:
 - lib/ohai/plugins/linux/network.rb
 - lib/ohai/plugins/linux/platform.rb
 - lib/ohai/plugins/linux/sessions.rb
+- lib/ohai/plugins/linux/systemd_paths.rb
 - lib/ohai/plugins/linux/virtualization.rb
 - lib/ohai/plugins/lua.rb
 - lib/ohai/plugins/mono.rb
@@ -320,7 +321,6 @@ files:
 - lib/ohai/plugins/solaris2/network.rb
 - lib/ohai/plugins/solaris2/platform.rb
 - lib/ohai/plugins/solaris2/virtualization.rb
-- lib/ohai/plugins/solaris2/zpools.rb
 - lib/ohai/plugins/ssh_host_key.rb
 - lib/ohai/plugins/sysconf.rb
 - lib/ohai/plugins/timezone.rb
@@ -336,6 +336,7 @@ files:
 - lib/ohai/plugins/windows/network.rb
 - lib/ohai/plugins/windows/platform.rb
 - lib/ohai/plugins/windows/virtualization.rb
+- lib/ohai/plugins/zpools.rb
 - lib/ohai/provides_map.rb
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
@@ -458,6 +459,7 @@ files:
 - spec/unit/plugins/linux/network_spec.rb
 - spec/unit/plugins/linux/platform_spec.rb
 - spec/unit/plugins/linux/sessions_spec.rb
+- spec/unit/plugins/linux/systemd_paths_spec.rb
 - spec/unit/plugins/linux/uptime_spec.rb
 - spec/unit/plugins/linux/virtualization_spec.rb
 - spec/unit/plugins/lua_spec.rb
@@ -498,7 +500,6 @@ files:
 - spec/unit/plugins/solaris2/network_spec.rb
 - spec/unit/plugins/solaris2/platform_spec.rb
 - spec/unit/plugins/solaris2/virtualization_spec.rb
-- spec/unit/plugins/solaris2/zpools_spec.rb
 - spec/unit/plugins/ssh_host_keys_spec.rb
 - spec/unit/plugins/sysconf_spec.rb
 - spec/unit/plugins/timezone_spec.rb
@@ -509,6 +510,7 @@ files:
 - spec/unit/plugins/windows/memory_spec.rb
 - spec/unit/plugins/windows/uptime_spec.rb
 - spec/unit/plugins/windows/virtualization_spec.rb
+- spec/unit/plugins/zpools_spec.rb
 - spec/unit/provides_map_spec.rb
 - spec/unit/runner_spec.rb
 - spec/unit/system_spec.rb
@@ -534,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON

data/spec/unit/plugins/solaris2/zpools_spec.rb

@@ -1,153 +0,0 @@
-# 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, "Solaris 2.x zpool plugin" do
-  before(:each) do
-    @plugin = get_plugin("solaris2/zpools")
-    allow(@plugin).to receive(:collect_os).and_return(:solaris2)
-
-    @zpool_status_rpool = <<-EOSR
-pool: rpool
-state: ONLINE
-scan: resilvered 65.6G in 0h8m with 0 errors on Fri Jun  6 14:22:40 2014
-config:
-
-      NAME          STATE     READ WRITE CKSUM
-      rpool         ONLINE       0     0     0
-        mirror-0    ONLINE       0     0     0
-          c3t5d0s0  ONLINE       0     0     0
-          c3t4d0s0  ONLINE       0     0     0
-
-errors: No known data errors
-EOSR
-
-    @zpool_status_tank = <<-EOST
-pool: tank
-state: ONLINE
-scan: scrub repaired 0 in 0h0m with 0 errors on Fri Jun  6 14:43:40 2014
-config:
-
-      NAME                       STATE     READ WRITE CKSUM
-      tank                       ONLINE       0     0     0
-        raidz2-0                 ONLINE       0     0     0
-          c1t50014EE209D1DBA9d0  ONLINE       0     0     0
-          c1t50014EE20A0ECED2d0  ONLINE       0     0     0
-          c1t50014EE20A106BFFd0  ONLINE       0     0     0
-          c1t50014EE20A1423E8d0  ONLINE       0     0     0
-          c1t50014EE20A145447d0  ONLINE       0     0     0
-          c1t50014EE20A29EE56d0  ONLINE       0     0     0
-        raidz2-1                 ONLINE       0     0     0
-          c1t50014EE20A2B984Cd0  ONLINE       0     0     0
-          c1t50014EE20A2BBC78d0  ONLINE       0     0     0
-          c1t50014EE20A2BDCA9d0  ONLINE       0     0     0
-          c1t50014EE25F697DC4d0  ONLINE       0     0     0
-          c1t50014EE25F698BECd0  ONLINE       0     0     0
-          c1t50014EE25F6998DAd0  ONLINE       0     0     0
-EOST
-    @zpool_out = <<-EOZO
-rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
-tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
-EOZO
-    allow(@plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0, @zpool_out, ""))
-    allow(@plugin).to receive(:shell_out).with("su adm -c \"zpool status rpool\"").and_return(mock_shell_out(0, @zpool_status_rpool, ""))
-    allow(@plugin).to receive(:shell_out).with("su adm -c \"zpool status tank\"").and_return(mock_shell_out(0, @zpool_status_tank, ""))
-  end
-
-  describe "On Solaris2 Common" do
-    it "Should have entries for both zpools" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool]).to be
-      expect(@plugin[:zpools][:tank]).to be
-    end
-
-    it "Should have the correct pool size" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:pool_size]).to match("109G")
-      expect(@plugin[:zpools][:tank][:pool_size]).to match("130T")
-    end
-
-    it "Should have the correct pool allocated size" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:pool_allocated]).to match("66.2G")
-      expect(@plugin[:zpools][:tank][:pool_allocated]).to match("4.91M")
-    end
-
-    it "Should have the correct pool free size" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:pool_free]).to match("42.8G")
-      expect(@plugin[:zpools][:tank][:pool_free]).to match("130T")
-    end
-
-    it "Should have the correct capacity_used" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:capacity_used]).to match("60%")
-      expect(@plugin[:zpools][:tank][:capacity_used]).to match("0%")
-    end
-
-    it "Should have the correct dedup_factor" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:dedup_factor]).to match("1.00x")
-      expect(@plugin[:zpools][:tank][:dedup_factor]).to match("1.00x")
-    end
-
-    it "Should have the correct health" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:health]).to match("ONLINE")
-      expect(@plugin[:zpools][:tank][:health]).to match("ONLINE")
-    end
-
-    it "Should have the correct number of devices" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:devices].keys.size).to match(2)
-      expect(@plugin[:zpools][:tank][:devices].keys.size).to match(12)
-    end
-  end
-
-  describe "On OmniOS_151006" do
-    before(:each) do
-      @zpool_out = <<-EOZO
-rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  -
-tank    130T    4.91M   130T    0%      1.00x   ONLINE  -
-EOZO
-      allow(@plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0, @zpool_out, ""))
-    end
-
-    it "Won't have a version number" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:zpool_version]).to match("-")
-      expect(@plugin[:zpools][:tank][:zpool_version]).to match("-")
-    end
-
-  end
-
-  describe "On Solaris_11.1" do
-    before(:each) do
-      @zpool_out = <<-EOZO
-rpool   109G    66.2G   42.8G   60%     1.00x   ONLINE  34
-tank    130T    4.91M   130T    0%      1.00x   ONLINE  34
-EOZO
-      allow(@plugin).to receive(:shell_out).with("zpool list -H -o name,size,alloc,free,cap,dedup,health,version").and_return(mock_shell_out(0, @zpool_out, ""))
-    end
-
-    it "Should have a version number" do
-      @plugin.run
-      expect(@plugin[:zpools][:rpool][:zpool_version]).to match("34")
-      expect(@plugin[:zpools][:tank][:zpool_version]).to match("34")
-    end
-
-  end
-end