ohai 8.10.0 → 8.11.1

data/lib/ohai/plugins/dmi.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -22,7 +22,7 @@ Ohai.plugin(:DMI) do
   # dmidecode does not return data without access to /dev/mem (or its equivalent)
 
   collect_data do
-    require 'ohai/common/dmi'
+    require "ohai/common/dmi"
     dmi Mash.new
 
     # all output lines should fall within one of these patterns
@@ -49,7 +49,7 @@ Ohai.plugin(:DMI) do
     #Handle 0x0000, DMI type 0, 24 bytes
     #BIOS Information
     #        Vendor: American Megatrends Inc.
-    #        Version: 080012 
+    #        Version: 080012
     # ... similar lines trimmed
     #        Characteristics:
     #                ISA is supported
@@ -80,7 +80,7 @@ Ohai.plugin(:DMI) do
           next
         end
 
-        dmi_record = {:type => Ohai::Common::DMI.id_lookup(handle[2])}
+        dmi_record = { :type => Ohai::Common::DMI.id_lookup(handle[2]) }
 
         dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
         dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
@@ -115,7 +115,7 @@ Ohai.plugin(:DMI) do
           next
         end
         # overwrite "raw" value with a new Mash
-        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == 'Mash'
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == "Mash"
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = nil
 
       else

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

@@ -44,10 +44,10 @@ Ohai.plugin(:CPU) do
         cpuinfo["stepping"] = $3
         # These _should_ match /AMD Features2?/ lines as well
       when /Features=.+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(','))
+        cpuinfo["flags"].concat($1.downcase.split(","))
         # Features2=0x80000001<SSE3,<b31>>
       when /Features2=[a-f\dx]+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(','))
+        cpuinfo["flags"].concat($1.downcase.split(","))
       end
     end
 

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

@@ -57,4 +57,3 @@ Ohai.plugin(:Memory) do
     end
   end
 end
-

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

@@ -58,7 +58,7 @@ Ohai.plugin(:Network) do
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
         # convert the netmask to decimal for consistency
-        netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+        netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
           iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
         else
@@ -76,7 +76,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /flags=\d+<(.+)>/
-        flags = $1.split(',')
+        flags = $1.split(",")
         iface[cint][:flags] = flags if flags.length > 0
       end
       if line =~ /metric: (\d+) mtu: (\d+)/
@@ -100,11 +100,11 @@ Ohai.plugin(:Network) do
     # From netstat(1), not sure of the implications:
     # Show the state of all network interfaces or a single interface
     # which have been auto-configured (interfaces statically configured
-    # into a system, but not located at boot time are not shown). 
+    # into a system, but not located at boot time are not shown).
     so = shell_out("netstat -ibdn")
     so.stdout.lines do |line|
       # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
-      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905 
+      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
       # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
       if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
         net_counters[$1] = Mash.new unless net_counters[$1]

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

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/os'
+require "ohai/mixin/os"
 
 Ohai.plugin(:OS) do
   provides "os", "os_version"

data/lib/ohai/plugins/ec2.rb

@@ -17,8 +17,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/mixin/ec2_metadata'
-require 'base64'
+require "ohai/mixin/ec2_metadata"
+require "base64"
 
 Ohai.plugin(:EC2) do
   include Ohai::Mixin::Ec2Metadata
@@ -28,17 +28,34 @@ Ohai.plugin(:EC2) do
   depends "network/interfaces"
   depends "dmi"
 
+  # look for ec2metadata which is included on paravirt / hvm AMIs
+  def has_ec2metadata_bin?
+    if File.exist?("/usr/bin/ec2metadata")
+      Ohai::Log.debug("ec2 plugin: has_ec2metadata_bin? == true")
+      true
+    else
+      Ohai::Log.debug("ec2 plugin: has_ec2metadata_bin? == false")
+      false
+    end
+  end
+
   # look for arp address that non-VPC hosts will have
-  def has_ec2_mac?
+  def has_xen_mac?
     network[:interfaces].values.each do |iface|
       unless iface[:arp].nil?
         if iface[:arp].value?("fe:ff:ff:ff:ff:ff")
