ohai 18.1.18 → 19.0.3

data/lib/ohai/plugins/oci.rb

@@ -1,94 +1,94 @@
-# frozen_string_literal: true
-
-#
-# Author:: Renato Covarrubias (<rnt@rnt.cl>)
-# 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(:Oci) do
-  require_relative "../mixin/oci_metadata"
-  require_relative "../mixin/http_helper"
-
-  include Ohai::Mixin::OCIMetadata
-  include Ohai::Mixin::HttpHelper
-
-  provides "oci"
-
-  collect_data do
-    oci_metadata_from_hints = hint?("oci")
-    if oci_metadata_from_hints
-      logger.trace("Plugin OCI: oci hint is present. Parsing any hint data.")
-      oci Mash.new
-      oci_metadata_from_hints.each { |k, v| oci[k] = v }
-      oci["metadata"] = parse_metadata
-    elsif oci_chassis_asset_tag?
-      logger.trace("Plugin oci: No hints present, but system appears to be on oci.")
-      oci Mash.new
-      oci["metadata"] = parse_metadata
-    else
-      logger.trace("Plugin oci: No hints present and doesn't appear to be on oci.")
-      false
-    end
-  end
-
-  def oci_chassis_asset_tag?
-    has_oci_chassis_asset_tag = false
-    if file_exist?(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE)
-      file_open(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE).each do |line|
-        next unless /OracleCloud.com/.match?(line)
-
-        logger.trace("Plugin oci: Found OracleCloud.com chassis_asset_tag used by oci.")
-        has_oci_chassis_asset_tag = true
-        break
-      end
-    end
-    has_oci_chassis_asset_tag
-  end
-
-  def parse_metadata
-    return nil unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
-
-    instance_data = fetch_metadata("instance")
-    return nil if instance_data.nil?
-
-    metadata = Mash.new
-    metadata["compute"] = Mash.new
-
-    instance_data.each do |k, v|
-      metadata["compute"][k] = v
-    end
-
-    vnics_data = fetch_metadata("vnics")
-
-    unless vnics_data.nil?
-      metadata["network"] = Mash.new
-      metadata["network"]["interface"] = []
-      vnics_data.each do |v|
-        metadata["network"]["interface"].append(v)
-      end
-    end
-
-    volume_attachments_data = fetch_metadata("volumeAttachments")
-
-    unless volume_attachments_data.nil?
-      metadata["volumes"] = Mash.new
-      volume_attachments_data.each do |k, v|
-        metadata["volumes"][k] = v
-      end
-    end
-
-    metadata
-  end
-end
+# frozen_string_literal: true
+
+#
+# Author:: Renato Covarrubias (<rnt@rnt.cl>)
+# 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(:Oci) do
+  require_relative "../mixin/oci_metadata"
+  require_relative "../mixin/http_helper"
+
+  include Ohai::Mixin::OCIMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "oci"
+
+  collect_data do
+    oci_metadata_from_hints = hint?("oci")
+    if oci_metadata_from_hints
+      logger.trace("Plugin OCI: oci hint is present. Parsing any hint data.")
+      oci Mash.new
+      oci_metadata_from_hints.each { |k, v| oci[k] = v }
+      oci["metadata"] = parse_metadata
+    elsif oci_chassis_asset_tag?
+      logger.trace("Plugin oci: No hints present, but system appears to be on oci.")
+      oci Mash.new
+      oci["metadata"] = parse_metadata
+    else
+      logger.trace("Plugin oci: No hints present and doesn't appear to be on oci.")
+      false
+    end
+  end
+
+  def oci_chassis_asset_tag?
+    has_oci_chassis_asset_tag = false
+    if file_exist?(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE)
+      file_open(Ohai::Mixin::OCIMetadata::CHASSIS_ASSET_TAG_FILE).each do |line|
+        next unless /OracleCloud.com/.match?(line)
+
+        logger.trace("Plugin oci: Found OracleCloud.com chassis_asset_tag used by oci.")
+        has_oci_chassis_asset_tag = true
+        break
+      end
+    end
+    has_oci_chassis_asset_tag
+  end
+
+  def parse_metadata
+    return nil unless can_socket_connect?(Ohai::Mixin::OCIMetadata::OCI_METADATA_ADDR, 80)
+
+    instance_data = fetch_metadata("instance")
+    return nil if instance_data.nil?
+
+    metadata = Mash.new
+    metadata["compute"] = Mash.new
+
+    instance_data.each do |k, v|
+      metadata["compute"][k] = v
+    end
+
+    vnics_data = fetch_metadata("vnics")
+
+    unless vnics_data.nil?
+      metadata["network"] = Mash.new
+      metadata["network"]["interface"] = []
+      vnics_data.each do |v|
+        metadata["network"]["interface"].append(v)
+      end
+    end
+
+    volume_attachments_data = fetch_metadata("volumeAttachments")
+
+    unless volume_attachments_data.nil?
+      metadata["volumes"] = Mash.new
+      volume_attachments_data.each do |k, v|
+        metadata["volumes"][k] = v
+      end
+    end
+
+    metadata
+  end
+end

