ohai 14.5.4 → 14.6.2

data/spec/unit/plugins/windows/cpu_spec.rb

@@ -62,7 +62,7 @@ end
 
 describe Ohai::System, "Windows cpu plugin" do
   before(:each) do
-    @plugin = get_plugin("windows/cpu")
+    @plugin = get_plugin("cpu")
     allow(@plugin).to receive(:collect_os).and_return(:windows)
 
     @double_wmi = double(WmiLite::Wmi)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 14.5.4
+  version: 14.6.2
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -215,12 +215,9 @@ files:
 - lib/ohai/mixin/softlayer_metadata.rb
 - lib/ohai/mixin/string.rb
 - lib/ohai/plugin_config.rb
-- lib/ohai/plugins/aix/cpu.rb
-- lib/ohai/plugins/aix/filesystem.rb
 - lib/ohai/plugins/aix/kernel.rb
 - lib/ohai/plugins/aix/memory.rb
 - lib/ohai/plugins/aix/network.rb
-- lib/ohai/plugins/aix/os.rb
 - lib/ohai/plugins/aix/platform.rb
 - lib/ohai/plugins/aix/uptime.rb
 - lib/ohai/plugins/aix/virtualization.rb
@@ -230,7 +227,7 @@ files:
 - lib/ohai/plugins/chef.rb
 - lib/ohai/plugins/cloud.rb
 - lib/ohai/plugins/command.rb
-- lib/ohai/plugins/darwin/cpu.rb
+- lib/ohai/plugins/cpu.rb
 - lib/ohai/plugins/darwin/hardware.rb
 - lib/ohai/plugins/darwin/memory.rb
 - lib/ohai/plugins/darwin/network.rb
@@ -240,20 +237,16 @@ files:
 - lib/ohai/plugins/digital_ocean.rb
 - lib/ohai/plugins/dmi.rb
 - lib/ohai/plugins/docker.rb
-- lib/ohai/plugins/dragonflybsd/cpu.rb
 - lib/ohai/plugins/dragonflybsd/memory.rb
 - lib/ohai/plugins/dragonflybsd/network.rb
-- lib/ohai/plugins/dragonflybsd/os.rb
 - lib/ohai/plugins/dragonflybsd/platform.rb
 - lib/ohai/plugins/ec2.rb
 - lib/ohai/plugins/elixir.rb
 - lib/ohai/plugins/erlang.rb
 - lib/ohai/plugins/eucalyptus.rb
 - lib/ohai/plugins/filesystem.rb
-- lib/ohai/plugins/freebsd/cpu.rb
 - lib/ohai/plugins/freebsd/memory.rb
 - lib/ohai/plugins/freebsd/network.rb
-- lib/ohai/plugins/freebsd/os.rb
 - lib/ohai/plugins/freebsd/platform.rb
 - lib/ohai/plugins/gce.rb
 - lib/ohai/plugins/go.rb
@@ -269,7 +262,6 @@ files:
 - lib/ohai/plugins/libvirt.rb
 - lib/ohai/plugins/linode.rb
 - lib/ohai/plugins/linux/block_device.rb
-- lib/ohai/plugins/linux/cpu.rb
 - lib/ohai/plugins/linux/fips.rb
 - lib/ohai/plugins/linux/hostnamectl.rb
 - lib/ohai/plugins/linux/lsb.rb
@@ -284,7 +276,6 @@ files:
 - lib/ohai/plugins/linux/virtualization.rb
 - lib/ohai/plugins/lua.rb
 - lib/ohai/plugins/mono.rb
-- lib/ohai/plugins/netbsd/cpu.rb
 - lib/ohai/plugins/netbsd/memory.rb
 - lib/ohai/plugins/netbsd/network.rb
 - lib/ohai/plugins/netbsd/platform.rb
@@ -292,7 +283,6 @@ files:
 - lib/ohai/plugins/nodejs.rb
 - lib/ohai/plugins/ohai.rb
 - lib/ohai/plugins/ohai_time.rb
-- lib/ohai/plugins/openbsd/cpu.rb
 - lib/ohai/plugins/openbsd/memory.rb
 - lib/ohai/plugins/openbsd/network.rb
 - lib/ohai/plugins/openbsd/platform.rb
@@ -316,9 +306,7 @@ files:
 - lib/ohai/plugins/shard.rb
 - lib/ohai/plugins/shells.rb
 - lib/ohai/plugins/softlayer.rb
-- lib/ohai/plugins/solaris2/cpu.rb
 - lib/ohai/plugins/solaris2/dmi.rb
-- lib/ohai/plugins/solaris2/filesystem.rb
 - lib/ohai/plugins/solaris2/memory.rb
 - lib/ohai/plugins/solaris2/network.rb
 - lib/ohai/plugins/solaris2/platform.rb
@@ -329,7 +317,6 @@ files:
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
 - lib/ohai/plugins/vmware.rb