-          Ohai::Log.debug("has_ec2_mac? == true")
+          # using MAC addresses from ARP is unreliable because they could time-out from the table
+          # fe:ff:ff:ff:ff:ff is actually a sign of Xen, not specifically EC2
+          deprecation_message <<-EOM
+ec2 plugin: Detected EC2 by the presence of fe:ff:ff:ff:ff:ff in the ARP table. This method is unreliable and will be removed in a future version of ohai. Bootstrap using knife-ec2 or create "/etc/chef/ohai/hints/ec2.json" instead.
+EOM
+          Ohai::Log.warn(deprecation_message)
+          Ohai::Log.debug("ec2 plugin: has_xen_mac? == true")
           return true
         end
       end
     end
-    Ohai::Log.debug("has_ec2_mac? == false")
+    Ohai::Log.debug("ec2 plugin: has_xen_mac? == false")
     false
   end
 
@@ -48,42 +65,49 @@ Ohai.plugin(:EC2) do
     begin
       # detect a version of '4.2.amazon'
       if dmi[:bios][:all_records][0][:Version] =~ /amazon/
-        Ohai::Log.debug("has_ec2_dmi? == true")
+        Ohai::Log.debug("ec2 plugin: has_ec2_dmi? == true")
         true
       end
     rescue NoMethodError
-      Ohai::Log.debug("has_ec2_dmi? == false")
+      Ohai::Log.debug("ec2 plugin: has_ec2_dmi? == false")
       false
     end
   end
 
+  # rackspace systems look like ec2 so instead of timing out dig a bit deeper
+  def looks_like_rackspace?
+    return true if File.exist?("/usr/bin/rackspace-monitoring-agent")
+  end
 
   def looks_like_ec2?
-    # Try non-blocking connect so we don't "block" if
-    # the Xen environment is *not* EC2
-    hint?('ec2') || ( has_ec2_dmi? || has_ec2_mac?) && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+    return true if hint?("ec2")
+
+    # Even if it looks like EC2 try to connect first
+    if has_ec2_dmi? || has_xen_mac? || (has_ec2metadata_bin? && !looks_like_rackspace?)
+      return true if can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
+    end
   end
 
   collect_data do
     if looks_like_ec2?
-      Ohai::Log.debug("looks_like_ec2? == true")
+      Ohai::Log.debug("ec2 plugin: looks_like_ec2? == true")
       ec2 Mash.new
       fetch_metadata.each do |k, v|
         # fetch_metadata returns IAM security credentials, including the IAM user's
         # secret access key. We'd rather not have ohai send this information
         # to the server.
         # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html#instancedata-data-categories
-        next if k == 'iam' && !hint?('iam')
+        next if k == "iam" && !hint?("iam")
         ec2[k] = v
       end
       ec2[:userdata] = self.fetch_userdata
-      #ASCII-8BIT is equivalent to BINARY in this case
+      # ASCII-8BIT is equivalent to BINARY in this case
       if ec2[:userdata] && ec2[:userdata].encoding.to_s == "ASCII-8BIT"
-        Ohai::Log.debug("Binary UserData Found. Storing in base64")
+        Ohai::Log.debug("ec2 plugin: Binary UserData Found. Storing in base64")
         ec2[:userdata] = Base64.encode64(ec2[:userdata])
       end
     else
-      Ohai::Log.debug("looks_like_ec2? == false")
+      Ohai::Log.debug("ec2 plugin: looks_like_ec2? == false")
       false
     end
   end

data/lib/ohai/plugins/elixir.rb

@@ -24,7 +24,7 @@ Ohai.plugin(:Elixir) do
     elixir = Mash.new
     so = shell_out("elixir -v")
     if so.exitstatus == 0
-      output =  so.stdout.split
+      output = so.stdout.split
       elixir[:version] = output[1]
       languages[:elixir] = elixir if elixir[:version]
     end

data/lib/ohai/plugins/erlang.rb

