ohai 7.2.0.alpha.0 → 7.2.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81416c96c35d5769f24aae74567e9937a5e1798a
-  data.tar.gz: 44012ca9a21be521454fe2123e73391c31f9177d
+  metadata.gz: 937d95d7e6b646e0028a39cc285b62c97cb05719
+  data.tar.gz: b0327a0a4bb11c90cf3d4f9b352b4bcb7be21e68
 SHA512:
-  metadata.gz: 3d77a851d7feb9394295e5c5165b1a5ea2e97c1e4364e945e931fb177dcbd052c4aa3cf9600f64bcd07468780b6a468d1db070126e61e88d526a3fd65353eaca
-  data.tar.gz: 9e8fca70a6e332456131d6e770a538253a29f739639776f1276d6f3dc849cee3487b6410592fb0404a1e943eca06794d44260696f69e16815b0c231a57744beb
+  metadata.gz: e58ecebbe4efa2e3774e692e70a48214985dab83c27c7364f091e82f8c576f43b457b9c45e6dab14a56665183b88d3ee6f534bee48124bb153982eae0d764404
+  data.tar.gz: 4e4b8b1afa20f3f84293731020e5ec3378749cd2c8bb7b10c7232959758f70ad8961f73fc0acf62635811f672fd674d92b5e3f00aae7a8465ab475b1d680d210

data/lib/ohai/dsl/plugin.rb

@@ -121,16 +121,18 @@ module Ohai
         end
       end
 
-      def attribute?(name)
+      def has_key?(name)
         @data.has_key?(name)
       end
 
+      alias :attribute? :has_key?
+
       def set(name, *value)
         set_attribute(name, *value)
       end
 
       def from(cmd)
-        status, stdout, stderr = run_command(:command => cmd)
+        _status, stdout, _stderr = run_command(:command => cmd)
         return "" if stdout.nil? || stdout.empty?
         stdout.strip
       end
@@ -140,7 +142,7 @@ module Ohai
       # the value.
       def from_with_regex(cmd, *regex_list)
         regex_list.flatten.each do |regex|
-          status, stdout, stderr = run_command(:command => cmd)
+          _status, stdout, _stderr = run_command(:command => cmd)
           return "" if stdout.nil? || stdout.empty?
           stdout.chomp!.strip
           md = stdout.match(regex)

data/lib/ohai/hints.rb

@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+require 'ffi_yajl'
+
 module Ohai
   module Hints
     def self.refresh_hints
@@ -31,12 +33,12 @@ module Ohai
         filename = File.join(path, "#{name}.json")
         if File.exist?(filename)
           begin
-            json_parser = Yajl::Parser.new
+            json_parser = FFI_Yajl::Parser.new
             hash = json_parser.parse(File.read(filename))
             @hints[name] = hash || Hash.new # hint
             # should exist because the file did, even if it didn't
             # contain anything
-          rescue Yajl::ParseError => e
+          rescue FFI_Yajl::ParseError => e
             Ohai::Log.error("Could not parse hint file at #{filename}: #{e.message}")
           end
         end

data/lib/ohai/mixin/ec2_metadata.rb

@@ -98,70 +98,94 @@ module Ohai
         Net::HTTP.start(EC2_METADATA_ADDR).tap {|h| h.read_timeout = 600}
       end
 
+      # Get metadata for a given path and API version
+      #
+      # @details
+      #   Typically, a 200 response is expected for valid metadata.
+      #   On certain instance types, traversing the provided metadata path
+      #   produces a 404 for some unknown reason. In that event, return
+      #   `nil` and continue the run instead of failing it.
       def metadata_get(id, api_version)
         path = "/#{api_version}/meta-data/#{id}"
         response = http_client.get(path)
-        unless response.code == '200'
+        case response.code
+        when '200'
+          response.body
+        when '404'
+          Ohai::Log.debug("Encountered 404 response retreiving EC2 metadata path: #{path} ; continuing.")
+          nil
+        else
           raise "Encountered error retrieving EC2 metadata (#{path} returned #{response.code} response)"
         end
