ohai 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 0d9d3f875c58cc677e9188ec2183e25de5911e3e
-  data.tar.gz: fb59c6094438728c98ff3a9f2c9d4420579096dc
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTMxZTg2ZjdiNDBiZDMwMWNjYjUwZDc5OTI3ZGFhZmIxZDcxZWMxOA==
+  data.tar.gz: !binary |-
+    MmFlODM1NWNiYjVhNzAyODdhY2IxMWM4OGNjZjFkY2YxY2E2NDdmOQ==
 SHA512:
-  metadata.gz: eab2a721b93ce4e9ccce9d4fce5fec55c191def267ee2ed713f0a859050ea1d4a59b0d583182475669408a3636ca2df3aa2890b7cff49401813220eb476c9e4f
-  data.tar.gz: f076c97eb34c8c66361dfdecb4fd3e418ca367494fcfc025a2c033f046949b64e850304ccd63519699c3b3e20c07acb8b2c7a043a0e99d9454951f3d016adb1d
+  metadata.gz: !binary |-
+    ZjM4Y2YyYWRiYmZmZmYxOTlmMjBjODAxM2VmMWYxOGYyYzQ2NTM3NWM4ZTM3
+    OTIwZGVjM2U2YmRhZWQ2ZWZiMjcyMDg0ZmZiZGMxZjliOGIzMDNiY2Q1MmY0
+    ODdlYWIzZTkwMmFlMWE1NWM5NTY3NjIyY2M3NWM4Y2U2MjgwZWU=
+  data.tar.gz: !binary |-
+    YjI3ZWYzOGQ3N2Y5OWM2ZDc5NzNlYWYxYzVhYmM5NmExZTI0MTAyNjMzZDEw
+    Mzg1YmEyZjdmZTA4MTMyMDA4ZjdiMDkxZTMxMzE2ZjY1Mzc5ZWUyMTI3Yjcy
+    ZDI1YWY2ZmFlY2E5MjVkMTYxOWE3MmI2ODBhODhmNzVmNDE1YzQ=

data/lib/ohai/loader.rb

@@ -111,7 +111,7 @@ module Ohai
         Ohai::Log.warn("[DEPRECATION] Plugin at #{plugin_path} is a version 6 plugin. \
 Version 6 plugins will not be supported in future releases of Ohai. \
 Please upgrade your plugin to version 7 plugin syntax. \
-For more information visit here: docs.opscode.com/ohai_custom.html")
+For more information visit here: docs.chef.io/ohai_custom.html")
 
         load_v6_plugin_class(contents, plugin_path, plugin_dir_path)
       end

data/lib/ohai/mixin/gce_metadata.rb

@@ -21,7 +21,8 @@ module Ohai
   module Mixin
     module GCEMetadata
 
-      GCE_METADATA_ADDR = "metadata.google.internal" unless defined?(GCE_METADATA_ADDR)
+      # Trailing dot to host is added to avoid DNS search path
+      GCE_METADATA_ADDR = "metadata.google.internal." unless defined?(GCE_METADATA_ADDR)
       GCE_METADATA_URL = "/computeMetadata/v1beta1/?recursive=true" unless defined?(GCE_METADATA_URL)
 
       def can_metadata_connect?(addr, port, timeout=2)

data/lib/ohai/plugins/cloud.rb

@@ -25,6 +25,7 @@ Ohai.plugin(:Cloud) do
   depends "openstack"
   depends "azure"
   depends "cloudstack"
+  depends "digital_ocean"
 
   # Make top-level cloud hashes
   #
@@ -229,16 +230,59 @@ Ohai.plugin(:Cloud) do
     cloudstack != nil
   end
 
-  # Fill cloud hash with cloudstack values
+  # Fill cloud hash with cloudstack values. Cloudstack is a bit different in that
+  # the local interface can be a public or private ip is using basic networking.
+  # When using advanced networking, the public_ipv4 passed in the metadata isn't
+  # usually going to be the public ip of the interface, so don't use that value. As
+  # per the Cloudstack documentation its actually the NAT router IP.
   def get_cloudstack_values
-    cloud[:public_ips] << cloudstack['public_ipv4']
-    cloud[:private_ips] << cloudstack['local_ipv4']
-    cloud[:public_ipv4] = cloudstack['public_ipv4']
-    cloud[:public_hostname] = cloudstack['public_hostname']
     cloud[:local_ipv4] = cloudstack['local_ipv4']