@@ -30,10 +30,10 @@ Ohai.plugin(:Erlang) do
       output = so.stderr.split
       if output.length >= 6
         options = output[1]
-        options.gsub!(/(\(|\))/, '')
+        options.gsub!(/(\(|\))/, "")
         erlang[:version] = output[5]
-        erlang[:options] = options.split(',')
-        erlang[:emulator] = output[2].gsub!(/(\(|\))/, '')
+        erlang[:options] = options.split(",")
+        erlang[:emulator] = output[2].gsub!(/(\(|\))/, "")
         if erlang[:version] and erlang[:options] and erlang[:emulator]
           languages[:erlang] = erlang
         end

data/lib/ohai/plugins/eucalyptus.rb

@@ -17,17 +17,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/mixin/ec2_metadata'
+# eucalyptus metadata service is compatible with the ec2 service calls
+require "ohai/mixin/ec2_metadata"
 
 Ohai.plugin(:Eucalyptus) do
   include Ohai::Mixin::Ec2Metadata
 
   provides "eucalyptus"
-
   depends "network/interfaces"
 
+  # returns the mac address from the collection of all address types
   def get_mac_address(addresses)
-    detected_addresses = addresses.detect { |address, keypair| keypair == {"family"=>"lladdr"} }
+    detected_addresses = addresses.detect { |address, keypair| keypair == { "family" => "lladdr" } }
     if detected_addresses
       return detected_addresses.first
     else
@@ -35,26 +36,29 @@ Ohai.plugin(:Eucalyptus) do
     end
   end
 
+  # detect if the mac address starts with d0:0d
   def has_euca_mac?
     network[:interfaces].values.each do |iface|
-      has_mac = (get_mac_address(iface[:addresses]) =~ /^[dD]0:0[dD]:/)
-      Ohai::Log.debug("has_euca_mac? == #{!!has_mac}")
-      return true if has_mac
+      mac = get_mac_address(iface[:addresses])
+      if mac =~ /^[dD]0:0[dD]:/
+        Ohai::Log.debug("eucalyptus plugin: has_euca_mac? == true (#{mac})")
+        return true
+      end
     end
 
-    Ohai::Log.debug("has_euca_mac? == false")
+    Ohai::Log.debug("eucalyptus plugin: has_euca_mac? == false")
     false
   end
 
   def looks_like_euca?
     # Try non-blocking connect so we don't "block" if
-    # the Xen environment is *not* EC2
-    hint?('eucalyptus') || has_euca_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+    # the metadata service doesn't respond
+    hint?("eucalyptus") || has_euca_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80)
   end
 
   collect_data do
     if looks_like_euca?
-      Ohai::Log.debug("looks_like_euca? == true")
+      Ohai::Log.debug("eucalyptus plugin: looks_like_euca? == true")
       eucalyptus Mash.new
       self.fetch_metadata.each do |k, v|
         # Eucalyptus 3.4+ supports IAM roles and Instance Profiles much like AWS
@@ -64,12 +68,12 @@ Ohai.plugin(:Eucalyptus) do
         # secret access key. We'd rather not have ohai send this information
         # to the server.
         # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html#instancedata-data-categories
-        next if k == 'iam' && !hint?('iam')
+        next if k == "iam" && !hint?("iam")
         eucalyptus[k] = v
       end
       eucalyptus[:userdata] = self.fetch_userdata
     else
-      Ohai::Log.debug("looks_like_euca? == false")
+      Ohai::Log.debug("eucalyptus plugin: looks_like_euca? == false")
       false
     end
   end

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

@@ -53,10 +53,10 @@ Ohai.plugin(:CPU) do
         cpuinfo["stepping"] = $4
         # These _should_ match /AMD Features2?/ lines as well
       when /Features=.+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(','))
+        cpuinfo["flags"].concat($1.downcase.split(","))
         # Features2=0x80000001<SSE3,<b31>>
       when /Features2=[a-f\dx]+<(.+)>/
