ohai 14.5.4 → 14.6.2

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

@@ -1,70 +0,0 @@
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Author:: Tim Smith (tsmith@chef.io)
-# 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(:freebsd) 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-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)
-    #   Origin="GenuineIntel"  Id=0x40661  Family=0x6  Model=0x46  Stepping=1
-    #   Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>
-    #   Features2=0x5ed8220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AESNI,XSAVE,OSXSAVE,AVX,RDRAND>
-    #   AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>
-    #   AMD Features2=0x21<LAHF,ABM>
-    #   Structured Extended Features=0x2000<NFPUSG>
-    #   TSC: P-state invariant
-    #   ...
-    #   FreeBSD/SMP: Multiprocessor System Detected: 16 CPUs
-    #   FreeBSD/SMP: 2 package(s) x 4 core(s) x 2 SMT threads
-
-    File.open("/var/run/dmesg.boot").each do |line|
-      case line
-      when /CPU:\s+(.+) \(([\d.]+).+\)/
-        cpuinfo["model_name"] = $1
-        cpuinfo["mhz"] = $2
-      when /Origin.*"(.*)".*Family.*0x(\S+).*Model.*0x(\S+).*Stepping.*(\S+)/
-        cpuinfo["vendor_id"] = $1
-        # convert from hex value to int, but keep a string to match Linux ohai
-        cpuinfo["family"] = $2.to_i(16).to_s
-        cpuinfo["model"] = $3.to_i(16).to_s
-        cpuinfo["stepping"] = $4
-        # 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(","))
-      when /FreeBSD\/SMP: Multiprocessor System Detected: (\d*) CPUs/
-        cpuinfo["total"] = $1.to_i
-      when /FreeBSD\/SMP: (\d*) package\(s\) x (\d*) core\(s\)/
-        cpuinfo["real"] = $1.to_i
-        cpuinfo["cores"] = $1.to_i * $2.to_i
-      end
-    end
-
-    cpu cpuinfo
-  end
-end

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

@@ -1,32 +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
-  provides "os", "os_version"
-  require "ohai/mixin/os"
-
-  collect_data(:freebsd) do
-    os collect_os
-
-    # This is __FreeBSD_version. See sys/param.h or
-    # http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
-    os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
-  end
-end

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