data/lib/ohai/plugins/ohai.rb

@@ -1,29 +1,29 @@
-# frozen_string_literal: true
-#
-# Author:: Tollef Fog Heen <tfheen@err.no>
-# Copyright:: Copyright (c) 2010 Tollef Fog Heen
-# 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(:Ohai) do
-  provides "chef_packages/ohai"
-
-  collect_data do
-    chef_packages Mash.new unless chef_packages
-    chef_packages[:ohai] = Mash.new
-    chef_packages[:ohai][:version] = Ohai::VERSION
-    chef_packages[:ohai][:ohai_root] = Ohai::OHAI_ROOT
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Tollef Fog Heen <tfheen@err.no>
+# Copyright:: Copyright (c) 2010 Tollef Fog Heen
+# 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(:Ohai) do
+  provides "chef_packages/ohai"
+
+  collect_data do
+    chef_packages Mash.new unless chef_packages
+    chef_packages[:ohai] = Mash.new
+    chef_packages[:ohai][:version] = Ohai::VERSION
+    chef_packages[:ohai][:ohai_root] = Ohai::OHAI_ROOT
+  end
+end

data/lib/ohai/plugins/ohai_time.rb

@@ -1,26 +1,26 @@
-# 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(:OhaiTime) do
-  provides "ohai_time"
-
-  collect_data(:default, :target) do
-    ohai_time Time.now.to_f
-  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(:OhaiTime) do
+  provides "ohai_time"
+
+  collect_data(:default, :target) do
+    ohai_time Time.now.to_f
+  end
+end

data/lib/ohai/plugins/openbsd/memory.rb

