ohai 17.0.42 → 17.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdfc3193f6099ddf2aadfd2469885459a9b386748db334fe88d817d7d0fa8ebf
-  data.tar.gz: ee7268731025ab543f38c3194e90d64dc50cde57e92b6e074b035faa46311a16
+  metadata.gz: 98c016d2839114bfe15deee549cf97ba8ff627ab2931207a105a42a154746cc7
+  data.tar.gz: '06687f5ca824b9489e3140b19415ae8c99e1afefc053d9c4519b4d7af9d85cf8'
 SHA512:
-  metadata.gz: 0322e5ef42f16d73bad92f76d24abd28ebd0ca7cd86a9cd1f1333f345b6b49725ea7dcea5d9760ad11f9e21489e675c0d048f18aa0becd2e1c8c5b67c18e7bed
-  data.tar.gz: cb923703f4e7fa79533e1723366bd762f047f79c1c9abc57d12103c51eaef543c5770425de831d15e2ac00944d04757bdff55b090ade4f6fbb555540bb4e49e6
+  metadata.gz: 7a8b2890b42b09e33d01a67ff589f587029d052a7a55a2ba09d1f2dd482afce275201e06cf968492f0645b8273f9b69890c7f082af878883ee66bc615828a96a
+  data.tar.gz: 3de0474524e3e9825e74f645630fc9e721f2ddbecd2a16bb337a21a02fa25d25cab469a5a810e8e2461ed137aab78f03abde064887993f64c784399b0ab8bdd9

data/Gemfile

@@ -3,20 +3,20 @@ source "https://rubygems.org"
 
 gemspec
 
-# pull these gems from master of chef/chef so that we're testing against what we will release
-gem "chef-config", git: "https://github.com/chef/chef", branch: "master", glob: "chef-config/chef-config.gemspec"
-gem "chef-utils", git: "https://github.com/chef/chef", branch: "master", glob: "chef-utils/chef-utils.gemspec"
+# pull these gems from main of chef/chef so that we're testing against what we will release
+gem "chef-config", git: "https://github.com/chef/chef", branch: "main", glob: "chef-config/chef-config.gemspec"
+gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "chef-utils/chef-utils.gemspec"
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle", "2.1.0"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.10.2"
+  gem "rubocop-performance", "1.11.5"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/config.rb

@@ -26,7 +26,7 @@ module Ohai
   Config = ChefConfig::Config
 
   # Reopens ChefConfig::Config to add Ohai configuration settings.
-  # see: https://github.com/chef/chef/blob/master/lib/chef/config.rb
+  # see: https://github.com/chef/chef/blob/main/lib/chef/config.rb
   class Config
     config_context :ohai do
       default :disabled_plugins, []

data/lib/ohai/mixin/ec2_metadata.rb

@@ -41,10 +41,32 @@ module Ohai
     module Ec2Metadata
 
       EC2_METADATA_ADDR ||= "169.254.169.254"
-      EC2_SUPPORTED_VERSIONS ||= %w{ 1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15
-                                     2008-02-01 2008-09-01 2009-04-04 2011-01-01 2011-05-01 2012-01-12
-                                     2014-02-25 2014-11-05 2015-10-20 2016-04-19 2016-06-30 2016-09-02
-                                     2016-11-30 2018-08-17 2018-11-29 2019-10-01 2020-08-24 2020-11-01 }.freeze
+      EC2_SUPPORTED_VERSIONS ||= %w{ 1.0
+                                     2007-01-19
+                                     2007-03-01
+                                     2007-08-29
+                                     2007-10-10
+                                     2007-12-15
+                                     2008-02-01
+                                     2008-09-01
+                                     2009-04-04
+                                     2011-01-01
+                                     2011-05-01
+                                     2012-01-12
+                                     2014-02-25
+                                     2014-11-05
+                                     2015-10-20
+                                     2016-04-19
+                                     2016-06-30
+                                     2016-09-02
+                                     2018-03-28
+                                     2018-08-17
+                                     2018-09-24
+                                     2019-10-01
+                                     2020-10-27
+                                     2021-01-03
+                                     2021-03-23
+                                     2021-07-15 }.freeze
       EC2_ARRAY_VALUES ||= %w{security-groups local_ipv4s}.freeze
       EC2_ARRAY_DIR    ||= %w{network/interfaces/macs}.freeze
       EC2_JSON_DIR     ||= %w{iam}.freeze

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+#
+# Author:: Song Liu <song@kernel.org>
+# Copyright:: Copyright (c) 2021 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Livepatch) do
+  provides "livepatch"
+
+  collect_data(:linux) do
+    if file_exist?("/sys/kernel/livepatch")
+      patches = Mash.new
+      dir_glob("/sys/kernel/livepatch/*").each do |livepatch_dir|
+        dir = File.basename(livepatch_dir)
+        patches[dir] = Mash.new
+        %w{enabled transition}.each do |check|
+          if file_exist?("/sys/kernel/livepatch/#{dir}/#{check}")
+            file_open("/sys/kernel/livepatch/#{dir}/#{check}") { |f| patches[dir][check] = f.read_nonblock(1024).strip }
+          end
+        end
+        livepatch patches
+      end
+    end
+  end
+end

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