@@ -1,120 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-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(:linux) do
-    cpuinfo = Mash.new
-    real_cpu = Mash.new
-    cpu_number = 0
-    current_cpu = nil
-
-    File.open("/proc/cpuinfo").each do |line|
-      case line
-      when /processor\s+:\s(.+)/
-        cpuinfo[$1] = Mash.new
-        current_cpu = $1
-        cpu_number += 1
-      when /vendor_id\s+:\s(.+)/
-        vendor_id = $1
-        if vendor_id =~ (/IBM\/S390/)
-          cpuinfo["vendor_id"] = vendor_id
-        else
-          cpuinfo[current_cpu]["vendor_id"] = vendor_id
-        end
-      when /cpu family\s+:\s(.+)/
-        cpuinfo[current_cpu]["family"] = $1
-      when /model\s+:\s(.+)/
-        cpuinfo[current_cpu]["model"] = $1
-      when /stepping\s+:\s(.+)/
-        cpuinfo[current_cpu]["stepping"] = $1
-      when /physical id\s+:\s(.+)/
-        cpuinfo[current_cpu]["physical_id"] = $1
-        real_cpu[$1] = true
-      when /core id\s+:\s(.+)/
-        cpuinfo[current_cpu]["core_id"] = $1
-      when /cpu cores\s+:\s(.+)/
-        cpuinfo[current_cpu]["cores"] = $1
-      when /model name\s+:\s(.+)/
-        cpuinfo[current_cpu]["model_name"] = $1
-      when /cpu MHz\s+:\s(.+)/
-        cpuinfo[current_cpu]["mhz"] = $1
-      when /cache size\s+:\s(.+)/
-        cpuinfo[current_cpu]["cache_size"] = $1
-      when /flags\s+:\s(.+)/
-        cpuinfo[current_cpu]["flags"] = $1.split(" ")
-      when /BogoMIPS\s+:\s(.+)/
-        cpuinfo[current_cpu]["bogomips"] = $1
-      when /Features\s+:\s(.+)/
-        cpuinfo[current_cpu]["features"] = $1.split(" ")
-      when /bogomips per cpu:\s(.+)/
-        cpuinfo["bogomips_per_cpu"] = $1
-      when /features\s+:\s(.+)/
-        cpuinfo["features"] = $1.split(" ")
-      when /processor\s(\d):\s(.+)/
-        current_cpu = $1
-        cpu_number += 1
-        cpuinfo[current_cpu] = Mash.new
-        current_cpu_info = $2.split(",")
-        current_cpu_info.each do |i|
-          name_value = i.split("=")
-          name = name_value[0].strip
-          value = name_value[1].strip
-          cpuinfo[current_cpu][name] = value
-        end
-      end
-    end
-
-    cpu cpuinfo
-
-    cpu[:total] = cpu_number
-
-    # use data we collected unless cpuinfo is lacking core information
-    # which is the case on older linux distros
-    if !real_cpu.empty? && cpu["0"]["cores"]
-      cpu[:real] = real_cpu.keys.length
-      cpu[:cores] = real_cpu.keys.length * cpu["0"]["cores"].to_i
-    else
-      begin
-        logger.trace("Plugin CPU: Falling back to aggregate data from lscpu as real cpu & core data is missing in /proc/cpuinfo")
-        so = shell_out("lscpu")
-        if so.exitstatus == 0
-          lscpu_data = Mash.new
-          so.stdout.each_line do |line|
-            case line
-            when /^Thread\(s\) per core:\s(.+)/ # http://rubular.com/r/lOw2pRrw1q
-              lscpu_data[:threads] = $1.to_i
-            when /^Core\(s\) per socket:\s(.+)/ # http://rubular.com/r/lOw2pRrw1q
-              lscpu_data[:cores] = $1.to_i
-            when /^Socket\(s\):\s(.+)/ # http://rubular.com/r/DIzmPtJFvK
-              lscpu_data[:sockets] = $1.to_i
-            end
-          end
-          cpu[:total] = lscpu_data[:sockets] * lscpu_data[:cores] * lscpu_data[:threads]
-          cpu[:real] = lscpu_data[:sockets]
-          cpu[:cores] = lscpu_data[:sockets] * lscpu_data[:cores]
-        else
-          logger.trace("Plugin CPU: Error executing lscpu. CPU data may not be available.")
-        end
-      rescue Ohai::Exceptions::Exec # util-linux isn't installed most likely
-        logger.trace("Plugin CPU: Error executing lscpu. util-linux may not be installed.")
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-#
-# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
-# Copyright:: Copyright (c) 2009 Mathieu Sauve-Frankel
-# 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(:netbsd) do
-    cpuinfo = Mash.new
-
-    # NetBSD provides some cpu information via sysctl, and a little via dmesg.boot
-    # unlike OpenBSD and FreeBSD, NetBSD does not provide information about the
-    # available instruction set
-    # cpu0 at mainbus0 apid 0: Intel 686-class, 2134MHz, id 0x6f6
-
-    File.open("/var/run/dmesg.boot").each do |line|
-      case line
-      when /cpu[\d\w\s]+:\s([\w\s\-]+),\s+(\w+),/
-        cpuinfo[:model_name] = $1
-        cpuinfo[:mhz] = $2.gsub(/mhz/i, "")
-      end
-    end
-
-    flags = []
-    so = shell_out("dmidecode")
-    so.stdout.lines do |line|
-      if line =~ /^\s+([A-Z\d-]+)\s+\([\w\s-]+\)$/
-        flags << $1.downcase
-      end
-    end
-
-    cpuinfo[:flags] = flags unless flags.empty?
-
-    cpu cpuinfo
-  end
-end

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

@@ -1,43 +0,0 @@
-#
-# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
-# Copyright:: Copyright (c) 2009 Mathieu Sauve-Frankel
-# 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(:openbsd) do
-    cpuinfo = Mash.new
-
-    # OpenBSD provides most cpu information via sysctl, the only thing we need to
-    # to scrape from dmesg.boot is the cpu feature list.
-    # cpu0: FPU,V86,DE,PSE,TSC,MSR,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,TM,SBF,EST,TM2
-
-    File.open("/var/run/dmesg.boot").each do |line|
-      case line
-      when /cpu\d+:\s+([A-Z]+$|[A-Z]+,.*$)/
-        cpuinfo["flags"] = $1.downcase.split(",")
-      end
-    end
-
-    [["hw.model", :model_name], ["hw.ncpu", :total], ["hw.cpuspeed", :mhz]].each do |param, node|
-      so = shell_out("sysctl -n #{param}")
-      cpuinfo[node] = so.stdout.split($/)[0]
-    end
-
-    cpu cpuinfo
-  end
-end

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

