ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/ps.rb

@@ -1,35 +1,35 @@
-# frozen_string_literal: true
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Bryan McLellan (<btm@loftninjas.org>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# Copyright:: Copyright (c) 2009 Bryan McLellan
-# 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(:PS) do
-  provides "command/ps"
-  depends "command"
-
-  collect_data(:aix, :darwin, :linux, :solaris2) do
-    command[:ps] = "ps -ef"
-  end
-
-  collect_data(:freebsd, :netbsd, :openbsd, :dragonflybsd) do
-    # ps -e requires procfs
-    command[:ps] = "ps -axww"
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Bryan McLellan (<btm@loftninjas.org>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# 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(:PS) do
+  provides "command/ps"
+  depends "command"
+
+  collect_data(:aix, :darwin, :linux, :solaris2) do
+    command[:ps] = "ps -ef"
+  end
+
+  collect_data(:freebsd, :netbsd, :openbsd, :dragonflybsd) do
+    # ps -e requires procfs
+    command[:ps] = "ps -axww"
+  end
+end

data/lib/ohai/plugins/python.rb

@@ -1,43 +1,43 @@
-#
-# Author:: Thom May (<thom@clearairturbulence.org>)
-# Copyright:: Copyright (c) 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.
-#
-
-Ohai.plugin(:Python) do
-  provides "languages/python"
-
-  depends "languages".freeze
-
-  collect_data do
-
-    so = shell_out("python -c \"import sys; print (sys.version)\"")
-    # Sample output:
-    # 2.7.11 (default, Dec 26 2015, 17:47:53)
-    # [GCC 4.2.1 Compatible Apple LLVM 7.0.2 (clang-700.1.81)]
-    if so.exitstatus == 0
-      python = Mash.new
-      output = so.stdout.split
-      python[:version] = output[0]
-      if output.length >= 6
-        python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].delete!(")")]
-      end
-      languages[:python] = python unless python.empty?
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Python: Could not shell_out "python -c "import sys; print (sys.version)"". Skipping plugin')
-
-  end
-end
+#
+# Author:: Thom May (<thom@clearairturbulence.org>)
+# Copyright:: Copyright (c) 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.
+#
+
+Ohai.plugin(:Python) do
+  provides "languages/python"
+
+  depends "languages".freeze
+
+  collect_data do
+
+    so = shell_out("python -c \"import sys; print (sys.version)\"")
+    # Sample output:
+    # 2.7.11 (default, Dec 26 2015, 17:47:53)
+    # [GCC 4.2.1 Compatible Apple LLVM 7.0.2 (clang-700.1.81)]
+    if so.exitstatus == 0
+      python = Mash.new
+      output = so.stdout.split
+      python[:version] = output[0]
+      if output.length >= 6
+        python[:builddate] = "%s %s %s %s" % [output[2], output[3], output[4], output[5].delete!(")")]
+      end
+      languages[:python] = python unless python.empty?
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Python: Could not shell_out "python -c "import sys; print (sys.version)"". Skipping plugin')
+
+  end
+end

data/lib/ohai/plugins/rackspace.rb

