ohai 18.0.26 → 18.1.0

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

@@ -1,84 +1,84 @@
-# frozen_string_literal: true
-#
-# Author:: Davide Cavalca <dcavalca@fb.com>
-# Copyright:: Copyright (c) 2020 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(:Interrupts) do
-  depends "cpu"
-  provides "interrupts", "interrupts/irq", "interrupts/smp_affinity_by_cpu"
-  optional true
-
-  # Documentation: https://www.kernel.org/doc/Documentation/IRQ-affinity.txt
-  # format: comma-separate list of 32bit bitmask in hex
-  # each bit is a CPU, right to left ordering (i.e. CPU0 is rightmost)
-  def parse_smp_affinity(path, cpus)
-    masks = file_read(path).strip
-    bit_masks = []
-    masks.split(",").each do |mask|
-      bit_masks << mask.rjust(8, "0").to_i(16).to_s(2)
-    end
-    affinity_mask = bit_masks.join
-    affinity_by_cpu = affinity_mask.split("").reverse
-    smp_affinity_by_cpu = Mash.new
-    (0..cpus - 1).each do |cpu|
-      smp_affinity_by_cpu[cpu] = affinity_by_cpu[cpu].to_i == 1
-    end
-    smp_affinity_by_cpu
-  end
-
-  collect_data(:linux) do
-    interrupts Mash.new
-
-    cpus = cpu["total"]
-    interrupts[:smp_affinity_by_cpu] =
-      parse_smp_affinity("/proc/irq/default_smp_affinity", cpus)
-
-    interrupts[:irq] = Mash.new
-    file_open("/proc/interrupts").each do |line|
-      # Documentation: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
-      # format is "{irqn}: {CPUn...} [type] [vector] [device]"
-      irqn, fields = line.split(":", 2)
-      # skip the header
-      next if fields.nil?
-
-      irqn.strip!
-      Ohai::Log.debug("irq: processing #{irqn}")
-
-      interrupts[:irq][irqn] = Mash.new
-      interrupts[:irq][irqn][:events_by_cpu] = Mash.new
-
-      fields = fields.split(nil, cpus + 1)
-      (0..cpus - 1).each do |cpu|
-        interrupts[:irq][irqn][:events_by_cpu][cpu] = fields[cpu].to_i
-      end
-      # Only regular IRQs have extra fields and affinity settings
-      if /^\d+$/.match?(irqn)
-        interrupts[:irq][irqn][:type],
-        interrupts[:irq][irqn][:vector],
-        interrupts[:irq][irqn][:device] =
-          fields[cpus].split
-        if file_exist?("/proc/irq/#{irqn}/smp_affinity")
-          interrupts[:irq][irqn][:smp_affinity_by_cpu] =
-            parse_smp_affinity("/proc/irq/#{irqn}/smp_affinity", cpus)
-        end
-      # ERR and MIS do not have any extra fields
-      elsif fields[cpus]
-        interrupts[:irq][irqn][:type] = fields[cpus].strip
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2020 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(:Interrupts) do
+  depends "cpu"
+  provides "interrupts", "interrupts/irq", "interrupts/smp_affinity_by_cpu"
+  optional true
+
+  # Documentation: https://www.kernel.org/doc/Documentation/IRQ-affinity.txt
+  # format: comma-separate list of 32bit bitmask in hex
+  # each bit is a CPU, right to left ordering (i.e. CPU0 is rightmost)
+  def parse_smp_affinity(path, cpus)
+    masks = file_read(path).strip
+    bit_masks = []
+    masks.split(",").each do |mask|
+      bit_masks << mask.rjust(8, "0").to_i(16).to_s(2)
+    end
+    affinity_mask = bit_masks.join
+    affinity_by_cpu = affinity_mask.split("").reverse
+    smp_affinity_by_cpu = Mash.new
+    (0..cpus - 1).each do |cpu|
+      smp_affinity_by_cpu[cpu] = affinity_by_cpu[cpu].to_i == 1
+    end
+    smp_affinity_by_cpu
+  end
+
+  collect_data(:linux) do
+    interrupts Mash.new
+
+    cpus = cpu["total"]
+    interrupts[:smp_affinity_by_cpu] =
+      parse_smp_affinity("/proc/irq/default_smp_affinity", cpus)
+
+    interrupts[:irq] = Mash.new
+    file_open("/proc/interrupts").each do |line|
+      # Documentation: https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+      # format is "{irqn}: {CPUn...} [type] [vector] [device]"
+      irqn, fields = line.split(":", 2)
+      # skip the header
+      next if fields.nil?
+
+      irqn.strip!
+      Ohai::Log.debug("irq: processing #{irqn}")
+
+      interrupts[:irq][irqn] = Mash.new
+      interrupts[:irq][irqn][:events_by_cpu] = Mash.new
+
+      fields = fields.split(nil, cpus + 1)
+      (0..cpus - 1).each do |cpu|
+        interrupts[:irq][irqn][:events_by_cpu][cpu] = fields[cpu].to_i
+      end
+      # Only regular IRQs have extra fields and affinity settings
+      if /^\d+$/.match?(irqn)
+        interrupts[:irq][irqn][:type],
+        interrupts[:irq][irqn][:vector],
+        interrupts[:irq][irqn][:device] =
+          fields[cpus].split
+        if file_exist?("/proc/irq/#{irqn}/smp_affinity")
+          interrupts[:irq][irqn][:smp_affinity_by_cpu] =
+            parse_smp_affinity("/proc/irq/#{irqn}/smp_affinity", cpus)
+        end
+      # ERR and MIS do not have any extra fields
+      elsif fields[cpus]
+        interrupts[:irq][irqn][:type] = fields[cpus].strip
+      end
+    end
+  end
+end

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