-- lib/ohai/plugins/windows/cpu.rb
 - lib/ohai/plugins/windows/drivers.rb
 - lib/ohai/plugins/windows/filesystem.rb
 - lib/ohai/plugins/windows/fips.rb
@@ -402,7 +389,6 @@ files:
 - spec/unit/plugins/aix/kernel_spec.rb
 - spec/unit/plugins/aix/memory_spec.rb
 - spec/unit/plugins/aix/network_spec.rb
-- spec/unit/plugins/aix/os_spec.rb
 - spec/unit/plugins/aix/platform_spec.rb
 - spec/unit/plugins/aix/uptime_spec.rb
 - spec/unit/plugins/aix/virtualization_spec.rb
@@ -435,7 +421,6 @@ files:
 - spec/unit/plugins/freebsd/cpu_spec.rb
 - spec/unit/plugins/freebsd/hostname_spec.rb
 - spec/unit/plugins/freebsd/kernel_spec.rb
-- spec/unit/plugins/freebsd/os_spec.rb
 - spec/unit/plugins/freebsd/platform_spec.rb
 - spec/unit/plugins/gce_spec.rb
 - spec/unit/plugins/go_spec.rb

data/lib/ohai/plugins/aix/cpu.rb

@@ -1,64 +0,0 @@
-#
-# Author:: Joshua Timberman <joshua@chef.io>
-# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, 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(:CPU) do
-  provides "cpu"
-
-  collect_data(:aix) do
-    cpu Mash.new
-
-    cpu[:total] = shell_out("pmcycles -m").stdout.lines.length
-
-    # The below is only relevent on an LPAR
-    if shell_out("uname -W").stdout.strip == "0"
-
-      # At least one CPU will be available, but we'll wait to increment this later.
-      cpu[:available] = 0
-
-      cpudevs = shell_out("lsdev -Cc processor").stdout.lines
-      # from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
-      # on AIX number of cores and processors are considered same
-      cpu[:real] = cpu[:cores] = cpudevs.length
-      cpudevs.each.with_index do |c, i|
-        name, status, location = c.split
-        index = i.to_s
-        cpu[index] = Mash.new
-        cpu[index][:status] = status
-        cpu[index][:location] = location
-        if status =~ /Available/
-          cpu[:available] += 1
-          lsattr = shell_out("lsattr -El #{name}").stdout.lines
-          lsattr.each do |attribute|
-            attrib, value = attribute.split
-            if attrib == "type"
-              cpu[index][:model_name] = value
-            elsif attrib == "frequency"
-              cpu[index][:mhz] = value.to_i / (1000 * 1000) # convert from hz to MHz
-            else
-              cpu[index][attrib] = value
-            end
-          end
-          # IBM is the only maker of CPUs for AIX systems.
-          cpu[index][:vendor_id] = "IBM"
-        end
-      end
-    end
-  end
-end

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

@@ -1,90 +0,0 @@
-#
-# Author:: Deepali Jagtap (<deepali.jagtap@clogeny.com>)
-# Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, 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(:Filesystem) do
-  provides "filesystem"
-
-  def parse_df_or_mount(shell_out)
-    oldie = Mash.new
-
-    shell_out.lines.each do |line|
-      fields = line.split
-      case line
-      # headers and horizontal rules to skip
-      when /^\s*(node|---|^Filesystem\s+1024-blocks)/
-        next
-      # strictly a df entry
-      when /^(.+?)\s+([0-9-]+)\s+([0-9-]+)\s+([0-9-]+)\s+([0-9-]+\%*)\s+(.+)$/
-        if $1 == "Global"
-          key = "#{$1}:#{$6}"
-        else
-          key = $1
-        end
-        oldie[key] ||= Mash.new
-        oldie[key][:kb_size] = $2
-        oldie[key][:kb_used] = $3
-        oldie[key][:kb_available] = $4
-        oldie[key][:percent_used] = $5
-        oldie[key][:mount] = $6
-      # an entry starting with 'G' or / (E.G. /tmp or /var)
-      when /^\s*(G.*?|\/\w)/
-        if fields[0] == "Global"
-          key = fields[0] + ":" + fields[1]
-        else
-          key = fields[0]
-        end
-        oldie[key] ||= Mash.new
-        oldie[key][:mount] = fields[1]
-        oldie[key][:fs_type] = fields[2]
-        oldie[key][:mount_options] = fields[6].split(",")
-      # entries occupying the 'Node' column parsed here
-      else
-        key = fields[0] + ":" + fields[1]
-        oldie[key] ||= Mash.new
-        oldie[key][:mount] = fields[2]
-        oldie[key][:fs_type] = fields[3]
-        oldie[key][:mount_options] = fields[7].split(",")
-      end
-    end
-    oldie
-  end
-
-  def collect_old_version(shell_outs)
-    mount_hash = parse_df_or_mount shell_outs[:mount]
-    df_hash    = parse_df_or_mount shell_outs[:df_Pk]
-
-    mount_hash.each do |key, hash|
-      df_hash[key].merge!(hash) if df_hash.key?(key)
-    end
-
-    mount_hash.merge(df_hash)
-  end
-
-  collect_data(:aix) do
-
-    # Cache the command output
-    shell_outs = Mash.new
-    shell_outs[:mount] = shell_out("mount").stdout
-    shell_outs[:df_Pk] = shell_out("df -Pk").stdout
-
-    filesystem collect_old_version(shell_outs)
-  end
-end

