ohai 8.19.2 → 8.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573fdb3e8bef180043ca49fa188ce03e9901ad3d
-  data.tar.gz: c3dae0cc5e5b33668abdc8a12c250899dd6d5a11
+  metadata.gz: 09b47a615ee064d16781e8ce7a847d71035d535a
+  data.tar.gz: fd200214865bb27d7ebce651d06798ac8d1b401a
 SHA512:
-  metadata.gz: 6b1b0e211f59a13907e7d573aa7cffee857568db53c7a36aadb3843fabbce25c3f652634258382f1b801296c9a7a1601dc93a0d93521c60b33b1237882e78b62
-  data.tar.gz: 2191d554c332033d0a028f1add4a6c3ae0e304954a8ba470f1a336e7e8cef5e4a4393c0e45661e22438fe6e5ce598b6869ae819163b7e7c5f214d22f82fb0800
+  metadata.gz: 42971e6add7b1e917f52bd5d416d622555c03764ae6c7e8090cf945ab77e0fba561719c7e8c4210169f164b2967a68df5cda3d6c5ed8ce87522a618466bf22de
+  data.tar.gz: b34aa2275ff4f580d1c37de0234a92ff7a0e6b1a98161e38e8c0ebbe4f7c0fa9aef36c1dcccc21a42a7deb99d920e9830214932ef6720adf247a81b17752772e

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development do
   gem "sigar", :platform => "ruby"
 
-  gem "chefstyle", "= 0.3.1"
+  gem "chefstyle", "= 0.4.0"
   gem "overcommit", ">= 0.34.1"
   gem "pry-byebug"
   gem "pry-stack_explorer"

data/lib/ohai/common/dmi.rb

@@ -24,7 +24,7 @@ module Ohai
       # all-lowercase, all non-alphanumeric converted to '_'
       # 128-255 are 'oem_data_[id]'
       # Everything else is 'unknown'