-        response
       end
 
       def fetch_metadata(id='', api_version=nil)
         api_version ||= best_api_version
         return Hash.new if api_version.nil?
         metadata = Hash.new
-        metadata_get(id, api_version).body.split("\n").each do |o|
-          key = expand_path("#{id}#{o}")
-          if key[-1..-1] != '/'
-            metadata[metadata_key(key)] =
-              if EC2_ARRAY_VALUES.include? key
-                metadata_get(key, api_version).body.split("\n")
+        retrieved_metadata = metadata_get(id, api_version)
+        if retrieved_metadata
+          retrieved_metadata.split("\n").each do |o|
+            key = expand_path("#{id}#{o}")
+            if key[-1..-1] != '/'
+              metadata[metadata_key(key)] =
+                if EC2_ARRAY_VALUES.include? key
+                  retr_meta = metadata_get(key, api_version)
+                  retr_meta ? retr_meta.split("\n") : retr_meta
+                else
+                  metadata_get(key, api_version)
+                end
+            elsif not key.eql?(id) and not key.eql?('/')
+              name = key[0..-2]
+              sym = metadata_key(name)
+              if EC2_ARRAY_DIR.include?(name)
+                metadata[sym] = fetch_dir_metadata(key, api_version)
+              elsif EC2_JSON_DIR.include?(name)
+                metadata[sym] = fetch_json_dir_metadata(key, api_version)
               else
-                metadata_get(key, api_version).body
+                fetch_metadata(key, api_version).each{|k,v| metadata[k] = v}
               end
-          elsif not key.eql?(id) and not key.eql?('/')
-            name = key[0..-2]
-            sym = metadata_key(name)
-            if EC2_ARRAY_DIR.include?(name)
-              metadata[sym] = fetch_dir_metadata(key, api_version)
-            elsif EC2_JSON_DIR.include?(name)
-              metadata[sym] = fetch_json_dir_metadata(key, api_version)
-            else
-              fetch_metadata(key, api_version).each{|k,v| metadata[k] = v}
             end
           end
+          metadata
         end
-        metadata
       end
 
       def fetch_dir_metadata(id, api_version)
         metadata = Hash.new
-          metadata_get(id, api_version).body.split("\n").each do |o|
-          key = expand_path(o)
-          if key[-1..-1] != '/'
-            metadata[metadata_key(key)] = metadata_get("#{id}#{key}", api_version).body
-          elsif not key.eql?('/')
-            metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}", api_version)
+        retrieved_metadata = metadata_get(id, api_version)
+        if retrieved_metadata
+          retrieved_metadata.split("\n").each do |o|
+            key = expand_path(o)
+            if key[-1..-1] != '/'
+              retr_meta = metadata_get("#{id}#{key}", api_version)
+              metadata[metadata_key(key)] = retr_meta ? retr_meta : ''
+            elsif not key.eql?('/')
+              metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}", api_version)
+            end
           end
+          metadata
         end
-        metadata
       end
 
       def fetch_json_dir_metadata(id, api_version)
         metadata = Hash.new
-        metadata_get(id, api_version).body.split("\n").each do |o|
-          key = expand_path(o)
-          if key[-1..-1] != '/'
-            data = metadata_get("#{id}#{key}", api_version).body
-            json = StringIO.new(data)
-            parser = Yajl::Parser.new
-            metadata[metadata_key(key)] = parser.parse(json)
-          elsif not key.eql?('/')
-            metadata[key[0..-2]] = fetch_json_dir_metadata("#{id}#{key}", api_version)
+        retrieved_metadata = metadata_get(id, api_version)
+        if retrieved_metadata
+          retrieved_metadata.split("\n").each do |o|
+            key = expand_path(o)
+            if key[-1..-1] != '/'
+              retr_meta = metadata_get("#{id}#{key}", api_version)
+              data = retr_meta ? retr_meta : ''
+              json = StringIO.new(data)
+              parser = FFI_Yajl::Parser.new
+              metadata[metadata_key(key)] = parser.parse(json)
+            elsif not key.eql?('/')
+              metadata[key[0..-2]] = fetch_json_dir_metadata("#{id}#{key}", api_version)
+            end
           end
+          metadata
         end
-        metadata
       end
 
       def fetch_userdata()

data/lib/ohai/mixin/gce_metadata.rb

@@ -58,10 +58,10 @@ module Ohai
         uri = "#{GCE_METADATA_URL}/#{id}"
         response = http_client.get(uri)
         return nil unless response.code == "200"
-        
+
         if json?(response.body)
           data = StringIO.new(response.body)
-          parser = Yajl::Parser.new
+          parser = FFI_Yajl::Parser.new
           parser.parse(data)
         elsif  has_trailing_slash?(id) or (id == '')
           temp={}
@@ -76,15 +76,15 @@ module Ohai
 
       def json?(data)
         data = StringIO.new(data)
-        parser = Yajl::Parser.new
+        parser = FFI_Yajl::Parser.new
         begin
           parser.parse(data)
           true
-        rescue Yajl::ParseError
+        rescue FFI_Yajl::ParseError
           false
         end
       end
-    
+
       def multiline?(data)
         data.lines.to_a.size > 1
       end

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

@@ -0,0 +1,63 @@
+#
+# Author:: Patrick Collins (<pat@burned.com>)
+# Copyright:: Copyright (c) 2013 Opscode, 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(:Memory) do
+  provides 'memory'
+
+  collect_data(:darwin) do
+    memory Mash.new
+
+    installed_memory = shell_out("sysctl -n hw.memsize").stdout.to_i / 1024 / 1024.0
+    memory[:total] = "#{installed_memory.to_i}MB"
+
+    total_consumed = 0
+    active = 0
+    inactive = 0
+    vm_stat = shell_out("vm_stat").stdout
+    vm_stat_match = /page size of (\d+) bytes/.match(vm_stat)
+    page_size = if vm_stat_match and vm_stat_match[1]
+      vm_stat_match[1].to_i
+    else
+      4096
+    end
+    vm_stat.split("\n").each do |line|
+      ['wired down', 'active', 'inactive'].each do |match|
+        unless line.index("Pages #{match}:").nil?
+          pages = line.split.last.to_i
+          megabyte_val = (pages * page_size) / 1024 / 1024.0
+          total_consumed += megabyte_val
+          case match
+          when 'wired down'
+            active += megabyte_val.to_i
+          when 'active'
+            active += megabyte_val.to_i
+          when 'inactive'
+            inactive += megabyte_val.to_i
+          end
+        end
+      end
+    end
+
+    memory[:active] = "#{active}MB" if active > 0
+    memory[:inactive] = "#{inactive}MB" if inactive > 0
+
+    free_memory = installed_memory - total_consumed
+    memory[:free] = "#{free_memory.to_i}MB" if total_consumed > 0
+  end
+end
+

data/lib/ohai/plugins/joyent.rb

@@ -0,0 +1,82 @@
+#
+# Author: sawanoboriyu@higanworks.com
+# Copyright (C) 2014 HiganWorks LLC
+# 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.
+#
+#
+
+# Reference from: sm-summary command
+
+Ohai.plugin(:Joyent) do
+  provides 'joyent'
+  provides 'virtualization/guest_id'
+  depends 'os', 'platform', 'virtualization'
+
+  def collect_product_file
+    lines = []
+    if ::File.exists?("/etc/product")
+      ::File.open("/etc/product") do |file|
+        while line = file.gets
+          lines << line
+        end
+      end
+    end
+    lines
+  end
+
+  def collect_pkgsrc
+    if File.exist?('/opt/local/etc/pkg_install.conf')
+      sm_pkgsrc = ::File.read("/opt/local/etc/pkg_install.conf").split("=")
+      sm_pkgsrc[1].chomp
+    else
+      nil
+    end
+  end
+
+  def is_smartos?
+    platform == 'smartos'
+  end
+
+  collect_data do
+    if is_smartos?
+      joyent Mash.new
+
+      # copy uuid
+      joyent[:sm_uuid] = virtualization[:guest_uuid]
+
+      # get zone id unless globalzone
+      unless joyent[:sm_uuid] == "global"
+        joyent[:sm_id]            = virtualization[:guest_id]
+      end
+
+      # retrieve image name and pkgsrc
+      collect_product_file.each do |line|
+        case line
+        when /^Image/
+          sm_image = line.split(" ") 
+          joyent[:sm_image_id] = sm_image[1]
+          joyent[:sm_image_ver] = sm_image[2]
+        when /^Base Image/
+          sm_baseimage = line.split(" ")
+          joyent[:sm_baseimage_id] = sm_baseimage[2]
+          joyent[:sm_baseimage_ver] = sm_baseimage[3]
+        end
+      end
+
+      ## retrieve pkgsrc
+      joyent[:sm_pkgsrc] = collect_pkgsrc if collect_pkgsrc
+    end
+  end
+end

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