@@ -80,7 +80,7 @@ Ohai.plugin(:Network) do
       line.strip!
       logger.trace("Plugin Network: Parsing #{line}")
       if /\\/.match?(line)
-        parts = line.split('\\')
+        parts = line.split("\\")
         route_dest = parts.shift.strip
         route_endings = parts
       elsif line =~ /^([^\s]+)\s(.*)$/

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

@@ -137,7 +137,7 @@ Ohai.plugin(:Platform) do
     when /ubuntu/, /debian/, /linuxmint/, /raspbian/, /cumulus/, /kali/, /pop/
       # apt-get+dpkg almost certainly goes here
       "debian"
-    when /centos/, /redhat/, /oracle/, /almalinux/, /scientific/, /enterpriseenterprise/, /xenserver/, /xcp-ng/, /cloudlinux/, /alibabalinux/, /sangoma/, /clearos/, /parallels/, /ibm_powerkvm/, /nexus_centos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
+    when /centos/, /redhat/, /oracle/, /almalinux/, /rocky/, /scientific/, /enterpriseenterprise/, /xenserver/, /xcp-ng/, /cloudlinux/, /alibabalinux/, /sangoma/, /clearos/, /parallels/, /ibm_powerkvm/, /nexus_centos/, /bigip/, /virtuozzo/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
       # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version.
       # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility
       # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly.  Some variation like the

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

@@ -0,0 +1,61 @@
+#
+# Author:: Matthew Massey <matthewmassey@fb.com>
+# Copyright:: Copyright (c) 2021 Facebook
+# 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(:Tc) do
+  provides "tc"
+  optional true
+
+  collect_data(:linux) do
+    tc_path = which("tc")
+    if tc_path
+      cmd = "#{tc_path} qdisc show"
+      tc_output = shell_out(cmd)
+
+      tc_data = Mash.new
+      tc_data[:qdisc] = Mash.new
+
+      tc_output.stdout.split("\n").each do |line|
+        line = line.strip
+        if /dev (\w+)/ =~ line
+          dev = $1
+          tc_data[:qdisc][dev] ||= Mash.new
+        else
+          next
+        end
+        if /qdisc (\w+)/ =~ line
+          qdisc = $1
+          tc_data[:qdisc][dev][:qdiscs] ||= []
+          tc_data[:qdisc][dev][:qdiscs] << Mash.new
+          qdisc_idx = tc_data[:qdisc][dev][:qdiscs].length - 1
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx] ||= Mash.new
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:type] = qdisc
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:parms] ||= Mash.new
+        else
+          next
+        end
+        if qdisc == "fq" && /buckets (\d+)/ =~ line
+          buckets = $1.to_i
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:parms][:buckets] = buckets
+        end
+      end
+      tc tc_data
+    else
+      logger.trace("Plugin Tc: Could not find tc. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "17.0.42"
+  VERSION = "17.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.0.42
+  version: 17.6.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -302,6 +302,7 @@ files:
 - lib/ohai/plugins/linux/hostnamectl.rb
 - lib/ohai/plugins/linux/interrupts.rb
 - lib/ohai/plugins/linux/ipc.rb
+- lib/ohai/plugins/linux/livepatch.rb
 - lib/ohai/plugins/linux/lsb.rb
 - lib/ohai/plugins/linux/lspci.rb
 - lib/ohai/plugins/linux/machineid.rb
@@ -314,6 +315,7 @@ files:
 - lib/ohai/plugins/linux/sessions.rb
 - lib/ohai/plugins/linux/sysctl.rb
 - lib/ohai/plugins/linux/systemd_paths.rb
+- lib/ohai/plugins/linux/tc.rb
 - lib/ohai/plugins/linux/virtualization.rb
 - lib/ohai/plugins/lua.rb
 - lib/ohai/plugins/mono.rb