+
+    if cloudstack['local_ipv4']
+      # Private IPv4 address
+      if cloudstack['local_ipv4'] =~ /\A(10\.|192\.168\.|172\.1[6789]\.|172\.2.\.|172\.3[01]\.)/
+        cloud[:private_ips] << cloudstack['local_ipv4']
+        cloud[:public_ipv4] = nil
+      else
+        cloud[:public_ips] << cloudstack['local_ipv4']
+        # Yes, not a mistake, for basic networking this may be true
+        cloud[:public_ipv4] = cloudstack['local_ipv4']
+      end
+    end
+    cloud[:public_hostname] = cloudstack['public_hostname']
     cloud[:local_hostname] = cloudstack['local_hostname']
     cloud[:vm_id] = cloudstack['vm_id']
-    cloud[:provider] = "cloudstack"
+    cloud[:local_hostname] = cloudstack['local_hostname']
+    cloud[:provider] = 'cloudstack'
+  end
+
+  # ----------------------------------------
+  # digital_ocean
+  # ----------------------------------------
+
+  # Is current cloud digital_ocean?
+  #
+  # === Return
+  # true:: If digital_ocean Mash is defined
+  # false:: Otherwise
+  def on_digital_ocean?
+    digital_ocean != nil
+  end
+
+  # Fill cloud hash with linode values
+  def get_digital_ocean_values
+    public_ipv4 = digital_ocean['networks']['v4'].select {|address| address['type'] == 'public'}
+    private_ipv4 = digital_ocean['networks']['v4'].select {|address| address['type'] == 'private'}
+    public_ipv6 = digital_ocean['networks']['v6'].select {|address| address['type'] == 'public'}
+    private_ipv6 = digital_ocean['networks']['v6'].select {|address| address['type'] == 'private'}
+    cloud[:public_ips].concat public_ipv4+public_ipv6
+    cloud[:private_ips].concat private_ipv4+private_ipv6
+    cloud[:public_ipv4] = public_ipv4.first
+    cloud[:public_ipv6] = public_ipv6.first
+    cloud[:local_ipv4] = private_ipv4.first
+    cloud[:local_ipv6] = private_ipv6.first
+    cloud[:public_hostname] = digital_ocean['name']
+    cloud[:provider] = "digital_ocean"
   end
 
   collect_data do    
@@ -288,5 +332,11 @@ Ohai.plugin(:Cloud) do
       create_objects
       get_cloudstack_values
     end
+
+    # setup digital_ocean cloud data
+    if on_digital_ocean?
+      create_objects
+      get_digital_ocean_values
+    end
   end
 end

data/lib/ohai/plugins/cloud_v2.rb

@@ -24,6 +24,7 @@ Ohai.plugin(:CloudV2) do
   depends "linode"
   depends "openstack"
   depends "azure"
+  depends "digital_ocean"
 
   # Class to help enforce the interface exposed to node[:cloud] (OHAI-542)
   #
@@ -124,7 +125,7 @@ Ohai.plugin(:CloudV2) do
   def get_gce_values
     public_ips = gce['instance']['networkInterfaces'].collect do |interface|
       if interface.has_key?('accessConfigs')
-        interface['accessConfigs'].collect{|ac| ac['externalIp']}
+        interface['accessConfigs'].collect{|ac| ac['externalIp'] unless ac['externalIp'] == ''}
       end
     end.flatten.compact
 
@@ -270,6 +271,32 @@ Ohai.plugin(:CloudV2) do
     @cloud_attr_obj.provider = "azure"
   end
 
+
+  # ----------------------------------------
+  # digital_ocean
+  # ----------------------------------------
+
+  # Is current cloud digital_ocean?
+  #
+  # === Return
+  # true:: If digital_ocean Mash is defined
+  # false:: Otherwise
+  def on_digital_ocean?
+    digital_ocean != nil
+  end
+
+  # Fill cloud hash with digital_ocean values
+  def get_digital_ocean_values
+    digital_ocean['networks'].each do |network, addresses|
+      type = network == 'v4' ? 'ipv4' : 'ipv6'
+      addresses.each do |address|
+        @cloud_attr_obj.send("add_#{type}_addr", address['ip_address'], address['type'].to_sym)
+      end
+    end
+    @cloud_attr_obj.public_hostname = digital_ocean['name']
+    @cloud_attr_obj.provider = "digital_ocean"
+  end
+
   collect_data do
     require "ipaddr"
 
@@ -282,6 +309,7 @@ Ohai.plugin(:CloudV2) do
     get_eucalyptus_values if on_eucalyptus?
     get_openstack_values if on_openstack?
     get_azure_values if on_azure?