@@ -1,52 +1,52 @@
-# frozen_string_literal: true
-#
-# Author:: Jay Vana <jsvana@fb.com>
-# Author:: Davide Cavalca <dcavalca@fb.com>
-# Copyright:: Copyright (c) 2016-2020 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(:IPC) do
-  provides "ipc"
-  optional true
-
-  collect_data(:linux) do
-    ipcs_path = which("ipcs")
-    if ipcs_path
-      # NOTE: currently only supports shared memory
-      cmd = "#{ipcs_path} -m"
-      ipcs = shell_out(cmd)
-
-      ipc Mash.new unless ipc
-      ipc["shm"] = Mash.new unless ipc["shm"]
-
-      ipcs.stdout.split("\n").each do |line|
-        next unless line.start_with?("0x")
-
-        parts = line.split
-        segment = {
-          "key" => parts[0],
-          "owner" => parts[2],
-          "perms" => parts[3],
-          "bytes" => parts[4].to_i,
-          "nattch" => parts[5].to_i,
-          "status" => parts[6] || "",
-        }
-
-        ipc["shm"][parts[1].to_i] = segment
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Jay Vana <jsvana@fb.com>
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016-2020 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(:IPC) do
+  provides "ipc"
+  optional true
+
+  collect_data(:linux) do
+    ipcs_path = which("ipcs")
+    if ipcs_path
+      # NOTE: currently only supports shared memory
+      cmd = "#{ipcs_path} -m"
+      ipcs = shell_out(cmd)
+
+      ipc Mash.new unless ipc
+      ipc["shm"] = Mash.new unless ipc["shm"]
+
+      ipcs.stdout.split("\n").each do |line|
+        next unless line.start_with?("0x")
+
+        parts = line.split
+        segment = {
+          "key" => parts[0],
+          "owner" => parts[2],
+          "perms" => parts[3],
+          "bytes" => parts[4].to_i,
+          "nattch" => parts[5].to_i,
+          "status" => parts[6] || "",
+        }
+
+        ipc["shm"][parts[1].to_i] = segment
+      end
+    end
+  end
+end

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

