ohai 8.8.1 → 8.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1414aa396729e3e5d9345bc1219a066485bed692
-  data.tar.gz: 5ec38bc64cee9310d3ed0ec2b1a25c9ed8cbddc1
+  metadata.gz: 045c43590e3c7ece0dc1cf3c6aa928b5f116c136
+  data.tar.gz: 020c8dfeabd26ba77291ba80e445b5ca3d61d661
 SHA512:
-  metadata.gz: 90f69711502fe20ff5e64be54bcdea36b08c68204180a2eace90909fc1622beba40dcd55653bcae8457d2ada4bcd0388ea4f7c0faf1f164570dcf60735ee9810
-  data.tar.gz: ec2700012b9d071d6fdfb5d6f2f08dad4ab1624a4d7f52ae3c93e6405972d4dba7d9f0f0c25f5c5367a04ec14265e6fcdb4dde783bac266441046b1510528b73
+  metadata.gz: 482f14bc6fee2caab189234bf52ee9bbc0c0437f18da3efe2a52b28544ff6080886ef7d4d2ffb84f647a4d19de9144f00c6f16a92ccaa2a6a5dfe3ce105627e8
+  data.tar.gz: fe03f4ace8579e38373ff3fd244c3dd6a47a0738a401f65c673ff4a22c6fc284c3cca8c1788d6c533f03140f78f2ad7dd8a2d71ed8689bbf1d626ac51bcce636

data/Gemfile

@@ -8,6 +8,7 @@ group :development do
   gem "sigar", :platform => "ruby"
   gem 'plist'
 
+  gem "chefstyle", "= 0.1.0"
   # gem 'pry-byebug'
   # gem 'pry-stack_explorer'
 end

data/README.md

@@ -77,7 +77,7 @@ Issues:
 Ohai - system information application
 
 * Author:: Adam Jacob (<adam@chef.io>)