@@ -1,177 +1,177 @@
-# frozen_string_literal: true
-#
-# Author:: Cary Penniman (<cary@rightscale.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(:Rackspace) do
-  provides "rackspace"
-
-  depends "kernel", "network/interfaces"
-
-  # Checks for matching rackspace kernel name
-  #
-  # === Return
-  # true:: If kernel name matches
-  # false:: Otherwise
-  def has_rackspace_kernel?
-    kernel[:release].end_with?("-rscloud")
-  end
-
-  # Checks for rackspace provider attribute
-  #
-  # === Return
-  # true:: If rackspace provider attribute found
-  # false:: Otherwise
-  def has_rackspace_metadata?
-    so = shell_out("xenstore-read vm-data/provider_data/provider")
-    if so.exitstatus == 0
-      so.stdout.strip.casecmp("rackspace") == 0
-    end
-  rescue Ohai::Exceptions::Exec
-    false
-  end
-
-  # Checks for the rackspace manufacturer on Windows
-  # === Return
-  # true:: If the rackspace cloud can be identified
-  # false:: Otherwise
-  def has_rackspace_manufacturer?
-    return false unless RUBY_PLATFORM.match?(/mswin|mingw|windows/)
-
-    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
-    wmi = WmiLite::Wmi.new
-    if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"
-      logger.trace("Plugin Rackspace: has_rackspace_manufacturer? == true")
-      true
-    end
-  end
-
-  # Identifies the rackspace cloud
-  #
-  # === Return
-  # true:: If the rackspace cloud can be identified
-  # false:: Otherwise
-  def looks_like_rackspace?
-    hint?("rackspace") || has_rackspace_metadata? || has_rackspace_kernel? || has_rackspace_manufacturer?
-  end
-
-  # Names rackspace ip address
-  #
-  # === Parameters
-  # name<Symbol>:: Use :public_ip or :private_ip
-  # eth<Symbol>:: Interface name of public or private ip
-  def get_ip_address(name, eth)
-    network[:interfaces][eth][:addresses].each do |key, info|
-      if info["family"] == "inet"
-        rackspace[name] = key
-        break # break when we found an address
-      end
-    end
-  end
-
-  # Names rackspace ipv6 address for interface
-  #
-  # === Parameters
-  # name<Symbol>:: Use :public_ip or :private_ip
-  # eth<Symbol>:: Interface name of public or private ip
-  def get_global_ipv6_address(name, eth)
-    network[:interfaces][eth][:addresses].each do |key, info|
-      # check if we got an ipv6 address and if its in global scope
-      if info["family"] == "inet6" && info["scope"] == "Global"
-        rackspace[name] = key
-        break # break when we found an address
-      end
-    end
-  end
-
-  # Get the rackspace region
-  #
-  def get_region
-    so = shell_out("xenstore-ls vm-data/provider_data")
-    if so.exitstatus == 0
-      so.stdout.split("\n").each do |line|
-        rackspace[:region] = line.split[2].delete('\"') if /^region/.match?(line)
-      end
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin Rackspace: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
-    nil
-  end
-
-  # Get the rackspace instance_id
-  #
-  def get_instance_id
-    so = shell_out("xenstore-read name")
-    if so.exitstatus == 0
-      rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin Rackspace: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
-    nil
-  end
-
-  # Get the rackspace private networks
-  #
-  def get_private_networks
-    so = shell_out("xenstore-ls vm-data/networking")
-    if so.exitstatus == 0
-      networks = []
-      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(FFI_Yajl::Parser.new.parse(so.stdout))
-        else
-          logger.trace("Plugin Rackspace: 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
-    logger.trace("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
-    nil
-  end
-
-  collect_data do
-    require "resolv"
-
-    # Adds rackspace Mash
-    if looks_like_rackspace?
-      rackspace Mash.new
-      get_ip_address(:public_ip, :eth0)
-      get_ip_address(:private_ip, :eth1)
-      get_region
-      get_instance_id
-      # public_ip + private_ip are deprecated in favor of public_ipv4 and local_ipv4 to standardize.
-      rackspace[:public_ipv4] = rackspace[:public_ip]
-      get_global_ipv6_address(:public_ipv6, :eth0)
-      unless rackspace[:public_ip].nil?
-        rackspace[:public_hostname] = begin
-          Resolv.getname(rackspace[:public_ip])
-                                      rescue Resolv::ResolvError, Resolv::ResolvTimeout
-                                        rackspace[:public_ip]
-        end
-      end
-      rackspace[:local_ipv4] = rackspace[:private_ip]
-      get_global_ipv6_address(:local_ipv6, :eth1)
-      rackspace[:local_hostname] = hostname
-      private_networks = get_private_networks
-      rackspace[:private_networks] = private_networks if private_networks
-    end
-  end
-
-end
+# frozen_string_literal: true
+#
+# Author:: Cary Penniman (<cary@rightscale.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(:Rackspace) do
+  provides "rackspace"
+
+  depends "kernel", "network/interfaces"
+
+  # Checks for matching rackspace kernel name
+  #
+  # === Return
+  # true:: If kernel name matches
+  # false:: Otherwise
+  def has_rackspace_kernel?
+    kernel[:release].end_with?("-rscloud")
+  end
+
+  # Checks for rackspace provider attribute
+  #
+  # === Return
+  # true:: If rackspace provider attribute found
+  # false:: Otherwise
+  def has_rackspace_metadata?
+    so = shell_out("xenstore-read vm-data/provider_data/provider")
+    if so.exitstatus == 0
+      so.stdout.strip.casecmp("rackspace") == 0
+    end
+  rescue Ohai::Exceptions::Exec
+    false
+  end
+
+  # Checks for the rackspace manufacturer on Windows
+  # === Return
+  # true:: If the rackspace cloud can be identified
+  # false:: Otherwise
+  def has_rackspace_manufacturer?
+    return false unless RUBY_PLATFORM.match?(/mswin|mingw|windows/)
+
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+    wmi = WmiLite::Wmi.new
+    if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"
+      logger.trace("Plugin Rackspace: has_rackspace_manufacturer? == true")
+      true
+    end
+  end
+
+  # Identifies the rackspace cloud
+  #
+  # === Return
+  # true:: If the rackspace cloud can be identified
+  # false:: Otherwise
+  def looks_like_rackspace?
+    hint?("rackspace") || has_rackspace_metadata? || has_rackspace_kernel? || has_rackspace_manufacturer?
+  end
+
+  # Names rackspace ip address
+  #
+  # === Parameters
+  # name<Symbol>:: Use :public_ip or :private_ip
+  # eth<Symbol>:: Interface name of public or private ip
+  def get_ip_address(name, eth)
+    network[:interfaces][eth][:addresses].each do |key, info|
+      if info["family"] == "inet"
+        rackspace[name] = key
+        break # break when we found an address
+      end
+    end
+  end
+
+  # Names rackspace ipv6 address for interface
+  #
+  # === Parameters
+  # name<Symbol>:: Use :public_ip or :private_ip
+  # eth<Symbol>:: Interface name of public or private ip
+  def get_global_ipv6_address(name, eth)
+    network[:interfaces][eth][:addresses].each do |key, info|
+      # check if we got an ipv6 address and if its in global scope
+      if info["family"] == "inet6" && info["scope"] == "Global"
+        rackspace[name] = key
+        break # break when we found an address
+      end
+    end
+  end
+
+  # Get the rackspace region
+  #
+  def get_region
+    so = shell_out("xenstore-ls vm-data/provider_data")
+    if so.exitstatus == 0
+      so.stdout.split("\n").each do |line|
+        rackspace[:region] = line.split[2].delete('\"') if /^region/.match?(line)
+      end
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Rackspace: Unable to find xenstore-ls, cannot capture region information for Rackspace cloud")
+    nil
+  end
+
+  # Get the rackspace instance_id
+  #
+  def get_instance_id
+    so = shell_out("xenstore-read name")
+    if so.exitstatus == 0
+      rackspace[:instance_id] = so.stdout.gsub(/instance-/, "")
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Rackspace: Unable to find xenstore-read, cannot capture instance ID information for Rackspace cloud")
+    nil
+  end
+
+  # Get the rackspace private networks
+  #
+  def get_private_networks
+    so = shell_out("xenstore-ls vm-data/networking")
+    if so.exitstatus == 0
+      networks = []
+      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(FFI_Yajl::Parser.new.parse(so.stdout))
+        else
+          logger.trace("Plugin Rackspace: 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
+    logger.trace("Plugin Rackspace: Unable to capture custom private networking information for Rackspace cloud")
+    nil
+  end
+
+  collect_data do
+    require "resolv"
+
+    # Adds rackspace Mash
+    if looks_like_rackspace?
+      rackspace Mash.new
+      get_ip_address(:public_ip, :eth0)
+      get_ip_address(:private_ip, :eth1)
+      get_region
+      get_instance_id
+      # public_ip + private_ip are deprecated in favor of public_ipv4 and local_ipv4 to standardize.
+      rackspace[:public_ipv4] = rackspace[:public_ip]
+      get_global_ipv6_address(:public_ipv6, :eth0)
+      unless rackspace[:public_ip].nil?
+        rackspace[:public_hostname] = begin
+          Resolv.getname(rackspace[:public_ip])
+                                      rescue Resolv::ResolvError, Resolv::ResolvTimeout
+                                        rackspace[:public_ip]
+        end
+      end
+      rackspace[:local_ipv4] = rackspace[:private_ip]
+      get_global_ipv6_address(:local_ipv6, :eth1)
+      rackspace[:local_hostname] = hostname
+      private_networks = get_private_networks
+      rackspace[:private_networks] = private_networks if private_networks
+    end
+  end
+
+end

data/lib/ohai/plugins/root_group.rb

@@ -1,41 +1,41 @@
-# frozen_string_literal: true
-#
-# Author:: Joseph Anthony Pasquale Holsten (<joseph@josephholsten.com>)
-# Copyright:: Copyright (c) 2013 Joseph Anthony Pasquale Holsten
-# 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(:RootGroup) do
-  provides "root_group"
-
-  collect_data(:windows) do
-    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
-
-    wmi = WmiLite::Wmi.new
-    # Per http://support.microsoft.com/kb/243330 SID: S-1-5-32-544 is the
-    # internal name for the Administrators group, which lets us work
-    # properly in environments with a renamed or localized name for the
-    # Administrators group.
-    # Use LocalAccount=True because otherwise WMI will attempt to include
-    # (unneeded) Active Directory groups by querying AD, which is a performance
-    # and reliability issue since AD might not be reachable.
-    groups = wmi.query("select * from Win32_Group where sid like 'S-1-5-32-544' and LocalAccount=True")
-    windows_root_group_name = groups[0]["name"]
-    root_group windows_root_group_name
-  end
-
-  collect_data(:default) do
-    root_group Etc.getgrgid(Etc.getpwnam("root").gid).name
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Joseph Anthony Pasquale Holsten (<joseph@josephholsten.com>)
+# Copyright:: Copyright (c) 2013 Joseph Anthony Pasquale Holsten
+# 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(:RootGroup) do
+  provides "root_group"
+
+  collect_data(:windows) do
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+
+    wmi = WmiLite::Wmi.new
+    # Per http://support.microsoft.com/kb/243330 SID: S-1-5-32-544 is the
+    # internal name for the Administrators group, which lets us work
+    # properly in environments with a renamed or localized name for the
+    # Administrators group.
+    # Use LocalAccount=True because otherwise WMI will attempt to include
+    # (unneeded) Active Directory groups by querying AD, which is a performance
+    # and reliability issue since AD might not be reachable.
+    groups = wmi.query("select * from Win32_Group where sid like 'S-1-5-32-544' and LocalAccount=True")
+    windows_root_group_name = groups[0]["name"]
+    root_group windows_root_group_name
+  end
+
+  collect_data(:default) do
+    root_group Etc.getgrgid(Etc.getpwnam("root").gid).name
+  end
+end