ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/docker.rb

@@ -1,58 +1,58 @@
-# frozen_string_literal: true
-#
-# 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(:Docker) do
-  provides "docker"
-  depends "virtualization"
-
-  def docker_info_json
-    so = shell_out("docker info --format '{{json .}}'")
-    if so.exitstatus == 0
-      JSON.parse(so.stdout)
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Docker: Could not shell_out "docker info --format \'{{json .}}\'". Skipping plugin')
-  end
-
-  def docker_ohai_data(shellout_data)
-    docker Mash.new
-    docker[:version_string] = shellout_data["ServerVersion"]
-    docker[:version] = shellout_data["ServerVersion"].split("-")[0] if shellout_data["ServerVersion"] # guard this so missing data doesn't fail the run
-    docker[:runtimes] = shellout_data["Runtimes"]
-    docker[:root_dir] = shellout_data["DockerRootDir"]
-    docker[:containers] = {}
-    docker[:containers][:total] = shellout_data["Containers"]
-    docker[:containers][:running] = shellout_data["ContainersRunning"]
-    docker[:containers][:paused] = shellout_data["ContainersPaused"]
-    docker[:containers][:stopped] = shellout_data["ContainersStopped"]
-    docker[:plugins] = shellout_data["Plugins"]
-    docker[:networking] = {}
-    docker[:networking][:ipv4_forwarding] = shellout_data["IPv4Forwarding"]
-    docker[:networking][:bridge_nf_iptables] = shellout_data["BridgeNfIptables"]
-    docker[:networking][:bridge_nf_ipv6_iptables] = shellout_data["BridgeNfIp6tables"]
-    docker[:swarm] = shellout_data["Swarm"]
-  end
-
-  collect_data(:linux, :windows, :darwin) do
-    require "json" unless defined?(JSON)
-
-    if virtualization[:systems][:docker]
-      docker_ohai_data(docker_info_json)
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# 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(:Docker) do
+  provides "docker"
+  depends "virtualization"
+
+  def docker_info_json
+    so = shell_out("docker info --format '{{json .}}'")
+    if so.exitstatus == 0
+      JSON.parse(so.stdout)
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Docker: Could not shell_out "docker info --format \'{{json .}}\'". Skipping plugin')
+  end
+
+  def docker_ohai_data(shellout_data)
+    docker Mash.new
+    docker[:version_string] = shellout_data["ServerVersion"]
+    docker[:version] = shellout_data["ServerVersion"].split("-")[0] if shellout_data["ServerVersion"] # guard this so missing data doesn't fail the run
+    docker[:runtimes] = shellout_data["Runtimes"]
+    docker[:root_dir] = shellout_data["DockerRootDir"]
+    docker[:containers] = {}
+    docker[:containers][:total] = shellout_data["Containers"]
+    docker[:containers][:running] = shellout_data["ContainersRunning"]
+    docker[:containers][:paused] = shellout_data["ContainersPaused"]
+    docker[:containers][:stopped] = shellout_data["ContainersStopped"]
+    docker[:plugins] = shellout_data["Plugins"]
+    docker[:networking] = {}
+    docker[:networking][:ipv4_forwarding] = shellout_data["IPv4Forwarding"]
+    docker[:networking][:bridge_nf_iptables] = shellout_data["BridgeNfIptables"]
+    docker[:networking][:bridge_nf_ipv6_iptables] = shellout_data["BridgeNfIp6tables"]
+    docker[:swarm] = shellout_data["Swarm"]
+  end
+
+  collect_data(:linux, :windows, :darwin) do
+    require "json" unless defined?(JSON)
+
+    if virtualization[:systems][:docker]
+      docker_ohai_data(docker_info_json)
+    end
+  end
+end

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