@@ -38,6 +38,23 @@ Ohai.plugin(:Filesystem) do
         fs[filesystem][:mount] = $6
       end
     end
+    
+    # Grab filesystem inode data from df
+    so = shell_out("df -i")
+    so.stdout.lines do |line|
+      case line
+      when /^Filesystem\s+Inodes/
+        next
+      when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
+        filesystem = $1
+        fs[filesystem] ||= Mash.new
+        fs[filesystem][:total_inodes] = $2
+        fs[filesystem][:inodes_used] = $3
+        fs[filesystem][:inodes_available] = $4
+        fs[filesystem][:inodes_percent_used] = $5
+        fs[filesystem][:mount] = $6
+      end
+    end
 
     # Grab mount information from /bin/mount
     so = shell_out("mount")

data/lib/ohai/plugins/network.rb

@@ -90,7 +90,7 @@ Ohai.plugin(:NetworkAddresses) do
           end.first
           if r.nil?
             r = gw_if_ips.first
-            Ohai::Log.warn("[#{family}] no ipaddress/mask on #{network[int_attr]} matching the gateway #{network[gw_attr]}, picking one anyway")
+            Ohai::Log.debug("[#{family}] no ipaddress/mask on #{network[int_attr]} matching the gateway #{network[gw_attr]}, picking #{r[:ipaddress]}")
           else
             Ohai::Log.debug("[#{family}] Using default interface #{network[int_attr]} and default gateway #{network[gw_attr]} to set the default ip to #{r[:ipaddress]}")
           end

data/lib/ohai/plugins/rackspace.rb

@@ -38,7 +38,7 @@ Ohai.plugin(:Rackspace) do
     if so.exitstatus == 0
       so.stdout.strip.downcase == 'rackspace'
     end
-  rescue Ohai::Exceptions::Exec
+  rescue Errno::ENOENT
     false
   end
 
@@ -89,8 +89,9 @@ Ohai.plugin(:Rackspace) do
         rackspace[:region] = line.split[2].delete('\"') if line =~ /^region/
       end
     end
-  rescue Ohai::Exceptions::Exec
+  rescue Errno::ENOENT
     Ohai::Log.debug("Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
+    nil
   end
 
   # Get the rackspace private networks
@@ -102,17 +103,19 @@ Ohai.plugin(:Rackspace) do
       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(Yajl::Parser.new.parse(_so.stdout))
+          networks.push(FFI_Yajl::Parser.new.parse(_so.stdout))
         else
-          raise Ohai::Exceptions::Exec
+          Ohai::Log.debug('Unable to capture custom private networking information for Rackspace cloud')
+          return false
         end
       end
       # these networks are already known to ohai, and are not 'private networks'
       networks.delete_if { |hash| hash['label'] == 'private' }
       networks.delete_if { |hash| hash['label'] == 'public' }
     end
-  rescue Ohai::Exceptions::Exec
+  rescue Errno::ENOENT
     Ohai::Log.debug('Unable to capture custom private networking information for Rackspace cloud')
+    nil
   end
 
   collect_data do