+    get_digital_ocean_values if on_digital_ocean?
 
     # set node[:cloud] hash here
     cloud_v2 @cloud_attr_obj.cloud_mash

data/lib/ohai/plugins/cloudstack.rb

@@ -1,5 +1,7 @@
 #
+# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
 # Author:: Olle Lundberg (<geek@nerd.sh>)
+# Copyright:: Copyright (c) 2010-2014 RightScale Inc
 # Copyright:: Copyright (c) 2014 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -31,6 +33,11 @@ Ohai.plugin(:Cloudstack) do
         cloudstack Mash.new
         Ohai::Log.debug("connecting to the 'cloudstack' metadata service")
         fetch_metadata.each { |k, v| cloudstack[k] = v }
+        # Note: the cloudstack public_ipv4 is the value of the NAT router (as per cloudstack documentation)
+        # and not necessarily the publicly available IP.  cloustack semi-supports floating
+        # ips in that the public ip for an instance can be an IP different from the NAT router
+        cloudstack['router_ipv4'] = cloudstack.delete('public_ipv4')
+        cloudstack['dhcp_lease_provider_ip'] = dhcp_ip
       else
         Ohai::Log.debug("unable to connect to the 'cloudstack' metadata service")
       end

data/lib/ohai/plugins/digital_ocean.rb

@@ -0,0 +1,81 @@
+#
+# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
+# 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/util/ip_helper'
+
+Ohai.plugin(:DigitalOcean) do
+  include Ohai::Util::IpHelper
+
+  DIGITALOCEAN_FILE = '/etc/digitalocean'
+
+  provides "digital_ocean"
+
+  depends "network/interfaces"
+
+  def extract_droplet_ip_addresses
+    addresses = Mash.new({'v4' => [], 'v6' => []})
+    network[:interfaces].each_value do |iface|
+      iface[:addresses].each do |address, details|
+        next if loopback?(address) || details[:family] == 'lladdr'
+
+        ip = IPAddress(address)
+        type = digital_ocean_address_type(ip)
+        address_hash = build_address_hash(ip, details)
+        addresses[type] << address_hash
+      end 
+    end
+    addresses
+  end
+
+  def build_address_hash(ip, details)
+    address_hash = Mash.new({
+      'ip_address' => ip.address,
+      'type' => private_address?(ip.address) ? 'private' : 'public'
+    })
+
+    if ip.ipv4?
+      address_hash['netmask'] = details[:netmask]
+    elsif ip.ipv6?
+      address_hash['cidr'] = ip.prefix
+    end
+    address_hash
+  end
+
+  def digital_ocean_address_type(ip)
+    ip.ipv4? ? 'v4' : 'v6'
+  end
+
+  def looks_like_digital_ocean?
+    hint?('digital_ocean') || File.exist?(DIGITALOCEAN_FILE)
+  end
+
+  collect_data do
+    if looks_like_digital_ocean?
+      digital_ocean Mash.new
+      hint = hint?('digital_ocean') || {}
+      hint.each {|k, v| digital_ocean[k] = v unless k == 'ip_addresses'}
+
+      # Extract actual ip addresses
+      # The networks sub-hash is structured similarly to how
+      # Digital Ocean's v2 API structures things:
+      # https://developers.digitalocean.com/#droplets
+      digital_ocean[:networks] = extract_droplet_ip_addresses
+    else
+      Ohai::Log.debug("No hints present for digital_ocean.")
+      false
+    end
+  end
+end

data/lib/ohai/plugins/elixir.rb

@@ -0,0 +1,32 @@
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# 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(:Elixir) do
+  provides "languages/elixir"
+
+  depends "languages"
+
+  collect_data do
+    output = nil
+
+    elixir = Mash.new
+    so = shell_out("elixir -v")
+    if so.exitstatus == 0
+      output =  so.stdout.split
+      elixir[:version] = output[1]
+      languages[:elixir] = elixir if elixir[:version]
+    end
+  end
+end

data/lib/ohai/plugins/linode.rb

@@ -56,6 +56,7 @@ Ohai.plugin(:Linode) do
       linode Mash.new
       get_ip_address(:public_ip, :eth0)
       get_ip_address(:private_ip, "eth0:1")
+      hint?('linode').each{|k,v| linode[k] = v } if hint?('linode').kind_of?(Hash)
     end
   end
 end

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

@@ -35,6 +35,11 @@ Ohai.plugin(:BlockDevice) do
             File.open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
           end
         end
