ohai 18.1.18 → 19.0.3

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

@@ -1,122 +1,122 @@
-# frozen_string_literal: true
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# 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(:Network) do
-  provides "network", "network/interfaces"
-  provides "counters/network", "counters/network/interfaces"
-
-  collect_data(:openbsd) do
-    network Mash.new unless network
-    network[:interfaces] ||= Mash.new
-    counters Mash.new unless counters
-    counters[:network] ||= Mash.new
-
-    shell_out("route -n get default").stdout.lines do |line|
-      if line =~ /(\w+): ([\w\.]+)/
-        case $1
-        when "gateway"
-          network[:default_gateway] = $2
-        when "interface"
-          network[:default_interface] = $2
-        end
-      end
-    end
-
-    iface = Mash.new
-    cint = nil
-    shell_out( "#{Ohai.abs_path( "/sbin/ifconfig" )} -a" ).stdout.lines do |line|
-      if line =~ /^([0-9a-zA-Z\.]+):\s+/
-        cint = $1
-        iface[cint] = Mash.new
-        if cint =~ /^(\w+)(\d+.*)/
-          iface[cint][:type] = $1
-          iface[cint][:number] = $2
-        end
-      end
-      # call the family lladdr to match linux for consistency
-      if line =~ /\s+lladdr (.+?)\s/
-        iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "lladdr" }
-      end
-      if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
-        iface[cint][:addresses] ||= Mash.new
-        # convert the netmask to decimal for consistency
-        netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
-        if $3.empty?
-          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
-        else
-          # found a broadcast address
-          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
-        end
-      end
-      if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
-        iface[cint][:addresses] ||= Mash.new
-        if $4.empty?
-          iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
-        else
-          # found a zone_id / scope
-          iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
-        end
-      end
-      if line =~ /flags=\d+<(.+)>/
-        flags = $1.split(",")
-        iface[cint][:flags] = flags if flags.length > 0
-      end
-      if line =~ /metric: (\d+) mtu: (\d+)/
-        iface[cint][:metric] = $1
-        iface[cint][:mtu] = $2
-      end
-    end
-
-    shell_out("arp -an").stdout.lines do |line|
-      if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
-        next unless iface[$3] # this should never happen
-
-        iface[$3][:arp] ||= Mash.new
-        iface[$3][:arp][$1] = $2.downcase
-      end
-    end
-
-    network["interfaces"] = iface
-
-    net_counters = Mash.new
-    # From netstat(1), not sure of the implications:
-    # Show the state of all network interfaces or a single interface
-    # which have been auto-configured (interfaces statically configured
-    # into a system, but not located at boot time are not shown).
-    shell_out("netstat -idn").stdout.lines do |line|
-      # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
-      # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
-      # $1                        $2                      $3    $4    $5       $6    $7   $8
-      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-        net_counters[$1] ||= Mash.new
-        net_counters[$1]["rx"] ||= Mash.new
-        net_counters[$1]["tx"] ||= Mash.new
-        net_counters[$1]["rx"]["packets"] = $3
-        net_counters[$1]["rx"]["errors"] = $4
-        net_counters[$1]["tx"]["packets"] = $5
-        net_counters[$1]["tx"]["errors"] = $6
-        net_counters[$1]["tx"]["collisions"] = $7
-        net_counters[$1]["tx"]["dropped"] = $8
-      end
-    end
-
-    counters[:network][:interfaces] = net_counters
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# 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(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
+
+  collect_data(:openbsd) do
+    network Mash.new unless network
+    network[:interfaces] ||= Mash.new
+    counters Mash.new unless counters
+    counters[:network] ||= Mash.new
+
+    shell_out("route -n get default").stdout.lines do |line|
+      if line =~ /(\w+): ([\w\.]+)/
+        case $1
+        when "gateway"
+          network[:default_gateway] = $2
+        when "interface"
+          network[:default_interface] = $2
+        end
+      end
+    end
+
+    iface = Mash.new
+    cint = nil
+    shell_out( "#{Ohai.abs_path( "/sbin/ifconfig" )} -a" ).stdout.lines do |line|
+      if line =~ /^([0-9a-zA-Z\.]+):\s+/
+        cint = $1
+        iface[cint] = Mash.new
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+        end
+      end
+      # call the family lladdr to match linux for consistency
+      if line =~ /\s+lladdr (.+?)\s/
+        iface[cint][:addresses] ||= Mash.new
+        iface[cint][:addresses][$1] = { "family" => "lladdr" }
+      end
+      if line =~ /\s+inet ([\d.]+) netmask ([\da-fx]+)\s*\w*\s*([\d.]*)/
+        iface[cint][:addresses] ||= Mash.new
+        # convert the netmask to decimal for consistency
+        netmask = "#{$2[2, 2].hex}.#{$2[4, 2].hex}.#{$2[6, 2].hex}.#{$2[8, 2].hex}"
+        if $3.empty?
+          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask }
+        else
+          # found a broadcast address
+          iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => netmask, "broadcast" => $3 }
+        end
+      end
+      if line =~ /\s+inet6 ([a-f0-9\:]+)%?(\w*)\s+prefixlen\s+(\d+)\s*\w*\s*([\da-fx]*)/
+        iface[cint][:addresses] ||= Mash.new
+        if $4.empty?
+          iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $3 }
+        else
+          # found a zone_id / scope
+          iface[cint][:addresses][$1] = { "family" => "inet6", "zoneid" => $2, "prefixlen" => $3, "scopeid" => $4 }
+        end
+      end
+      if line =~ /flags=\d+<(.+)>/
+        flags = $1.split(",")
+        iface[cint][:flags] = flags if flags.length > 0
+      end
+      if line =~ /metric: (\d+) mtu: (\d+)/
+        iface[cint][:metric] = $1
+        iface[cint][:mtu] = $2
+      end
+    end
+
+    shell_out("arp -an").stdout.lines do |line|
+      if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
+        next unless iface[$3] # this should never happen
+
+        iface[$3][:arp] ||= Mash.new
+        iface[$3][:arp][$1] = $2.downcase
+      end
+    end
+
+    network["interfaces"] = iface
+
+    net_counters = Mash.new
+    # From netstat(1), not sure of the implications:
+    # Show the state of all network interfaces or a single interface
+    # which have been auto-configured (interfaces statically configured
+    # into a system, but not located at boot time are not shown).
+    shell_out("netstat -idn").stdout.lines do |line|
+      # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
+      # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
+      # $1                        $2                      $3    $4    $5       $6    $7   $8
+      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link>\s+([\w:]*)\s*(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+        net_counters[$1] ||= Mash.new
+        net_counters[$1]["rx"] ||= Mash.new
+        net_counters[$1]["tx"] ||= Mash.new
+        net_counters[$1]["rx"]["packets"] = $3
+        net_counters[$1]["rx"]["errors"] = $4
+        net_counters[$1]["tx"]["packets"] = $5
+        net_counters[$1]["tx"]["errors"] = $6
+        net_counters[$1]["tx"]["collisions"] = $7
+        net_counters[$1]["tx"]["dropped"] = $8
+      end
+    end
+
+    counters[:network][:interfaces] = net_counters
+  end
+end

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

@@ -1,28 +1,28 @@
-# frozen_string_literal: true
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# 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(:Platform) do
-  provides "platform", "platform_version", "platform_family"
-
-  collect_data(:openbsd) do
-    platform shell_out("uname -s").stdout.strip.downcase
-    platform_version shell_out("uname -r").stdout.strip
-    platform_family "openbsd"
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Bryan McLellan (btm@loftninjas.org)
+# 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(:Platform) do
+  provides "platform", "platform_version", "platform_family"
+
+  collect_data(:openbsd) do
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
+    platform_family "openbsd"
+  end
+end

data/lib/ohai/plugins/openstack.rb

@@ -1,84 +1,84 @@
-# frozen_string_literal: true
-#
-# Author:: Matt Ray (<matt@chef.io>)
-# Author:: Tim Smith (<tsmith@chef.io>)
-# 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(:Openstack) do
-  require_relative "../mixin/ec2_metadata"
-  require_relative "../mixin/http_helper"
-  include Ohai::Mixin::Ec2Metadata
-  include Ohai::Mixin::HttpHelper
-
-  provides "openstack"
-  depends "virtualization"
-
-  # use virtualization data
-  def openstack_virtualization?
-    if get_attribute(:virtualization, :systems, :openstack)
-      logger.trace("Plugin Openstack: has_openstack_virtualization? == true")
-      true
-    end
-  end
-
-  # check for the ohai hint and log trace messaging
-  def openstack_hint?
-    if hint?("openstack")
-      logger.trace("Plugin Openstack: openstack hint present")
-      true
-    else
-      logger.trace("Plugin Openstack: openstack hint not present")
-      false
-    end
-  end
-
-  # dreamhost systems *had* the dhc-user on them < 2016. We should probably remove all this logic
-  # https://help.dreamhost.com/hc/en-us/articles/228377408-How-to-find-the-default-user-of-an-image
-  def openstack_provider
-    # dream host doesn't support windows so bail early if we're on windows
-    return "openstack" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
-
-    if Etc::Passwd.entries.map(&:name).include?("dhc-user")
-      "dreamhost"
-    else
-      "openstack"
-    end
-  end
-
-  collect_data do
-    require "etc" unless defined?(Etc)
-
-    # fetch data if we look like openstack
-    if openstack_hint? || openstack_virtualization?
-      openstack Mash.new
-      openstack[:provider] = openstack_provider
-
-      timeout = Ohai::Config.ohai[:openstack_metadata_timeout] || 2
-
-      # fetch the metadata if we can do a simple socket connect first
-      if can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, timeout)
-        fetch_metadata.each do |k, v|
-          openstack[k] = v unless v.empty?
-        end
-        logger.trace("Plugin Openstack: Successfully fetched Openstack metadata from the metadata endpoint")
-      else
-        logger.trace("Plugin Openstack: Timed out connecting to Openstack metadata endpoint. Skipping metadata.")
-      end
-    else
-      logger.trace("Plugin Openstack: Node does not appear to be an Openstack node")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Matt Ray (<matt@chef.io>)
+# Author:: Tim Smith (<tsmith@chef.io>)
+# 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(:Openstack) do
+  require_relative "../mixin/ec2_metadata"
+  require_relative "../mixin/http_helper"
+  include Ohai::Mixin::Ec2Metadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "openstack"
+  depends "virtualization"
+
+  # use virtualization data
+  def openstack_virtualization?
+    if get_attribute(:virtualization, :systems, :openstack)
+      logger.trace("Plugin Openstack: has_openstack_virtualization? == true")
+      true
+    end
+  end
+
+  # check for the ohai hint and log trace messaging
+  def openstack_hint?
+    if hint?("openstack")
+      logger.trace("Plugin Openstack: openstack hint present")
+      true
+    else
+      logger.trace("Plugin Openstack: openstack hint not present")
+      false
+    end
+  end
+
+  # dreamhost systems *had* the dhc-user on them < 2016. We should probably remove all this logic
+  # https://help.dreamhost.com/hc/en-us/articles/228377408-How-to-find-the-default-user-of-an-image
+  def openstack_provider
+    # dream host doesn't support windows so bail early if we're on windows
+    return "openstack" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
+
+    if Etc::Passwd.entries.map(&:name).include?("dhc-user")
+      "dreamhost"
+    else
+      "openstack"
+    end
+  end
+
+  collect_data do
+    require "etc" unless defined?(Etc)
+
+    # fetch data if we look like openstack
+    if openstack_hint? || openstack_virtualization?
+      openstack Mash.new
+      openstack[:provider] = openstack_provider
+
+      timeout = Ohai::Config.ohai[:openstack_metadata_timeout] || 2
+
+      # fetch the metadata if we can do a simple socket connect first
+      if can_socket_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR, 80, timeout)
+        fetch_metadata.each do |k, v|
+          openstack[k] = v unless v.empty?
+        end
+        logger.trace("Plugin Openstack: Successfully fetched Openstack metadata from the metadata endpoint")
+      else
+        logger.trace("Plugin Openstack: Timed out connecting to Openstack metadata endpoint. Skipping metadata.")
+      end
+    else
+      logger.trace("Plugin Openstack: Node does not appear to be an Openstack node")
+    end
+  end
+end