-* Copyright:: Copyright (c) 2008-2014 Chef Software, Inc.
+* Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 * License:: Apache License, Version 2.0
 
 ```text

data/Rakefile

@@ -16,3 +16,9 @@ rescue LoadError
 end
 
 task :default => :spec
+
+require "chefstyle"
+require "rubocop/rake_task"
+RuboCop::RakeTask.new(:style) do |task|
+  task.options += ["--display-cop-names", "--no-color"]
+end

data/bin/ohai

@@ -2,8 +2,8 @@
 #
 # ./ohai - I'm in ur serverz, showin you the daters
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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");

data/lib/ohai.rb

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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.

data/lib/ohai/config.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/dsl.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/dsl/plugin.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Claire McQuin (<claire@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2013 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Claire McQuin (<claire@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");

data/lib/ohai/dsl/plugin/versionvi.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,7 +33,7 @@ module Ohai
         end
 
         def name
-          # Ohai V6 doesn't have any name specification for plugins. 
+          # Ohai V6 doesn't have any name specification for plugins.
           # So we are using the partial path to infer the name of the plugin
           partial_path = Pathname.new(@source).relative_path_from(Pathname.new(@plugin_dir_path)).to_s
           partial_path.chomp(".rb").gsub("/", "::")

data/lib/ohai/dsl/plugin/versionvii.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/exception.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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");

data/lib/ohai/hints.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/loader.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Claire McQuin (<claire@chef.io>)
-# Copyright:: Copyright (c) 2013-2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/log.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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");

data/lib/ohai/mixin/command.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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");

data/lib/ohai/mixin/constant_helper.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/mixin/dmi_decode.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tim Smith <tsmith@chef.io>
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/mixin/ec2_metadata.rb

@@ -1,8 +1,8 @@
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Benjamin Black (<bb@chef.io>)
+# Author:: Christopher Brown (<cb@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/mixin/network_constants.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Serdar Sutay (<serdar@opscode.com>)
-# Copyright:: Copyright (c) 2014 Opscode, Inc.
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright (c) 2014-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,8 +26,8 @@ module Ohai
       }
 
       # From sigar: include/sigar.h sigar_net_route_t
-      SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags, 
-                             :refcnt, :use, :metric, :mtu, :window, 
+      SIGAR_ROUTE_METHODS = [:destination, :gateway, :mask, :flags,
+                             :refcnt, :use, :metric, :mtu, :window,
                              :irtt, :ifname]
     end
   end

data/lib/ohai/mixin/os.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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");

data/lib/ohai/mixin/seconds_to_human.rb

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# 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.

data/lib/ohai/mixin/string.rb

@@ -1,14 +1,14 @@
 #
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright (c) 2009-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.
@@ -19,7 +19,7 @@
 class String
   # Add string function to handle WMI property conversion to json hash keys
   # Makes an underscored, lowercase form from the expression in the string.
-  # underscore will also change ’::’ to ’/’ to convert namespaces to paths. 
+  # underscore will also change ’::’ to ’/’ to convert namespaces to paths.
   # This should implement the same functionality as underscore method in
   # ActiveSupport::CoreExtensions::String::Inflections
   def wmi_underscore

data/lib/ohai/plugin_config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright (c) 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,8 @@
 #
-# Author:: Joshua Timberman <joshua@opscode.com>
+# Author:: Joshua Timberman <joshua@chef.io>
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013, Opscode, Inc.
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,36 +23,41 @@ Ohai.plugin(:CPU) do
 
   collect_data(:aix) do
     cpu Mash.new
-    
+
     cpu[:total] = shell_out("pmcycles -m").stdout.lines.length
-    # At least one CPU will be available, but we'll wait to increment this later.
-    cpu[:available] = 0
 
-    cpudevs = shell_out("lsdev -Cc processor").stdout.lines
-    #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
-    #on AIX number of cores and processors are considered same 
-    cpu[:real] = cpu[:cores] = cpudevs.length 
-    cpudevs.each.with_index do |c,i|
-      name, status, location = c.split
-      index = i.to_s
-      cpu[index] = Mash.new
-      cpu[index][:status] = status
-      cpu[index][:location] = location
-      if status =~ /Available/
-        cpu[:available] += 1
-        lsattr = shell_out("lsattr -El #{name}").stdout.lines
-        lsattr.each do |attribute|
-          attrib, value = attribute.split
-          if attrib == "type"
-            cpu[index][:model_name] = value
-          elsif attrib == "frequency"
-            cpu[index][:mhz] = value.to_i / (1000 * 1000) #convert from hz to MHz
-          else
-            cpu[index][attrib] = value
+    # The below is only relevent on an LPAR
+    if shell_out('uname -W').stdout.strip == "0"
+
+      # At least one CPU will be available, but we'll wait to increment this later.
+      cpu[:available] = 0
+
+      cpudevs = shell_out("lsdev -Cc processor").stdout.lines
+      #from http://www-01.ibm.com/software/passportadvantage/pvu_terminology_for_customers.html
+      #on AIX number of cores and processors are considered same
+      cpu[:real] = cpu[:cores] = cpudevs.length
+      cpudevs.each.with_index do |c,i|
+        name, status, location = c.split
+        index = i.to_s
+        cpu[index] = Mash.new
+        cpu[index][:status] = status
+        cpu[index][:location] = location
+        if status =~ /Available/
+          cpu[:available] += 1
+          lsattr = shell_out("lsattr -El #{name}").stdout.lines
+          lsattr.each do |attribute|
+            attrib, value = attribute.split
+            if attrib == "type"
+              cpu[index][:model_name] = value
+            elsif attrib == "frequency"
+              cpu[index][:mhz] = value.to_i / (1000 * 1000) #convert from hz to MHz
+            else
+              cpu[index][attrib] = value
+            end
           end
-		end
-        # IBM is the only maker of CPUs for AIX systems.
-        cpu[index][:vendor_id] = "IBM"
+          # IBM is the only maker of CPUs for AIX systems.
+          cpu[index][:vendor_id] = "IBM"
+        end
       end
     end
   end

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

@@ -1,7 +1,8 @@
 #
 # Author:: Deepali Jagtap (<deepali.jagtap@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Isa Farnik (<isa@chef.io>)
+# Copyright:: Copyright (c) 2013-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,52 +22,69 @@
 Ohai.plugin(:Filesystem) do
   provides "filesystem"
 
-  collect_data(:aix) do
-    fs = Mash.new
+  def parse_df_or_mount(shell_out)
+    oldie = Mash.new
 
-    # Grab filesystem data from df
-    so = shell_out("df -P")
-    so.stdout.lines.each do |line|
+    shell_out.lines.each do |line|
+      fields = line.split
       case line
-      when /^Filesystem\s+1024-blocks/
+      # headers and horizontal rules to skip
+      when /^\s*(node|---|^Filesystem\s+1024-blocks)/
         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
+      # strictly a df entry
+      when /^(.+?)\s+([0-9-]+)\s+([0-9-]+)\s+([0-9-]+)\s+([0-9-]+\%*)\s+(.+)$/
+        if $1 == "Global"
+          key = "#{$1}:#{$6}"
+        else
+          key = $1
+        end
+        oldie[key] ||= Mash.new
+        oldie[key][:kb_size] = $2
+        oldie[key][:kb_used] = $3
+        oldie[key][:kb_available] = $4
+        oldie[key][:percent_used] = $5
+        oldie[key][:mount] = $6
+      # an entry starting with 'G' or / (E.G. /tmp or /var)
+      when /^\s*(G.*?|\/\w)/
+        if fields[0] == "Global"
+          key = fields[0] + ":" + fields[1]
+        else
+          key = fields[0]
+        end
+        oldie[key] ||= Mash.new
+        oldie[key][:mount] = fields[1]
+        oldie[key][:fs_type] = fields[2]
+        oldie[key][:mount_options] = fields[6].split(',')
+      # entries occupying the 'Node' column parsed here
+      else
+        key = fields[0] + ":" + fields[1]
+        oldie[key] ||= Mash.new
+        oldie[key][:mount] = fields[1]
+        oldie[key][:fs_type] = fields[3]
+        oldie[key][:mount_options] = fields[7].split(',')
       end
     end
+    oldie
+  end
 
-    # Grab mount information from /bin/mount
-    so = shell_out("mount")
-    so.stdout.lines.each do |line|
-      case line
-      when /^\s*node/
-        next
-      when /^\s*---/
-        next
-      when /^\s*\/\w/
-        fields = line.split
-        filesystem = fields[0]
-        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-        fs[filesystem][:mount] = fields[1]
-        fs[filesystem][:fs_type] = fields[2]
-        fs[filesystem][:mount_options] = fields[6]
-      else
-        fields = line.split
-        filesystem = fields[0] + ":" + fields[1]
-        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-        fs[filesystem][:mount] = fields[2]
-        fs[filesystem][:fs_type] = fields[3]
-        fs[filesystem][:mount_options] = fields[7]
-      end
+  def collect_old_version(shell_outs)
+    mount_hash = parse_df_or_mount shell_outs[:mount]
+    df_hash    = parse_df_or_mount shell_outs[:df_Pk]
+
+    mount_hash.each do |key, hash|
+      df_hash[key].merge!(hash) if df_hash.has_key?(key)
     end
 
-    # Set the filesystem data
-    filesystem fs
+    mount_hash.merge(df_hash)
+  end
+
+  collect_data(:aix) do
+
+    # Cache the command output
+    shell_outs = Mash.new
+    shell_outs[:mount] = shell_out("mount").stdout
+    shell_outs[:df_Pk] = shell_out("df -Pk").stdout
+
+    filesystem collect_old_version(shell_outs)
   end
 end