@@ -1,99 +1,99 @@
-# frozen_string_literal: true
-#
-# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
-# Copyright:: Copyright (c) 2009 Bryan McLellan
-# 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(:Memory) do
-  provides "memory", "memory/swap"
-
-  collect_data(:openbsd) do
-    memory Mash.new
-    memory[:swap] = Mash.new
-
-    # $ vmstat -s
-    #        4096 bytes per page
-    #      514011 pages managed
-    #      224519 pages free
-    #      209339 pages active
-    #        4647 pages inactive
-    #           0 pages being paged out
-    #           5 pages wired
-    #           0 pages zeroed
-    #           4 pages reserved for pagedaemon
-    #           6 pages reserved for kernel
-    #      262205 swap pages
-    #           0 swap pages in use
-    #           0 total anon's in system
-    #           0 free anon's
-    #  1192991609 page faults
-    #  1369579301 traps
-    #   814549706 interrupts
-    #   771702498 cpu context switches
-    #   208810590 fpu context switches
-    #   492361360 software interrupts
-    #  1161998825 syscalls
-    #           0 pagein operations
-    #           0 swap ins
-    #           0 swap outs
-    #      768352 forks
-    #          16 forks where vmspace is shared
-    #        1763 kernel map entries
-    #           0 number of times the pagedaemon woke up
-    #           0 revolutions of the clock hand
-    #           0 pages freed by pagedaemon
-    #           0 pages scanned by pagedaemon
-    #           0 pages reactivated by pagedaemon
-    #           0 busy pages found by pagedaemon
-    #  1096393776 total name lookups
-    #             cache hits (37% pos + 2% neg) system 1% per-directory
-    #             deletions 0%, falsehits 6%, toolong 26%
-    #           0 select collisions
-
-    so = shell_out("vmstat -s")
-    so.stdout.lines do |line|
-      case line
-      when /(\d+) bytes per page/
-        memory[:page_size] = $1
-      when /(\d+) pages managed/
-        memory[:page_count] = $1
-        memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
-      when /(\d+) pages free/
-        memory[:free] = memory[:page_size].to_i * $1.to_i
-      when /(\d+) pages active/
-        memory[:active] = memory[:page_size].to_i * $1.to_i
-      when /(\d+) pages inactive/
-        memory[:inactive] = memory[:page_size].to_i * $1.to_i
-      when /(\d+) pages wired/
-        memory[:wired] = memory[:page_size].to_i * $1.to_i
-      end
-    end
-
-    so = shell_out("swapctl -l")
-    so.stdout.lines do |line|
-      # Device      1024-blocks     Used    Avail Capacity  Priority
-      # swap_device     1048824        0  1048824     0%    0
-      if line =~ %r{^([\d\w/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)}
-        mdev = $1
-        memory[:swap][mdev] = Mash.new
-        memory[:swap][mdev][:total] = $2
-        memory[:swap][mdev][:used] = $3
-        memory[:swap][mdev][:free] = $4
-        memory[:swap][mdev][:percent_free] = $5
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
+# Copyright:: Copyright (c) 2009 Bryan McLellan
+# 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(:Memory) do
+  provides "memory", "memory/swap"
+
+  collect_data(:openbsd) do
+    memory Mash.new
+    memory[:swap] = Mash.new
+
+    # $ vmstat -s
+    #        4096 bytes per page
+    #      514011 pages managed
+    #      224519 pages free
+    #      209339 pages active
+    #        4647 pages inactive
+    #           0 pages being paged out
+    #           5 pages wired
+    #           0 pages zeroed
+    #           4 pages reserved for pagedaemon
+    #           6 pages reserved for kernel
+    #      262205 swap pages
+    #           0 swap pages in use
+    #           0 total anon's in system
+    #           0 free anon's
+    #  1192991609 page faults
+    #  1369579301 traps
+    #   814549706 interrupts
+    #   771702498 cpu context switches
+    #   208810590 fpu context switches
+    #   492361360 software interrupts
+    #  1161998825 syscalls
+    #           0 pagein operations
+    #           0 swap ins
+    #           0 swap outs
+    #      768352 forks
+    #          16 forks where vmspace is shared
+    #        1763 kernel map entries
+    #           0 number of times the pagedaemon woke up
+    #           0 revolutions of the clock hand
+    #           0 pages freed by pagedaemon
+    #           0 pages scanned by pagedaemon
+    #           0 pages reactivated by pagedaemon
+    #           0 busy pages found by pagedaemon
+    #  1096393776 total name lookups
+    #             cache hits (37% pos + 2% neg) system 1% per-directory
+    #             deletions 0%, falsehits 6%, toolong 26%
+    #           0 select collisions
+
+    so = shell_out("vmstat -s")
+    so.stdout.lines do |line|
+      case line
+      when /(\d+) bytes per page/
+        memory[:page_size] = $1
+      when /(\d+) pages managed/
+        memory[:page_count] = $1
+        memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
+      when /(\d+) pages free/
+        memory[:free] = memory[:page_size].to_i * $1.to_i
+      when /(\d+) pages active/
+        memory[:active] = memory[:page_size].to_i * $1.to_i
+      when /(\d+) pages inactive/
+        memory[:inactive] = memory[:page_size].to_i * $1.to_i
+      when /(\d+) pages wired/
+        memory[:wired] = memory[:page_size].to_i * $1.to_i
+      end
+    end
+
+    so = shell_out("swapctl -l")
+    so.stdout.lines do |line|
+      # Device      1024-blocks     Used    Avail Capacity  Priority
+      # swap_device     1048824        0  1048824     0%    0
+      if line =~ %r{^([\d\w/]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+([\d\%]+)}
+        mdev = $1
+        memory[:swap][mdev] = Mash.new
+        memory[:swap][mdev][:total] = $2
+        memory[:swap][mdev][:used] = $3
+        memory[:swap][mdev][:free] = $4
+        memory[:swap][mdev][:percent_free] = $5
+      end
+    end
+  end
+end