@@ -1,60 +1,60 @@
-# 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(:Memory) do
-  provides "memory", "memory/swap"
-
-  collect_data(:dragonflybsd) do
-    memory Mash.new
-    memory[:swap] = Mash.new
-
-    # /usr/src/sys/sys/vmmeter.h
-    so = shell_out("sysctl -n vm.stats.vm.v_page_size")
-    memory[:page_size] = so.stdout.strip
-    so = shell_out("sysctl -n vm.stats.vm.v_page_count")
-    memory[:page_count] = so.stdout.strip
-    memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
-    so = shell_out("sysctl -n vm.stats.vm.v_free_count")
-    memory[:free] = memory[:page_size].to_i * so.stdout.strip.to_i
-    so = shell_out("sysctl -n vm.status.vm.v_active_count")
-    memory[:active] = memory[:page_size].to_i * so.stdout.strip.to_i
-    so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
-    memory[:inactive] = memory[:page_size].to_i * so.stdout.strip.to_i
-    so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
-    memory[:cache] = memory[:page_size].to_i * so.stdout.strip.to_i
-    so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
-    memory[:wired] = memory[:page_size].to_i * so.stdout.strip.to_i
-    so = shell_out("sysctl -n vfs.bufspace")
-    memory[:buffers] = so.stdout.strip
-
-    so = shell_out("swapinfo")
-    so.stdout.lines do |line|
-      # Device          1K-blocks     Used    Avail Capacity
-      # /dev/ad0s1b        253648        0   253648     0%
-      if line =~ %r{^([\d\w/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)}
-        mdev = $1
-        memory[:swap][mdev] = Mash.new
-        memory[:swap][mdev][:total] = $2
-        memory[:swap][mdev][:used] = $3
-        memory[:swap][mdev][:free] = $4
-        memory[:swap][mdev][:percent_free] = $5
-      end
-    end
-  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(:Memory) do
+  provides "memory", "memory/swap"
+
+  collect_data(:dragonflybsd) do
+    memory Mash.new
+    memory[:swap] = Mash.new
+
+    # /usr/src/sys/sys/vmmeter.h
+    so = shell_out("sysctl -n vm.stats.vm.v_page_size")
+    memory[:page_size] = so.stdout.strip
+    so = shell_out("sysctl -n vm.stats.vm.v_page_count")
+    memory[:page_count] = so.stdout.strip
+    memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_free_count")
+    memory[:free] = memory[:page_size].to_i * so.stdout.strip.to_i
+    so = shell_out("sysctl -n vm.status.vm.v_active_count")
+    memory[:active] = memory[:page_size].to_i * so.stdout.strip.to_i
+    so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.strip.to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
+    memory[:cache] = memory[:page_size].to_i * so.stdout.strip.to_i
+    so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
+    memory[:wired] = memory[:page_size].to_i * so.stdout.strip.to_i
+    so = shell_out("sysctl -n vfs.bufspace")
+    memory[:buffers] = so.stdout.strip
+
+    so = shell_out("swapinfo")
+    so.stdout.lines do |line|
+      # Device          1K-blocks     Used    Avail Capacity
+      # /dev/ad0s1b        253648        0   253648     0%
+      if line =~ %r{^([\d\w/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)}
+        mdev = $1
+        memory[:swap][mdev] = Mash.new
+        memory[:swap][mdev][:total] = $2
+        memory[:swap][mdev][:used] = $3
+        memory[:swap][mdev][:free] = $4
+        memory[:swap][mdev][:percent_free] = $5
+      end
+    end
+  end
+end

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

@@ -1,128 +1,128 @@
-# 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(:dragonflybsd) do
-    network Mash.new unless network
-    network[:interfaces] ||= Mash.new
-    counters Mash.new unless counters
-    counters[:network] ||= Mash.new
-
-    so = shell_out("route -n get default")
-    so.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
-    so = shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a")
-    cint = nil
-    so.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+ether (.+?)\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
-
-    so = shell_out("arp -an")
-    so.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).
-    so = shell_out("netstat -ibdn")
-    so.stdout.lines do |line|
-      # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
-      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
-      # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
-      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\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]["rx"]["bytes"] = $5
-        net_counters[$1]["tx"]["packets"] = $6
-        net_counters[$1]["tx"]["errors"] = $7
-        net_counters[$1]["tx"]["bytes"] = $8
-        net_counters[$1]["tx"]["collisions"] = $9
-        net_counters[$1]["tx"]["dropped"] = $10
-      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(:dragonflybsd) do
+    network Mash.new unless network
+    network[:interfaces] ||= Mash.new
+    counters Mash.new unless counters
+    counters[:network] ||= Mash.new
+
+    so = shell_out("route -n get default")
+    so.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
+    so = shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a")
+    cint = nil
+    so.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+ether (.+?)\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
+
+    so = shell_out("arp -an")
+    so.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).
+    so = shell_out("netstat -ibdn")
+    so.stdout.lines do |line|
+      # Name    Mtu Network       Address              Ipkts Ierrs     Ibytes    Opkts Oerrs     Obytes  Coll Drop
+      # ed0    1500 <Link#1>      54:52:00:68:92:85   333604    26  151905886   175472     0   24897542     0  905
+      # $1                        $2                      $3    $4         $5       $6    $7         $8    $9  $10
+      if line =~ /^([\w\.\*]+)\s+\d+\s+<Link#\d+>\s+([\w:]*)\s*(\d+)\s+(\d+)\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]["rx"]["bytes"] = $5
+        net_counters[$1]["tx"]["packets"] = $6
+        net_counters[$1]["tx"]["errors"] = $7
+        net_counters[$1]["tx"]["bytes"] = $8
+        net_counters[$1]["tx"]["collisions"] = $9
+        net_counters[$1]["tx"]["dropped"] = $10
+      end
+    end
+
+    counters[:network][:interfaces] = net_counters
+  end
+end

data/lib/ohai/plugins/dragonflybsd/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(:dragonflybsd) do
-    platform shell_out("uname -s").stdout.strip.downcase
-    platform_version shell_out("uname -r").stdout.strip
-    platform_family "dragonflybsd"
-  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(:dragonflybsd) do
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
+    platform_family "dragonflybsd"
+  end
+end