+        %w{rotational}.each do |check|
+          if File.exists?("/sys/block/#{dir}/queue/#{check}")
+            File.open("/sys/block/#{dir}/queue/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          end
+        end
       end
       block_device block
     end

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

@@ -32,7 +32,12 @@ Ohai.plugin(:CPU) do
         current_cpu = $1
         cpu_number += 1
       when /vendor_id\s+:\s(.+)/
-        cpuinfo[current_cpu]["vendor_id"] = $1
+        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(.+)/
@@ -54,6 +59,21 @@ Ohai.plugin(:CPU) do
         cpuinfo[current_cpu]["cache_size"] = $1
       when /flags\s+:\s(.+)/
         cpuinfo[current_cpu]["flags"] = $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(',')
+        for i in current_cpu_info
+          name_value = i.split('=')
+          name = name_value[0].strip
+          value = name_value[1].strip
+          cpuinfo[current_cpu][name] = value
+        end
       end
     end
 

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

@@ -62,7 +62,7 @@ Ohai.plugin(:Filesystem) do
     end
     
     # Grab filesystem inode data from df
-    so = shell_out("df -i")
+    so = shell_out("df -iP")
     so.stdout.lines do |line|
       case line
       when /^Filesystem\s+Inodes/

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

@@ -33,6 +33,10 @@ Ohai.plugin(:Network) do
     encap
   end
 
+  def iproute2_binary_available?
+    ["/sbin/ip", "/usr/bin/ip"].any? { |path| File.exist?(path) }
+  end
+
   collect_data(:linux) do
     require 'ipaddr'
 
@@ -49,8 +53,7 @@ Ohai.plugin(:Network) do
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
     IPROUTE_INT_REGEX = /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/ unless defined? IPROUTE_INT_REGEX
 
-    if File.exist?("/sbin/ip")
-
+    if iproute2_binary_available?
       # families to get default routes from
       families = [{
                     :name => "inet",
@@ -137,6 +140,7 @@ Ohai.plugin(:Network) do
       so.stdout.lines do |line|
         if line =~ IPROUTE_INT_REGEX
           tmp_int = $2
+          iface[tmp_int] = Mash.new unless iface[tmp_int]
           net_counters[tmp_int] = Mash.new unless net_counters[tmp_int]
         end
 

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

@@ -87,10 +87,12 @@ Ohai.plugin(:Platform) do
       platform "arch"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 2.6.32-ARCH
+      platform_version `uname -r`.strip
     elsif File.exists?('/etc/exherbo-release')
       platform "exherbo"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 3.13
+      platform_version `uname -r`.strip
     elsif lsb[:id] =~ /RedHat/i
       platform "redhat"
       platform_version lsb[:release]

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

@@ -27,6 +27,10 @@ Ohai.plugin(:Virtualization) do
     which('lxc-version')
   end
 
+  def docker_exists?
+    which('docker')
+  end
+
   collect_data(:linux) do
     virtualization Mash.new unless virtualization
     virtualization[:systems] = Mash.new unless virtualization[:systems]
@@ -129,6 +133,10 @@ Ohai.plugin(:Virtualization) do
           virtualization[:role] = "guest"
           virtualization[:systems][:vbox] = "guest"
         end
+      when /Product Name: OpenStack/
+        virtualization[:system] = "openstack"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:openstack] = "guest"
       else
         nil
       end
@@ -170,9 +178,9 @@ Ohai.plugin(:Virtualization) do
     # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
     if File.exists?("/proc/self/cgroup")
       if File.read("/proc/self/cgroup") =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$}
-        virtualization[:system] = "lxc"
+        virtualization[:system] = $1
         virtualization[:role] = "guest"
-        virtualization[:systems][:lxc] = "guest"
+        virtualization[:systems][$1.to_sym] = "guest"
       elsif lxc_version_exists? && File.read("/proc/self/cgroup") =~ %r{\d:[^:]+:/$}
         # lxc-version shouldn't be installed by default
         # Even so, it is likely we are on an LXC capable host that is not being used as such
@@ -181,12 +189,15 @@ Ohai.plugin(:Virtualization) do
           virtualization[:system] = "lxc"
           virtualization[:role] = "host"
         end
-
         # In general, the 'systems' framework from OHAI-182 is less susceptible to conflicts
         # But, this could overwrite virtualization[:systems][:lxc] = "guest"
         # If so, we may need to look further for a differentiator (OHAI-573)
         virtualization[:systems][:lxc] = "host"
       end
+    elsif File.exists?("/.dockerenv") || File.exists?("/.dockerinit")
+        virtualization[:system] = "docker"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:docker] = "guest"
     end
   end
 end