ohai 8.8.1 → 8.9.0

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

@@ -1,6 +1,7 @@
 #
-# Author:: Joshua Timberman <joshua@opscode.com>
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Joshua Timberman <joshua@chef.io>
+# 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");

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

@@ -1,6 +1,7 @@
 #
-# Author:: Joshua Timberman <joshua@opscode.com>
-# Copyright:: Copyright (c) 2013, Opscode, Inc.
+# Author:: Joshua Timberman <joshua@chef.io>
+# 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");
@@ -27,7 +28,7 @@ Ohai.plugin(:Memory) do
     total_in_mb, u, free_in_mb = meminfo.split
     memory[:total] = "#{total_in_mb.to_i * 1024}kB"
     memory[:free] = "#{free_in_mb.to_i * 1024}kB"
-    
+
     swapinfo = shell_out("swap -s").stdout.split #returns swap info in 4K blocks
     memory[:swap]['total'] = "#{(swapinfo[2].to_i) * 4}kB"
     memory[:swap]['free'] = "#{(swapinfo[10].to_i) * 4}kB"

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

@@ -2,7 +2,7 @@
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
 # Author:: Prabhu Das (<prabhu.das@clogeny.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef, 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");
@@ -21,7 +21,7 @@
 Ohai.plugin(:Network) do
   require 'ipaddr'
 
-  provides "network", "counters/network"
+  provides "network", "counters/network", "macaddress"
 
   # Helpers
   def hex_to_dec_netmask(netmask)
@@ -115,7 +115,10 @@ Ohai.plugin(:Network) do
       e_so = shell_out("entstat -d #{interface} | grep \"Hardware Address\"")
       iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
       e_so.stdout.lines.each do |line|
-        iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" } if line =~ /Hardware Address: (\S+)/
+        if line =~ /Hardware Address: (\S+)/
+          iface[interface][:addresses][$1.upcase] = { "family" => "lladdr" }
+          macaddress $1.upcase unless shell_out("uname -W").stdout.to_i > 0
+        end
       end
     end  #ifconfig stdout
 
@@ -145,7 +148,6 @@ Ohai.plugin(:Network) do
         count += 1
       end
     end
-
     network["interfaces"] = iface
   end
 end

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

@@ -0,0 +1,30 @@
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# 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");
+# 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/mixin/os'
+
+Ohai.plugin(:OS) do
+  provides "os", "os_version"
+  depends 'kernel'
+
+  collect_data(:aix) do
+    os collect_os
+    os_version kernel[:version]
+  end
+end

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

@@ -1,6 +1,7 @@
 #
-# Author:: Joshua Timberman <joshua@opscode.com>
-# Copyright:: Copyright (c) 2013, Opscode, Inc.
+# Author:: Joshua Timberman <joshua@chef.io>
+# 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");

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

@@ -1,6 +1,7 @@
 #
 # Author:: Kurt Yoder (<ktyopscode@yoderhome.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");
@@ -33,4 +34,4 @@ Ohai.plugin(:Uptime) do
       end
     end
   end
-end
+end

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

@@ -1,6 +1,7 @@
 #
-# Author:: Julian C. Dunn (<jdunn@getchef.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# Author:: Julian C. Dunn (<jdunn@chef.io>)
+# 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");
@@ -17,7 +18,7 @@
 #
 
 Ohai.plugin(:Virtualization) do
-  provides "virtualization"
+  provides "virtualization", "virtualization/wpars"
 
   collect_data(:aix) do
     virtualization Mash.new
@@ -33,7 +34,116 @@ Ohai.plugin(:Virtualization) do
 
     so = shell_out("uname -W")
     wpar_no = so.stdout.split($/)[0]
-    virtualization[:wpar_no] = wpar_no unless wpar_no.to_i == 0
+    if wpar_no.to_i > 0
+      virtualization[:wpar_no] = wpar_no
+    else
+      # the below parses the output of lswpar in the long format
+      so = shell_out("lswpar -L").stdout.scan(/={65}.*?(?:EXPORTED\n\n)+/m)
+      wpars = Mash.new
+      so.each do |wpar|
+        wpar_name = wpar.lines[1].split[0]
+        wpars[wpar_name] = Mash.new
 
