ohai 17.5.2 → 17.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afaf1b3332e2a31c5d045ea50e9315bd9fcf64fcd21e120982974c5b9d167d76
-  data.tar.gz: ed90edfe09e2bf83fea9018b7f16d3fd16caf28aa998e75e44c9980789df6d30
+  metadata.gz: 98c016d2839114bfe15deee549cf97ba8ff627ab2931207a105a42a154746cc7
+  data.tar.gz: '06687f5ca824b9489e3140b19415ae8c99e1afefc053d9c4519b4d7af9d85cf8'
 SHA512:
-  metadata.gz: e4693d375412563df16856fe88ccdfd83ba5279a9b33fb3856ea9a7299bc599c943d7360d7135d28a59543420456a250300ad416a5e93bb7b09f7041750c336c
-  data.tar.gz: ee963b18a46ea9b8a2d3292be0f82a2aaa7ef90cb629a71eb1fe51a661b5ded47d8da4c9b44f35614d169b6e0922dba3aa5e966ceab7055dcef8e57b50fc7afa
+  metadata.gz: 7a8b2890b42b09e33d01a67ff589f587029d052a7a55a2ba09d1f2dd482afce275201e06cf968492f0645b8273f9b69890c7f082af878883ee66bc615828a96a
+  data.tar.gz: 3de0474524e3e9825e74f645630fc9e721f2ddbecd2a16bb337a21a02fa25d25cab469a5a810e8e2461ed137aab78f03abde064887993f64c784399b0ab8bdd9

data/Gemfile

@@ -9,7 +9,7 @@ gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "ch
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.0.9"
+  gem "chefstyle", "2.1.0"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"

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.5.2"
+  VERSION = "17.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.5.2
+  version: 17.6.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -315,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