data/lib/ohai/plugins/os.rb

@@ -1,55 +1,55 @@
-# frozen_string_literal: true
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Isa Farnik (<isa@chef.io>)
-# Author:: Richard Manyanza (<liseki@nyikacraftsmen.com>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# Copyright:: Copyright (c) 2014 Richard Manyanza.
-# 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(:OS) do
-  require_relative "../mixin/os"
-  provides "os", "os_version"
-  depends "kernel"
-
-  collect_data(:aix) do
-    os collect_os
-    os_version shell_out("oslevel -s").stdout.strip
-  end
-
-  collect_data(:dragonflybsd, :freebsd) do
-    os collect_os
-
-    # This is __DragonFly_version / __FreeBSD_version. See sys/param.h or
-    # http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
-    os_version shell_out("sysctl -n kern.osreldate").stdout.strip
-  end
-
-  collect_data(:target) do
-    os collect_os
-    os_version "unknown"
-  end
-
-  collect_data(:api) do
-    os collect_os
-    os_version "unknown"
-  end
-
-  collect_data do
-    os collect_os
-    os_version kernel[:release]
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Isa Farnik (<isa@chef.io>)
+# Author:: Richard Manyanza (<liseki@nyikacraftsmen.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2014 Richard Manyanza.
+# 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(:OS) do
+  require_relative "../mixin/os"
+  provides "os", "os_version"
+  depends "kernel"
+
+  collect_data(:aix) do
+    os collect_os
+    os_version shell_out("oslevel -s").stdout.strip
+  end
+
+  collect_data(:dragonflybsd, :freebsd) do
+    os collect_os
+
+    # This is __DragonFly_version / __FreeBSD_version. See sys/param.h or
+    # http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
+    os_version shell_out("sysctl -n kern.osreldate").stdout.strip
+  end
+
+  collect_data(:target) do
+    os collect_os
+    os_version "unknown"
+  end
+
+  collect_data(:api) do
+    os collect_os
+    os_version "unknown"
+  end
+
+  collect_data do
+    os collect_os
+    os_version kernel[:release]
+  end
+end