@@ -1,38 +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
+# 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/lsb.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-#
-# Author:: Adam Jacob (<adam@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(:LSB) do
-  provides "lsb"
-
-  collect_data(:linux) do
-    lsb Mash.new
-
-    if file_exist?("/usr/bin/lsb_release")
-      # From package redhat-lsb on Fedora/Redhat, lsb-release on Debian/Ubuntu
-      shell_out("lsb_release -a").stdout.lines do |line|
-        case line
-        when /^Distributor ID:\s+(.+)/
-          lsb[:id] = $1
-        when /^Description:\s+(.+)/
-          lsb[:description] = $1
-        when /^Release:\s+(.+)/
-          lsb[:release] = $1
-        when /^Codename:\s+(.+)/
-          lsb[:codename] = $1
-        else
-          lsb[:id] = line
-        end
-      end
-    else
-      logger.trace("Plugin LSB: Skipping LSB, cannot find /usr/bin/lsb_release")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Adam Jacob (<adam@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(:LSB) do
+  provides "lsb"
+
+  collect_data(:linux) do
+    lsb Mash.new
+
+    if file_exist?("/usr/bin/lsb_release")
+      # From package redhat-lsb on Fedora/Redhat, lsb-release on Debian/Ubuntu
+      shell_out("lsb_release -a").stdout.lines do |line|
+        case line
+        when /^Distributor ID:\s+(.+)/
+          lsb[:id] = $1
+        when /^Description:\s+(.+)/
+          lsb[:description] = $1
+        when /^Release:\s+(.+)/
+          lsb[:release] = $1
+        when /^Codename:\s+(.+)/
+          lsb[:codename] = $1
+        else
+          lsb[:id] = line
+        end
+      end
+    else
+      logger.trace("Plugin LSB: Skipping LSB, cannot find /usr/bin/lsb_release")
+    end
+  end
+end

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

@@ -1,76 +1,76 @@
-# frozen_string_literal: true
-#
-# Author:: Joerg Herzinger <joerg.herzinger@oiml.at>
-# Author:: Phil Dibowitz <phil@ipom.com>
-# Copyright:: Copyright (c) 2011 GLOBAL 2000/Friends of the Earth Austria
-# Copyright:: Copyright (c) 2017 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(:Lspci) do
-  provides "pci"
-  optional true
-
-  collect_data(:linux) do
-    devices = Mash.new
-
-    h = /[0-9a-fA-F]/ # any hex digit
-    hh = /#{h}#{h}/ # any 2 hex digits
-    hhhh = /#{h}#{h}#{h}#{h}/ # any 4 hex digits
-
-    d_id = "" # This identifies our pci devices
-
-    def standard_form(devices, d_id, hhhh, tag, line)
-      tmp = line.scan(/(.*)\s\[(#{hhhh})\]/)[0]
-      devices[d_id]["#{tag}_name"] = tmp[0]
-      devices[d_id]["#{tag}_id"] = tmp[1]
-    end
-
-    def standard_array(devices, d_id, tag, line)
-      if !devices[d_id][tag].is_a?(Array)
-        devices[d_id][tag] = [line]
-      else
-        devices[d_id][tag].push(line)
-      end
-    end
-
-    shell_out("lspci -vnnmk").stdout.split("\n").each do |line|
-      dev = line.scan(/^(.*):\s(.*)$/)[0]
-      next if dev.nil?
-
-      case dev[0]
-      when "Device" # There are two different Device tags
-        if ( tmp = dev[1].match(/(#{hh}:#{hh}.#{h})/) )
-          # We have a device id
-          d_id = tmp[0] # From now on we will need this id
-          devices[d_id] = Mash.new
-        else
-          standard_form(devices, d_id, hhhh, "device", dev[1])
-        end
-      when "Class"
-        standard_form(devices, d_id, hhhh, "class", dev[1])
-      when "Vendor"
-        standard_form(devices, d_id, hhhh, "vendor", dev[1])
-      when "Driver"
-        standard_array(devices, d_id, "driver", dev[1])
-      when "Module"
-        standard_array(devices, d_id, "module", dev[1])
-      when "SDevice"
-        standard_form(devices, d_id, hhhh, "sdevice", dev[1])
-      end
-    end
-
-    pci devices
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Joerg Herzinger <joerg.herzinger@oiml.at>
+# Author:: Phil Dibowitz <phil@ipom.com>
+# Copyright:: Copyright (c) 2011 GLOBAL 2000/Friends of the Earth Austria
+# Copyright:: Copyright (c) 2017 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(:Lspci) do
+  provides "pci"
+  optional true
+
+  collect_data(:linux) do
+    devices = Mash.new
+
+    h = /[0-9a-fA-F]/ # any hex digit
+    hh = /#{h}#{h}/ # any 2 hex digits
+    hhhh = /#{h}#{h}#{h}#{h}/ # any 4 hex digits
+
+    d_id = "" # This identifies our pci devices
+
+    def standard_form(devices, d_id, hhhh, tag, line)
+      tmp = line.scan(/(.*)\s\[(#{hhhh})\]/)[0]
+      devices[d_id]["#{tag}_name"] = tmp[0]
+      devices[d_id]["#{tag}_id"] = tmp[1]
+    end
+
+    def standard_array(devices, d_id, tag, line)
+      if !devices[d_id][tag].is_a?(Array)
+        devices[d_id][tag] = [line]
+      else
+        devices[d_id][tag].push(line)
+      end
+    end
+
+    shell_out("lspci -vnnmk").stdout.split("\n").each do |line|
+      dev = line.scan(/^(.*):\s(.*)$/)[0]
+      next if dev.nil?
+
+      case dev[0]
+      when "Device" # There are two different Device tags
+        if ( tmp = dev[1].match(/(#{hh}:#{hh}.#{h})/) )
+          # We have a device id
+          d_id = tmp[0] # From now on we will need this id
+          devices[d_id] = Mash.new
+        else
+          standard_form(devices, d_id, hhhh, "device", dev[1])
+        end
+      when "Class"
+        standard_form(devices, d_id, hhhh, "class", dev[1])
+      when "Vendor"
+        standard_form(devices, d_id, hhhh, "vendor", dev[1])
+      when "Driver"
+        standard_array(devices, d_id, "driver", dev[1])
+      when "Module"
+        standard_array(devices, d_id, "module", dev[1])
+      when "SDevice"
+        standard_form(devices, d_id, hhhh, "sdevice", dev[1])
+      end
+    end
+
+    pci devices
+  end
+end