-      IdToDescription = {
+      ID_TO_DESCRIPTION = {
         0 =>   "bios",
         1 =>   "system",
         2 =>   "base_board",
@@ -71,7 +71,7 @@ module Ohai
 
       # list of IDs to collect, otherwise we generate pages of hashes about cache chip size and whatnot
       # See OHAI-260. When we can give the user a choice, this will be a default.
-      IdToCapture = [ 0, 1, 2, 3, 4, 6, 11 ]
+      ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ]
 
       # look up DMI ID
       def id_lookup(id)
@@ -79,8 +79,8 @@ module Ohai
           id = id.to_i
           if (id >= 128) && (id <= 255)
             id = "oem_data_#{id}"
-          elsif DMI::IdToDescription.has_key?(id)
-            id = DMI::IdToDescription[id]
+          elsif DMI::ID_TO_DESCRIPTION.has_key?(id)
+            id = DMI::ID_TO_DESCRIPTION[id]
           else
             Ohai::Log.debug("unrecognized header id; falling back to 'unknown'")
             id = "unknown"
@@ -95,12 +95,12 @@ module Ohai
       # for single occurrences of one type, copy to top level all fields and values
       # for multiple occurrences of same type, copy to top level all fields and values that are common to all records
       def convenience_keys(dmi)
-        dmi.each { |type, records|
+        dmi.each do |type, records|
           in_common = Mash.new
           next unless records.class.to_s == "Mash"
           next unless records.has_key?("all_records")
-          records[:all_records].each { |record|
-            record.each { |field, value|
+          records[:all_records].each do |record|
+            record.each do |field, value|
               next if value.class.to_s == "Mash"
               next if field.to_s == "application_identifier"
               next if field.to_s == "size"
@@ -112,13 +112,13 @@ module Ohai
               else
                 in_common[translated] = value
               end
-            }
-          }
-          in_common.each { |field, value|
+            end
+          end
+          in_common.each do |field, value|
             next if value == nil
             dmi[type][field] = value.strip
-          }
-        }
+          end
+        end
       end
 
       module_function :id_lookup, :convenience_keys

data/lib/ohai/config.rb

@@ -31,29 +31,28 @@ module Ohai
     # These methods need to be defined before they are used as config defaults,
     # otherwise they will get method_missing'd to nil.
 
-    private
-
-    def self.default_hints_path
-      [ ChefConfig::Config.platform_specific_path("/etc/chef/ohai/hints") ]
-    end
-
-    def self.default_plugin_path
-      [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")) ]
-    end
+    class << self
+      def merge_deprecated_config
+        [ :hints_path, :plugin_path ].each do |option|
+          if has_key?(option) && send(option) != send("default_#{option}".to_sym)
+            Ohai::Log.warn(option_deprecated(option))
+          end
+        end
 
-    public
+        ohai.merge!(configuration)
+      end
 
-    # Copy deprecated configuration options into the ohai config context.
-    def self.merge_deprecated_config
-      [ :hints_path, :plugin_path ].each do |option|
-        if has_key?(option) && send(option) != send("default_#{option}".to_sym)
-          Ohai::Log.warn(option_deprecated(option))
-        end
+      def default_hints_path
+        [ ChefConfig::Config.platform_specific_path("/etc/chef/ohai/hints") ]
       end
 
-      ohai.merge!(configuration)
+      def default_plugin_path
+        [ File.expand_path(File.join(File.dirname(__FILE__), "plugins")) ]
+      end
     end
 
+    # Copy deprecated configuration options into the ohai config context.
+
     # Keep "old" config defaults around so anyone calling Ohai::Config[:key]
     # won't be broken. Also allows users to append to configuration options
     # (e.g., Ohai::Config[:plugin_path] << some_path) in their config files.
@@ -86,8 +85,11 @@ module Ohai
         # Furthermore, when the top-level config settings are removed we will
         # need to ensure that Ohai.config[:log_level] can be set by writing
         # log_level in a configuration file for consistent behavior with chef.
-        deprecation_warning = [ :log_level, :log_location ].include?(value) ?
-          option_might_be_deprecated(option) : option_deprecated(option)
+        deprecation_warning = if [ :log_level, :log_location ].include?(value)
+                                option_might_be_deprecated(option)
+                              else
+                                option_deprecated(option)
+                              end
         Ohai::Log.warn(deprecation_warning)
         value
       end
@@ -102,22 +104,22 @@ module Ohai
       default :plugin_path, Ohai::Config.default_plugin_path
     end
 
-    private
-
-    def self.option_deprecated(option)
-      <<-EOM.chomp!.tr("\n", " ")
+    class << self
+      def option_deprecated(option)
+        <<-EOM.chomp!.tr("\n", " ")
 Ohai::Config[:#{option}] is set. Ohai::Config[:#{option}] is deprecated and will
 be removed in future releases of ohai. Use ohai.#{option} in your configuration
 file to configure :#{option} for ohai.
-EOM
-    end
+        EOM
+      end
 
-    def self.option_might_be_deprecated(option)
-      option_deprecated(option) + <<-EOM.chomp!.tr("\n", " ")
+      def option_might_be_deprecated(option)
+        option_deprecated(option) + <<-EOM.chomp!.tr("\n", " ")
  If your configuration file is used with other applications which configure
 :#{option}, and you have not configured Ohai::Config[:#{option}], you may
 disregard this warning.
-EOM
+        EOM
+      end
     end
   end
 

data/lib/ohai/loader.rb

@@ -35,7 +35,7 @@ module Ohai
     # specified by calling `require_plugin` with a relative path. To manage
     # this, we track the path and root of each file as we discover them so we
     # can feed this into the v6 "dependency solver" as we load them.
-    class PluginFile < Struct.new(:path, :plugin_root)
+    PluginFile = Struct.new(:path, :plugin_root) do
 
       # Finds all the *.rb files under the configured paths in :plugin_path
       def self.find_all_in(plugin_dir)

data/lib/ohai/mixin/command.rb

@@ -177,7 +177,7 @@ module Ohai
           $VERBOSE = nil
           ps.last.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
-          cid = fork {
+          cid = fork do
             Process.setsid
 
             pw.last.close
@@ -226,7 +226,7 @@ module Ohai
             end
             ps.last.close unless ps.last.closed?
             exit!
-          }
+          end
         ensure
           $VERBOSE = verbose
         end

data/lib/ohai/plugins/dmi.rb

@@ -75,7 +75,7 @@ Ohai.plugin(:DMI) do
 
       elsif handle = handle_line.match(line)
         # Don't overcapture for now (OHAI-260)
-        unless Ohai::Common::DMI::IdToCapture.include?(handle[2].to_i)
+        unless Ohai::Common::DMI::ID_TO_CAPTURE.include?(handle[2].to_i)
           dmi_record = nil
           next
         end

data/lib/ohai/plugins/ip_scopes.rb

@@ -24,10 +24,10 @@ Ohai.plugin(:IpScopes) do
     begin
       require "ipaddr_extensions"
 
-      network["interfaces"].keys.sort.each do |ifName|
-        next if network["interfaces"][ifName]["addresses"].nil?
+      network["interfaces"].keys.sort.each do |if_name|
+        next if network["interfaces"][if_name]["addresses"].nil?
 
-        interface = network["interfaces"][ifName]
+        interface = network["interfaces"][if_name]
         interface["addresses"].each do |address, attrs|
           begin
             attrs["ip_scope"] = address.to_ip.scope

data/lib/ohai/plugins/kernel.rb

@@ -156,6 +156,10 @@ Ohai.plugin(:Kernel) do
     so = shell_out("uname -s")
     kernel[:os] = so.stdout.split($/)[0]
 
+    so = File.open("/etc/release") { |file| file.gets }
+    md = /(?<update>\d.*\d)/.match(so)
+    kernel[:update] = md[:update] if md
+
     modules = Mash.new
 
     so = shell_out("modinfo")

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

@@ -0,0 +1,34 @@
+#
+# Author:: Davide Cavalca (<dcavalca@fb.com>)
+# Copyright:: Copyright (c) 2016 Facebook
+# 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(:Hostnamectl) do
+  provides "hostnamectl"
+
+  collect_data(:linux) do
+    hostnamectl Mash.new unless hostnamectl
+
+    hostnamectl_path = which("hostnamectl")
+    if hostnamectl_path
+      hostnamectl_cmd = shell_out(hostnamectl_path)
+      hostnamectl_cmd.stdout.split("\n").each do |line|
+        key, val = line.split(":")
+        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val.chomp.lstrip
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+#
+# Author:: Davide Cavalca (<dcavalca@fb.com>)
+# Copyright:: Copyright (c) 2016 Facebook
+# 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(:Machineid) do
+  provides "machine_id"
+
+  collect_data(:linux) do
+    mid = nil
+
+    if File.exists?("/etc/machine-id")
+      mid = File.read("/etc/machine-id").chomp
+    elsif File.exists?("/var/lib/dbus/machine-id")
+      mid = File.read("/var/lib/dbus/machine-id").chomp
+    end
+
+    if mid
+      machine_id mid
+    end
+  end
+end

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

@@ -380,7 +380,7 @@ Ohai.plugin(:Network) do
   end
 
   def interface_address_not_link_level?(iface, address)
-    iface[:addresses][address][:scope].downcase != "link"
+    !iface[:addresses][address][:scope].casecmp("link").zero?
   end
 
   def interface_valid_for_route?(iface, address, family)

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

@@ -194,5 +194,15 @@ Ohai.plugin(:Virtualization) do
       virtualization[:role] = "guest"
       virtualization[:systems][:docker] = "guest"
     end
+
+    # Detect LXD
+    # See https://github.com/lxc/lxd/blob/master/doc/dev-lxd.md
+    if File.exist?("/dev/lxd/sock")
+      virtualization[:system] = "lxd"
+      virtualization[:role] = "guest"
+    elsif File.exist?("/var/lib/lxd/devlxd")
+      virtualization[:system] = "lxd"
+      virtualization[:role] = "host"
+    end
   end
 end

data/lib/ohai/plugins/rackspace.rb

@@ -38,7 +38,7 @@ Ohai.plugin(:Rackspace) do
   def has_rackspace_metadata?
     so = shell_out("xenstore-read vm-data/provider_data/provider")
     if so.exitstatus == 0
-      so.stdout.strip.downcase == "rackspace"
+      so.stdout.strip.casecmp("rackspace").zero?
     end
   rescue Ohai::Exceptions::Exec
     false
@@ -115,9 +115,9 @@ Ohai.plugin(:Rackspace) do
     if so.exitstatus == 0
       networks = []
       so.stdout.split("\n").map { |l| l.split("=").first.strip }.map do |item|
-        _so = shell_out("xenstore-read vm-data/networking/#{item}")
-        if _so.exitstatus == 0
-          networks.push(FFI_Yajl::Parser.new.parse(_so.stdout))
+        so = shell_out("xenstore-read vm-data/networking/#{item}")
+        if so.exitstatus == 0
+          networks.push(FFI_Yajl::Parser.new.parse(so.stdout))
         else
           Ohai::Log.debug("rackspace plugin: Unable to capture custom private networking information for Rackspace cloud")
           return false

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

@@ -129,7 +129,7 @@ Ohai.plugin(:DMI) do
           id = smb_to_id[header_information[3]]
 
           # Don't overcapture for now (OHAI-260)
-          unless Ohai::Common::DMI::IdToCapture.include?(id)
+          unless Ohai::Common::DMI::ID_TO_CAPTURE.include?(id)
             dmi_record = nil
             next
           end

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

@@ -44,10 +44,10 @@ Ohai.plugin(:Filesystem) do
     so.stdout.lines do |line|
       next unless line =~ /^(.+?)\s*: (\S+)\s*$/
       mount = $1
-      fs.each { |filesystem, fs_attributes|
+      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
@@ -82,7 +82,7 @@ Ohai.plugin(:Filesystem) do
       zfs[filesystem][:sources][$2] = $4.chomp
     end
 
-    zfs.each { |filesystem, attributes|
+    zfs.each do |filesystem, attributes|
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
       fs[filesystem][:fs_type] = "zfs"
       fs[filesystem][:mount] = attributes[:values][:mountpoint] if attributes[:values].has_key?("mountpoint")
@@ -91,14 +91,14 @@ Ohai.plugin(:Filesystem) do
       # find all zfs parents
       parents = filesystem.split("/")
       zfs_parents = []
-      (0..parents.length - 1).to_a.each { |parent_indexes|
+      (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

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

@@ -170,14 +170,14 @@ Ohai.plugin(:Network) do
       matches = /interface: (?<name>\S+)\s+index\s+(?<index>\d+)/.match(line)
       if matches
         network[:default_interface] =
-        case
-        when iface[matches[:name]]
-          matches[:name]
-        when int_name = full_interface_name(iface, matches[:name], matches[:index])
-          int_name
-        else
-          matches[:name]
-        end
+          case
+          when iface[matches[:name]]
+            matches[:name]
+          when int_name = full_interface_name(iface, matches[:name], matches[:index])
+            int_name
+          else
+            matches[:name]
+          end
         Ohai::Log.debug("found interface device: #{network[:default_interface]} #{matches[:name]}")
       end
       matches = /gateway: (\S+)/.match(line)

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

@@ -54,9 +54,11 @@ Ohai.plugin(:CPU) do
       cpu[current_cpu]["vendor_id"] = processor["manufacturer"]
       cpu[current_cpu]["family"] = processor["family"].to_s
       cpu[current_cpu]["model"] = processor["revision"].to_s
-      cpu[current_cpu]["stepping"] = processor["stepping"].nil? \
-                  ? processor["description"].match(/Stepping\s+(\d+)/)[1] \
-                  : processor["stepping"]
+      cpu[current_cpu]["stepping"] = if processor["stepping"].nil?
+                                       processor["description"].match(/Stepping\s+(\d+)/)[1]
+                                     else
+                                       processor["stepping"]
+                                     end
       cpu[current_cpu]["physical_id"] = processor["deviceid"]
       cpu[current_cpu]["model_name"] = processor["description"]
       cpu[current_cpu]["mhz"] = processor["maxclockspeed"].to_s