@@ -1,70 +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.
-#
-
-Ohai.plugin(:CPU) do
-  provides "cpu"
-
-  collect_data(:solaris2) do
-    cpu Mash.new
-    # This does assume that /usr/bin/kstat is in the path
-    processor_info = shell_out("kstat -p cpu_info").stdout.lines
-    cpu["total"] = 0
-    cpu["sockets"] = 0
-    cpu["cores"] = 0
-    cpu["corethreads"] = 0
-    cpu["cpustates"] = Mash.new
-
-    currentcpu = 0
-    cpucores = Array.new
-    cpusockets = Array.new
-    processor_info.each do |processor|
-      _desc, instance, _record, keyvalue = processor.split(":")
-      cpu[instance] ||= Mash.new
-      if currentcpu != instance
-        cpu["total"] += 1
-        currentcpu = instance
-      end
-      kv = keyvalue.split(/\s+/)
-      key = kv.shift
-      value = kv.join(" ").chomp
-      case key
-        when /chip_id/
-          cpu[instance]["socket"] = value
-          cpusockets.push(value) if cpusockets.index(value).nil?
-        when /cpu_type/
-          cpu[instance]["arch"] = value
-        when /clock_MHz/
-          cpu[instance]["mhz"] = value
-        when /brand/
-          cpu[instance]["model_name"] = value.sub(/\s+/, " ")
-        when /^state$/
-          cpu[instance]["state"] = value
-          cpu["cpustates"][value] ||= 0
-          cpu["cpustates"][value] += 1
-        when /core_id/
-          cpu[instance]["core_id"] = value
-           # Detect hyperthreading/multithreading
-          cpucores.push(value) if cpucores.index(value).nil?
-        when /family|fpu_type|model|stepping|vendor_id/
-          cpu[instance][key] = value
-      end
-    end
-    cpu["cores"] = cpucores.size
-    cpu["corethreads"] = (cpu["total"] / cpucores.size)
-    cpu["sockets"] = cpusockets.size
-    cpu["real"] = cpusockets.size
-  end
-end

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

@@ -1,106 +0,0 @@
-#
-# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
-# Copyright:: Copyright (c) 2008-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"
-
-  collect_data(:solaris2) do
-    fs = Mash.new
-
-    # Grab filesystem data from df
-    so = shell_out("df -Pka")
-    so.stdout.lines do |line|
-      case line
-      when /^Filesystem\s+kbytes/
-        next
-      when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
-        filesystem = $1
-        fs[filesystem] = Mash.new
-        fs[filesystem][:kb_size] = $2
-        fs[filesystem][:kb_used] = $3
-        fs[filesystem][:kb_available] = $4
-        fs[filesystem][:percent_used] = $5
-        fs[filesystem][:mount] = $6
-      end
-    end
-
-    # Grab file system type from df (must be done separately)
-    so = shell_out("df -na")
-    so.stdout.lines do |line|
-      next unless line =~ /^(.+?)\s*: (\S+)\s*$/
-      mount = $1
-      fs.each do |filesystem, fs_attributes|
-        next unless fs_attributes[:mount] == mount
-        fs[filesystem][:fs_type] = $2
-      end
-    end
-
-    # Grab mount information from /bin/mount
-    so = shell_out("mount")
-    so.stdout.lines do |line|
-      next unless line =~ /^(.+?) on (.+?) (.+?) on (.+?)$/
-      filesystem = $2
-      fs[filesystem] = Mash.new unless fs.key?(filesystem)
-      fs[filesystem][:mount] = $1
-      fs[filesystem][:mount_time] = $4 # $4 must come before "split", else it becomes nil
-      fs[filesystem][:mount_options] = $3.split("/")
-    end
-
-    # Grab any zfs data from "zfs get"
-    zfs = Mash.new
-    # ohai.plugin[:filesystem][:zfs_properties] = 'used'
-    # ohai.plugin[:filesystem][:zfs_properties] = ['mountpoint', 'creation', 'available', 'used']
-    zfs_get = "zfs get -p -H "
-    if configuration(:zfs_properties).nil? || configuration(:zfs_properties).empty?
-      zfs_get << "all"
-    else
-      zfs_get << [configuration(:zfs_properties)].join(",")
-    end
-    so = shell_out(zfs_get)
-    so.stdout.lines do |line|
-      next unless line =~ /^([^\t]+)\t([^\t]+)\t([^\t]+)\t([^\t]+)$/
-      filesystem = $1
-      zfs[filesystem] = Mash.new unless zfs.key?(filesystem)
-      zfs[filesystem][:values] = Mash.new unless zfs[filesystem].key?("values")
-      zfs[filesystem][:sources] = Mash.new unless zfs[filesystem].key?("sources")
-      zfs[filesystem][:values][$2] = $3
-      zfs[filesystem][:sources][$2] = $4.chomp
-    end
-
-    zfs.each do |filesystem, attributes|
-      fs[filesystem] = Mash.new unless fs.key?(filesystem)
-      fs[filesystem][:fs_type] = "zfs"
-      fs[filesystem][:mount] = attributes[:values][:mountpoint] if attributes[:values].key?("mountpoint")
-      fs[filesystem][:zfs_values] = attributes[:values]
-      fs[filesystem][:zfs_sources] = attributes[:sources]
-      # find all zfs parents
-      parents = filesystem.split("/")
-      zfs_parents = []
-      (0..parents.length - 1).to_a.each do |parent_indexes|
-        next_parent = parents[0..parent_indexes].join("/")
-        zfs_parents.push(next_parent)
-      end
-      zfs_parents.pop
-      fs[filesystem][:zfs_parents] = zfs_parents
-      fs[filesystem][:zfs_zpool] = (zfs_parents.length == 0)
-    end
-
-    # Set the filesystem data
-    filesystem fs
-  end
-end