ohai 16.2.1 → 16.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37943a2c27d2555576202a2ffdcb3ed104e0cd84d0e36c3dedb5ff7bfc1a5cd4
-  data.tar.gz: 50e8c6f17fc1560ab2c6a41c2e56adb1b800bf15ad64a1ce058334e3f491b0a3
+  metadata.gz: caa70e908138b3a05e5936f250179ad6eb43720978cc1c4296011df3d9da7478
+  data.tar.gz: 91020ca991c49f7e029604403bf4421be6f608fc5330bf787eae09b3dd6cb844
 SHA512:
-  metadata.gz: 7f5592b7e32c859831984be689ddbdfe19411a3efdbec7223c4f48e905b81c06a261286e150007091522f6f9eb2a231f83bd86e79231a4fed710ff76c0acdfa0
-  data.tar.gz: e516682f83325f096ebd89a12b197afb091fad3708cbd009e1936edc7597ed78e574786e4f306e53d1fb97626e0b92ffafbf78e79fac9d1f5d369baeb387a793
+  metadata.gz: e4204d5dadf0987967638c08e61124c5226810a07c83b200a4b7713c4736ce97f9bf229210fa19c06ab09d8aa4363b0389192598710d75d1b92ab055c473401d
+  data.tar.gz: 3f1620eb9f6fc44f2fc3f81e974be7d69762d7a783a010b30b415fd6365db4584daa57e42d985055551aeac94bf540986f6a6e5419b22a2ea4118fc1a0a0b03b

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

@@ -30,7 +30,7 @@ Ohai.plugin(:Uptime) do
     so = shell_out("LC_ALL=POSIX ps -o etime= -p 1").stdout.strip
 
     # Here we'll check our shell_out for a dash, which indicates there is a # of days involved
-    # We'll chunk off the days, hours (where applicable), minutes, seconds into seperate vars
+    # We'll chunk off the days, hours (where applicable), minutes, seconds into separate vars
     # We also need to do this because ps -o etime= will not display days if the machine has been up for less than 24 hours
     # If the machine has been up for less than one hour, the shell_out will not output hours hence our else
     # see here: https://www.ibm.com/support/knowledgecenter/en/ssw_aix_72/com.ibm.aix.cmds4/ps.htm#ps__row-d3e109655

data/lib/ohai/plugins/linux/mdadm.rb

@@ -105,7 +105,7 @@ Ohai.plugin(:Mdadm) do
           # gather detailed information on the array
           so = shell_out("mdadm --detail /dev/#{device}")
 
-          # if the mdadm command was sucessful pass so.stdout to create_raid_device_mash to grab the tidbits we want
+          # if the mdadm command was successful pass so.stdout to create_raid_device_mash to grab the tidbits we want
           mdadm[device] = create_raid_device_mash(so.stdout) if so.stdout
           mdadm[device]["members"] = devices[device]["active"]
           mdadm[device]["spares"] = devices[device]["spare"]

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

@@ -108,6 +108,8 @@ Ohai.plugin(:Network) do
           # http://rubular.com/r/pwTNp65VFf
           route_entry[k] = $1 if route_ending =~ /\b#{k}\s+([^\s]+)/
         end
+        # https://rubular.com/r/k1sMrRn5yLjgVi
+        route_entry["via"] = $1 if route_ending =~ /\bvia\s+inet6\s+([^\s]+)/
 
         # a sanity check, especially for Linux-VServer, OpenVZ and LXC:
         # don't report the route entry if the src address isn't set on the node

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

@@ -190,8 +190,11 @@ Ohai.plugin(:Virtualization) do
     # Kernel docs, https://www.kernel.org/doc/Documentation/cgroups
     if File.exist?("/proc/self/cgroup")
       cgroup_content = File.read("/proc/self/cgroup")
-      if cgroup_content =~ %r{^\d+:[^:]+:/(lxc|docker)/.+$} ||
-          cgroup_content =~ %r{^\d+:[^:]+:/[^/]+/(lxc|docker)-?.+$}
+      # These two REs catch many different examples. Here's a specific one
+      # from when it is docker and there is no subsystem name.
+      # https://rubular.com/r/dV13hiU9KxmiWB
+      if cgroup_content =~ %r{^\d+:[^:]*:/(lxc|docker)/.+$} ||
+          cgroup_content =~ %r{^\d+:[^:]*:/[^/]+/(lxc|docker)-?.+$}
         logger.trace("Plugin Virtualization: /proc/self/cgroup indicates #{$1} container. Detecting as #{$1} guest")
         virtualization[:system] = $1
         virtualization[:role] = "guest"

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "16.2.1".freeze
+  VERSION = "16.2.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.2.1
+  version: 16.2.3
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu