ohai 18.0.26 → 18.1.0

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

@@ -1,69 +1,69 @@
-# 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(:Selinux) do
-  provides "selinux/status", "selinux/policy_booleans", "selinux/process_contexts", "selinux/file_contexts"
-  optional true
-
-  collect_data(:linux) do
-    sestatus_path = which("sestatus")
-    if sestatus_path
-      sestatus = shell_out("#{sestatus_path} -v -b")
-
-      selinux Mash.new unless selinux
-      selinux[:status] ||= Mash.new
-      selinux[:policy_booleans] ||= Mash.new
-      selinux[:process_contexts] ||= Mash.new
-      selinux[:file_contexts] ||= Mash.new
-      section = nil
-
-      sestatus.stdout.split("\n").each do |line|
-        line.chomp!
-
-        case line
-        when "Policy booleans:"
-          section = :policy_booleans
-          next
-        when "Process contexts:"
-          section = :process_contexts
-          next
-        when "File contexts:"
-          section = :file_contexts
-          next
-        else
-          if section.nil?
-            section = :status
-          end
-        end
-
-        key, val = line.split(/:?\s\s+/, 2)
-        next if key.nil?
-
-        unless key.start_with?("/")
-          key.downcase!
-          key.tr!(" ", "_")
-        end
-
-        selinux[section][key] = val
-      end
-    else
-      logger.debug("Plugin Selinux: Could not find sestatus. Skipping plugin.")
-    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(:Selinux) do
+  provides "selinux/status", "selinux/policy_booleans", "selinux/process_contexts", "selinux/file_contexts"
+  optional true
+
+  collect_data(:linux) do
+    sestatus_path = which("sestatus")
+    if sestatus_path
+      sestatus = shell_out("#{sestatus_path} -v -b")
+
+      selinux Mash.new unless selinux
+      selinux[:status] ||= Mash.new
+      selinux[:policy_booleans] ||= Mash.new
+      selinux[:process_contexts] ||= Mash.new
+      selinux[:file_contexts] ||= Mash.new
+      section = nil
+
+      sestatus.stdout.split("\n").each do |line|
+        line.chomp!
+
+        case line
+        when "Policy booleans:"
+          section = :policy_booleans
+          next
+        when "Process contexts:"
+          section = :process_contexts
+          next
+        when "File contexts:"
+          section = :file_contexts
+          next
+        else
+          if section.nil?
+            section = :status
+          end
+        end
+
+        key, val = line.split(/:?\s\s+/, 2)
+        next if key.nil?
+
+        unless key.start_with?("/")
+          key.downcase!
+          key.tr!(" ", "_")
+        end
+
+        selinux[section][key] = val
+      end
+    else
+      logger.debug("Plugin Selinux: Could not find sestatus. Skipping plugin.")
+    end
+  end
+end

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

@@ -1,54 +1,54 @@
-# frozen_string_literal: true
-#
-# Author:: Davide Cavalca <dcavalca@fb.com>
-# Copyright:: Copyright (c) 2016 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(:Sessions) do
-  provides "sessions/by_session", "sessions/by_user"
-  optional true
-
-  collect_data(:linux) do
-    loginctl_path = which("loginctl")
-    if loginctl_path
-      cmd = "#{loginctl_path} --no-pager --no-legend --no-ask-password " +
-        "list-sessions"
-      loginctl = shell_out(cmd)
-
-      sessions Mash.new unless sessions
-      sessions[:by_session] ||= Mash.new
-      sessions[:by_user] ||= Mash.new
-
-      loginctl.stdout.split("\n").each do |line|
-        session, uid, user, seat = line.split
-        s = {
-          "session" => session,
-          "uid" => uid,
-          "user" => user,
-          "seat" => seat,
-        }
-        sessions[:by_session][session] = s
-        if sessions[:by_user][user]
-          sessions[:by_user][user] << s
-        else
-          sessions[:by_user][user] = [s]
-        end
-      end
-    else
-      logger.trace("Plugin Sessions: Could not find loginctl. Skipping plugin.")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016 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(:Sessions) do
+  provides "sessions/by_session", "sessions/by_user"
+  optional true
+
+  collect_data(:linux) do
+    loginctl_path = which("loginctl")
+    if loginctl_path
+      cmd = "#{loginctl_path} --no-pager --no-legend --no-ask-password " +
+        "list-sessions"
+      loginctl = shell_out(cmd)
+
+      sessions Mash.new unless sessions
+      sessions[:by_session] ||= Mash.new
+      sessions[:by_user] ||= Mash.new
+
+      loginctl.stdout.split("\n").each do |line|
+        session, uid, user, seat = line.split
+        s = {
+          "session" => session,
+          "uid" => uid,
+          "user" => user,
+          "seat" => seat,
+        }
+        sessions[:by_session][session] = s
+        if sessions[:by_user][user]
+          sessions[:by_user][user] << s
+        else
+          sessions[:by_user][user] = [s]
+        end
+      end
+    else
+      logger.trace("Plugin Sessions: Could not find loginctl. Skipping plugin.")
+    end
+  end
+end

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

@@ -1,39 +1,39 @@
-# frozen_string_literal: true
-#
-# Author:: Joshua Miller <joshmiller@fb.com>
-# Copyright:: Copyright (c) 2019 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(:Sysctl) do
-  provides "sysctl"
-  optional true
-
-  collect_data(:linux) do
-    sysctl_path = which("sysctl")
-    if sysctl_path
-      sysctl_cmd = shell_out("#{sysctl_path} -a")
-
-      if sysctl_cmd.exitstatus == 0
-        sysctl Mash.new unless sysctl
-
-        sysctl_cmd.stdout.lines.each do |line|
-          k, v = line.split("=").map(&:strip)
-          sysctl[k] = v
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Joshua Miller <joshmiller@fb.com>
+# Copyright:: Copyright (c) 2019 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(:Sysctl) do
+  provides "sysctl"
+  optional true
+
+  collect_data(:linux) do
+    sysctl_path = which("sysctl")
+    if sysctl_path
+      sysctl_cmd = shell_out("#{sysctl_path} -a")
+
+      if sysctl_cmd.exitstatus == 0
+        sysctl Mash.new unless sysctl
+
+        sysctl_cmd.stdout.lines.each do |line|
+          k, v = line.split("=").map(&:strip)
+          sysctl[k] = v
+        end
+      end
+    end
+  end
+end

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

@@ -1,36 +1,36 @@
-# frozen_string_literal: true
-#
-# Author:: Davide Cavalca <dcavalca@fb.com>
-# Copyright:: Copyright (c) 2017 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(:SystemdPaths) do
-  provides "systemd_paths"
-
-  collect_data(:linux) do
-    systemd_path_path = which("systemd-path")
-    if systemd_path_path
-      systemd_path = shell_out(systemd_path_path)
-
-      systemd_paths Mash.new unless systemd_paths
-
-      systemd_path.stdout.each_line do |line|
-        key, val = line.split(":")
-        systemd_paths[key] = val.strip
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2017 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(:SystemdPaths) do
+  provides "systemd_paths"
+
+  collect_data(:linux) do
+    systemd_path_path = which("systemd-path")
+    if systemd_path_path
+      systemd_path = shell_out(systemd_path_path)
+
+      systemd_paths Mash.new unless systemd_paths
+
+      systemd_path.stdout.each_line do |line|
+        key, val = line.split(":")
+        systemd_paths[key] = val.strip
+      end
+    end
+  end
+end

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

@@ -1,61 +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
+#
+# 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