+        wpar.scan(/^[A-Z]{4,}.*?[A-Z\:0-9]$.*?\n\n/m).each do |section|
+
+          # retrieve title of section
+          title = section.lines.first[0..-2].downcase
+          wpars[wpar_name][title] = Mash.new
+
+          # discard trailing section newline+title
+          # and save as array
+          sections = section.lines[1..-2]
+
+          sections.each do |line|
+            case title
+            when 'network'
+              next if line =~ /^Interface|^---/
+              splat = line.strip.split
+              key   = splat[0].downcase
+              value = {
+                        'address'   => splat[1],
+                        'netmask'   => splat[2],
+                        'broadcast' => splat[3],
+                      }
+              wpars[wpar_name][title][key] = value
+            when 'user-specified routes'
+              next if line =~ /^Type|^---/
+              splat = line.strip.split
+              key   = splat[2].downcase
+              value = {
+                        'destination' => splat[0],
+                        'gateway'     => splat[1],
+                      }
+              wpars[wpar_name][title][key] = value
+            when 'file systems'
+              next if line =~ /^MountPoint|^---/
+              splat = line.strip.split
+              key = splat[1].downcase
+              value = {
+                        'mountpoint' => splat[0],
+                        'device'     => splat[1],
+                        'vfs'     => splat[2],
+                        'options'     => splat[3].split(','),
+                      }
+              wpars[wpar_name][title][key] = value
+            when 'security settings'
+              privileges ||= ''
+              wpars[wpar_name][title]['Privileges'] ||= []
+
+              if line =~ /^Privileges/
+                privileges << line.split(':')[1].strip
+              else
+                privileges << line.strip
+              end
+
+              wpars[wpar_name][title]['Privileges'] += privileges.split(',')
+            when 'device exports'
+              next if line =~ /^Name|^---/
+              splat = line.strip.split
+              key = splat[0].downcase
+              value = {
+                        'type' => splat[1],
+                        'status'     => splat[2],
+                      }
+              wpars[wpar_name][title][key] = value
+            else
+              # key-value pairs are handled here
+              # such as GENERAL and RESOURCE-
+              # CONTROL
+              splat = line.strip.split(':')
+              key   = splat[0].downcase
+              value = splat[1..-1].join(', ').strip
+              value = value.empty? ? nil : value
+              case value
+              when "yes"
+                value = true
+              when "no"
+                value = false
+              end
+              wpars[wpar_name][title][key] = value
+            end
+          end
+        end
+        top_level = [
+          "general.directory",
+          "general.hostname",
+          "general.private /usr",
+          "general.type",
+          "general.uuid",
+          "resource controls.active",
+          "network.en0.address",
+        ]
+
+        top_level.each do |attribute|
+          evalstr = "wpars['#{wpar_name}']"
+          breadcrumb = attribute.split('.')
+          breadcrumb.each do |node|
+            evalstr << "[\'#{node}\']"
+          end
+          wpars[wpar_name][breadcrumb[-1]] = eval evalstr
+        end
+      end
+      virtualization[:wpars] = wpars unless wpars.empty?
+    end
   end
-end
+end

data/lib/ohai/plugins/azure.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright (c) 2013 Opscode, 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/plugins/bsd/filesystem.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Tim Smith (<tsmith@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/plugins/command.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/plugins/darwin/cpu.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Nathan L Smith (<nlloyds@gmail.com>)
-# Author:: Tim Smith (<tsmith@limelight.com>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Author:: Tim Smith (<tsmith@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,8 +22,10 @@ Ohai.plugin(:CPU) do
 
   collect_data(:darwin) do
     cpu Mash.new
-    so = shell_out("sysctl -n hw.physicalcpu")
+    so = shell_out("sysctl -n hw.packages")
     cpu[:real] = so.stdout.to_i
+    so = shell_out("sysctl -n hw.physicalcpu")
+    cpu[:cores] = so.stdout.to_i
     so = shell_out("sysctl -n hw.logicalcpu")
     cpu[:total] = so.stdout.to_i
     so = shell_out("sysctl -n hw.cpufrequency")

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

@@ -1,14 +1,14 @@
 #
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Benjamin Black (<bb@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");
 # 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/plugins/darwin/filesystem2.rb

@@ -1,16 +1,16 @@
 #
 # Author:: Phil Dibowitz (<phil@ipom.com>)
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Benjamin Black (<bb@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2015 Facebook, 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/plugins/darwin/memory.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Patrick Collins (<pat@burned.com>)
-# Copyright:: Copyright (c) 2013 Opscode, 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");
@@ -31,10 +31,11 @@ Ohai.plugin(:Memory) do
     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_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?

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

@@ -1,6 +1,6 @@
 #
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Benjamin Black (<bb@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/plugins/darwin/platform.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/plugins/darwin/system_profiler.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Benjamin Black (<bb@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/plugins/dragonflybsd/os.rb

@@ -1,7 +1,7 @@
 #
-# Authors:: Adam Jacob (<adam@opscode.com>)
+# Authors:: Adam Jacob (<adam@chef.io>)
 #           Richard Manyanza (<liseki@nyikacraftsmen.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # Copyright:: Copyright (c) 2014 Richard Manyanza.
 # License:: Apache License, Version 2.0
 #

data/lib/ohai/plugins/ec2.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/plugins/erlang.rb

@@ -1,14 +1,14 @@
 #
 # Author:: Joe Williams (<joe@joetify.com>)
-# Copyright:: Copyright (c) 2008 Opscode, 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");
 # 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.