data/lib/ohai/plugins/aix/os.rb

@@ -1,30 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, 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 "ohai/mixin/os"
-
-Ohai.plugin(:OS) do
-  provides "os", "os_version"
-  depends "kernel"
-
-  collect_data(:aix) do
-    os collect_os
-    os_version shell_out("oslevel -s").stdout.strip
-  end
-end

data/lib/ohai/plugins/darwin/cpu.rb

@@ -1,50 +0,0 @@
-#
-# Author:: Nathan L Smith (<nlloyds@gmail.com>)
-# Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2013-2016 Chef Software, 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(:CPU) do
-  provides "cpu"
-
-  collect_data(:darwin) do
-    cpu Mash.new
-    shell_out("sysctl -a").stdout.lines.each do |line|
-      case line
-      when /^hw.packages: (.*)$/
-        cpu[:real] = Regexp.last_match[1].to_i
-      when /^hw.physicalcpu: (.*)$/
-        cpu[:cores] = Regexp.last_match[1].to_i
-      when /^hw.logicalcpu: (.*)$/
-        cpu[:total] = Regexp.last_match[1].to_i
-      when /^hw.cpufrequency: (.*)$/
-        cpu[:mhz] = Regexp.last_match[1].to_i / 1000000
-      when /^machdep.cpu.vendor: (.*)$/
-        cpu[:vendor_id] = Regexp.last_match[1].chomp
-      when /^machdep.cpu.brand_string: (.*)$/
-        cpu[:model_name] = Regexp.last_match[1].chomp
-      when /^machdep.cpu.model: (.*)$/
-        cpu[:model] = Regexp.last_match[1].to_i
-      when /^machdep.cpu.family: (.*)$/
-        cpu[:family] = Regexp.last_match[1].to_i
-      when /^machdep.cpu.stepping: (.*)$/
-        cpu[:stepping] = Regexp.last_match[1].to_i
-      when /^machdep.cpu.features: (.*)$/
-        cpu[:flags] = Regexp.last_match[1].downcase.split(" ")
-      end
-    end
-  end
-end

data/lib/ohai/plugins/dragonflybsd/cpu.rb

@@ -1,58 +0,0 @@
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Copyright:: Copyright (c) 2008 Bryan McLellan
-# 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(:CPU) do
-  provides "cpu"
-
-  collect_data(:dragonflybsd) do
-    # all dmesg output for smp I can find only provides info about a single processor
-    # identical processors is probably a hardware requirement so we'll duplicate data for each cpu
-    # old examples: http://www.bnv-bamberg.de/home/ba3294/smp/rbuild/index.htm
-    cpuinfo = Mash.new
-    cpuinfo["flags"] = []
-
-    # /var/run/dmesg.boot
-    # CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)
-    # Origin = "GenuineIntel"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9
-    # Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>
-    # Features2=0x209<SSE3,MON,SSSE3>
-    # AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>
-    # AMD Features2=0x1<LAHF>
-
-    File.open("/var/run/dmesg.boot").each do |line|
-      case line
-      when /CPU:\s+(.+) \(([\d.]+).+\)/
-        cpuinfo["model_name"] = $1
-        cpuinfo["mhz"] = $2
-      when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
-        cpuinfo["vendor_id"] = $1
-        cpuinfo["stepping"] = $3
-        # These _should_ match /AMD Features2?/ lines as well
-      when /Features=.+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(","))
-        # Features2=0x80000001<SSE3,<b31>>
-      when /Features2=[a-f\dx]+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(","))
-      end
-    end
-
-    cpu cpuinfo
-    so = shell_out("sysctl -n hw.ncpu")
-    cpu[:total] = so.stdout.split($/)[0].to_i
-  end
-end

data/lib/ohai/plugins/dragonflybsd/os.rb

@@ -1,31 +0,0 @@
-#
-# Authors:: Adam Jacob (<adam@chef.io>)
-#           Richard Manyanza (<liseki@nyikacraftsmen.com>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
-# Copyright:: Copyright (c) 2014 Richard Manyanza.
-# 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(:OS) do
-  require "ohai/mixin/os"
-  provides "os", "os_version"
-
-  collect_data(:dragonflybsd) do
-    os collect_os
-
-    # This is __DragonFly_version. See sys/param.h
-    os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
-  end
-end