-        cpuinfo["flags"].concat($1.downcase.split(','))
+        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\)/

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

@@ -57,4 +57,3 @@ Ohai.plugin(:Memory) do
     end
   end
 end
-

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

@@ -58,7 +58,7 @@ Ohai.plugin(:Network) do
       if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
         # convert the netmask to decimal for consistency
-        netmask = "#{$2[2,2].hex}.#{$2[4,2].hex}.#{$2[6,2].hex}.#{$2[8,2].hex}"
+        netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
         if $3.empty?
           iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
         else
@@ -76,7 +76,7 @@ Ohai.plugin(:Network) do
         end
       end
       if line =~ /flags=\d+<(.+)>/
-        flags = $1.split(',')
+        flags = $1.split(",")
         iface[cint][:flags] = flags if flags.length > 0
       end
       if line =~ /metric: (\d+) mtu: (\d+)/
@@ -100,11 +100,11 @@ Ohai.plugin(:Network) do
     # From netstat(1), not sure of the implications:
     # Show the state of all network interfaces or a single interface
     # which have been auto-configured (interfaces statically configured
-    # into a system, but not located at boot time are not shown). 
+    # into a system, but not located at boot time are not shown).
     so = shell_out("netstat -ibdn")
     so.stdout.lines do |line|
       # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
-      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905 
+      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
       # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
       if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
         net_counters[$1] = Mash.new unless net_counters[$1]

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

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/os'
+require "ohai/mixin/os"
 
 Ohai.plugin(:OS) do
   provides "os", "os_version"

data/lib/ohai/plugins/gce.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/mixin/gce_metadata'
+require "ohai/mixin/gce_metadata"
 
 Ohai.plugin(:GCE) do
   include Ohai::Mixin::GCEMetadata
@@ -27,7 +27,7 @@ Ohai.plugin(:GCE) do
   # true:: If gce metadata server found
   # false:: Otherwise
   def has_gce_metadata?
-    can_metadata_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR,80)
+    can_metadata_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
   end
 
   # Identifies gce
@@ -36,16 +36,16 @@ Ohai.plugin(:GCE) do
   # true:: If gce can be identified
   # false:: Otherwise
   def looks_like_gce?
-    hint?('gce') || has_gce_metadata?
+    hint?("gce") || has_gce_metadata?
   end
 
   collect_data do
     if looks_like_gce?
-      Ohai::Log.debug("looks_like_gce? == true")
+      Ohai::Log.debug("gce plugin: looks_like_gce? == true")
       gce Mash.new
-      fetch_metadata.each {|k, v| gce[k] = v }
+      fetch_metadata.each { |k, v| gce[k] = v }
     else
-      Ohai::Log.debug("looks_like_gce? == false")
+      Ohai::Log.debug("gce plugin: looks_like_gce? == false")
       false
     end
   end

data/lib/ohai/plugins/hostname.rb

@@ -25,8 +25,8 @@
 # limitations under the License.
 #
 
-require 'socket'
-require 'ipaddr'
+require "socket"
+require "ipaddr"
 
 Ohai.plugin(:Hostname) do
   provides "domain", "hostname", "fqdn", "machinename"
@@ -77,14 +77,14 @@ Ohai.plugin(:Hostname) do
   end
 
   def get_fqdn_from_sigar
-    require 'sigar'
+    require "sigar"
     sigar = Sigar.new
     sigar.fqdn
   end
 
   def sigar_is_available?
     begin
-      require 'sigar'
+      require "sigar"
       true
     rescue LoadError
       false
@@ -153,11 +153,11 @@ Ohai.plugin(:Hostname) do
   end
 
   collect_data(:windows) do
-    require 'wmi-lite/wmi'
-    require 'socket'
+    require "wmi-lite/wmi"
+    require "socket"
 
     wmi = WmiLite::Wmi.new
-    host = wmi.first_of('Win32_ComputerSystem')
+    host = wmi.first_of("Win32_ComputerSystem")
 
     hostname "#{host['dnshostname']}"
     machinename "#{host['name']}"