ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/languages.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(:Languages) do
-  provides "languages"
-
-  collect_data do
-    languages Mash.new
-  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(:Languages) do
+  provides "languages"
+
+  collect_data do
+    languages Mash.new
+  end
+end

data/lib/ohai/plugins/libvirt.rb

@@ -1,114 +1,114 @@
-# frozen_string_literal: true
-#
-# Author:: Benjamin Black (<bb@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.
-#
-
-# NOTE: This plugin requires libvirt-bin/libvirt-dev as well as the ruby-libvirt
-#       gem to be installed before it will properly parse data
-
-Ohai.plugin(:Libvirt) do
-  %w{uri capabilities nodeinfo domains networks storage}.each do |info|
-    provides "libvirt/#{info}"
-    depends "virtualization"
-  end
-
-  def emu
-    @emu ||= (virtualization[:system].eql?("kvm") ? "qemu" : virtualization[:system])
-  end
-
-  def load_libvirt
-    require "libvirt" # this is the ruby-libvirt gem not the libvirt gem
-    logger.trace("Plugin Libvirt: Successfully loaded ruby-libvirt gem")
-  rescue LoadError
-    logger.trace("Plugin Libvirt: Can't load gem ruby-libvirt.")
-  end
-
-  def virtconn
-    @virt_connect ||= Libvirt.open_read_only("#{emu}:///system")
-  end
-
-  def get_node_data
-    node_data = Mash.new
-    ni = virtconn.node_get_info
-    %w{cores cpus memory mhz model nodes sockets threads}.each { |a| node_data[a] = ni.send(a) }
-    node_data
-  end
-
-  def get_domain_data
-    domain_data = Mash.new
-    virtconn.list_domains.each do |d|
-      dv = virtconn.lookup_domain_by_id d
-      domain_data[dv.name] = Mash.new
-      domain_data[dv.name][:id] = d
-      %w{os_type uuid}.each { |a| domain_data[dv.name][a] = dv.send(a) }
-      %w{cpu_time max_mem memory nr_virt_cpu state}.each { |a| domain_data[dv.name][a] = dv.info.send(a) }
-    end
-    domain_data
-  end
-
-  def get_network_data
-    network_data = Mash.new
-    virtconn.list_networks.each do |n|
-      nv = virtconn.lookup_network_by_name n
-      network_data[n] = Mash.new
-      %w{bridge_name uuid}.each { |a| network_data[n][a] = nv.send(a) }
-    end
-    network_data
-  end
-
-  def get_storage_data
-    storage_data = Mash.new
-    virtconn.list_storage_pools.each do |pool|
-      sp = virtconn.lookup_storage_pool_by_name pool
-      storage_data[pool] = Mash.new
-      %w{autostart uuid}.each { |a| storage_data[pool][a] = sp.send(a) }
-      %w{allocation available capacity state}.each { |a| storage_data[pool][a] = sp.info.send(a) }
-
-      storage_data[pool][:volumes] = Mash.new
-      sp.list_volumes.each do |v|
-        storage_data[pool][:volumes][v] = Mash.new
-        sv = sp.lookup_volume_by_name v
-        %w{key name path}.each { |a| storage_data[pool][:volumes][v][a] = sv.send(a) }
-        %w{allocation capacity type}.each { |a| storage_data[pool][:volumes][v][a] = sv.info.send(a) }
-      end
-    end
-    storage_data
-  end
-
-  collect_data(:linux) do
-    if virtualization[:role].eql?("host")
-      load_libvirt
-      begin
-        libvirt_data = Mash.new
-        libvirt_data[:uri] = virtconn.uri
-        libvirt_data[:libvirt_version] = Libvirt.version(emu)[0].to_s
-        libvirt_data[:nodeinfo] = get_node_data
-        libvirt_data[:domains] = get_domain_data
-        libvirt_data[:networks] = get_network_data
-        libvirt_data[:storage] = get_storage_data
-        virtconn.close
-        libvirt libvirt_data
-      rescue NameError
-        logger.trace("Plugin Libvirt: Cannot load ruby-libvirt gem. Skipping...")
-      rescue Libvirt::ConnectionError
-        logger.trace("Plugin Libvirt: Failed to connect to #{emu}:///system. Skipping...")
-      end
-    else
-      logger.trace("Plugin Libvirt: Node is not a virtualization host. Skipping...")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Benjamin Black (<bb@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.
+#
+
+# NOTE: This plugin requires libvirt-bin/libvirt-dev as well as the ruby-libvirt
+#       gem to be installed before it will properly parse data
+
+Ohai.plugin(:Libvirt) do
+  %w{uri capabilities nodeinfo domains networks storage}.each do |info|
+    provides "libvirt/#{info}"
+    depends "virtualization"
+  end
+
+  def emu
+    @emu ||= (virtualization[:system].eql?("kvm") ? "qemu" : virtualization[:system])
+  end
+
+  def load_libvirt
+    require "libvirt" # this is the ruby-libvirt gem not the libvirt gem
+    logger.trace("Plugin Libvirt: Successfully loaded ruby-libvirt gem")
+  rescue LoadError
+    logger.trace("Plugin Libvirt: Can't load gem ruby-libvirt.")
+  end
+
+  def virtconn
+    @virt_connect ||= Libvirt.open_read_only("#{emu}:///system")
+  end
+
+  def get_node_data
+    node_data = Mash.new
+    ni = virtconn.node_get_info
+    %w{cores cpus memory mhz model nodes sockets threads}.each { |a| node_data[a] = ni.send(a) }
+    node_data
+  end
+
+  def get_domain_data
+    domain_data = Mash.new
+    virtconn.list_domains.each do |d|
+      dv = virtconn.lookup_domain_by_id d
+      domain_data[dv.name] = Mash.new
+      domain_data[dv.name][:id] = d
+      %w{os_type uuid}.each { |a| domain_data[dv.name][a] = dv.send(a) }
+      %w{cpu_time max_mem memory nr_virt_cpu state}.each { |a| domain_data[dv.name][a] = dv.info.send(a) }
+    end
+    domain_data
+  end
+
+  def get_network_data
+    network_data = Mash.new
+    virtconn.list_networks.each do |n|
+      nv = virtconn.lookup_network_by_name n
+      network_data[n] = Mash.new
+      %w{bridge_name uuid}.each { |a| network_data[n][a] = nv.send(a) }
+    end
+    network_data
+  end
+
+  def get_storage_data
+    storage_data = Mash.new
+    virtconn.list_storage_pools.each do |pool|
+      sp = virtconn.lookup_storage_pool_by_name pool
+      storage_data[pool] = Mash.new
+      %w{autostart uuid}.each { |a| storage_data[pool][a] = sp.send(a) }
+      %w{allocation available capacity state}.each { |a| storage_data[pool][a] = sp.info.send(a) }
+
+      storage_data[pool][:volumes] = Mash.new
+      sp.list_volumes.each do |v|
+        storage_data[pool][:volumes][v] = Mash.new
+        sv = sp.lookup_volume_by_name v
+        %w{key name path}.each { |a| storage_data[pool][:volumes][v][a] = sv.send(a) }
+        %w{allocation capacity type}.each { |a| storage_data[pool][:volumes][v][a] = sv.info.send(a) }
+      end
+    end
+    storage_data
+  end
+
+  collect_data(:linux) do
+    if virtualization[:role].eql?("host")
+      load_libvirt
+      begin
+        libvirt_data = Mash.new
+        libvirt_data[:uri] = virtconn.uri
+        libvirt_data[:libvirt_version] = Libvirt.version(emu)[0].to_s
+        libvirt_data[:nodeinfo] = get_node_data
+        libvirt_data[:domains] = get_domain_data
+        libvirt_data[:networks] = get_network_data
+        libvirt_data[:storage] = get_storage_data
+        virtconn.close
+        libvirt libvirt_data
+      rescue NameError
+        logger.trace("Plugin Libvirt: Cannot load ruby-libvirt gem. Skipping...")
+      rescue Libvirt::ConnectionError
+        logger.trace("Plugin Libvirt: Failed to connect to #{emu}:///system. Skipping...")
+      end
+    else
+      logger.trace("Plugin Libvirt: Node is not a virtualization host. Skipping...")
+    end
+  end
+end

data/lib/ohai/plugins/linode.rb

@@ -1,73 +1,73 @@
-# frozen_string_literal: true
-#
-# Author:: Aaron Kalin (<akalin@martinisoftware.com>)
-# 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(:Linode) do
-  provides "linode"
-
-  depends "domain"
-  depends "network/interfaces"
-
-  # Checks to see if the node is in the members.linode.com domain
-  #
-  # @return [Boolean]
-  #
-  def has_linode_domain?
-    domain&.include?("linode")
-  end
-
-  # Checks for linode mirrors in the apt sources.list file
-  #
-  # @return [Boolean]
-  #
-  def has_linode_apt_repos?
-    file_exist?("/etc/apt/sources.list") && file_read("/etc/apt/sources.list").include?("linode")
-  end
-
-  # Identifies the linode cloud by preferring the hint, then
-  #
-  # @return [Boolean]
-  #
-  def looks_like_linode?
-    hint?("linode") || has_linode_domain? || has_linode_apt_repos?
-  end
-
-  # Alters linode mash with new interface based on name parameter
-  #
-  # @param [Symbol] name Ohai name (e.g. :public_ip)
-  # @param [Symbol] eth Interface name (e.g. :eth0)
-  #
-  def get_ip_address(name, eth)
-    if ( eth_iface = network[:interfaces][eth] )
-      eth_iface[:addresses].each do |key, info|
-        linode[name] = key if info["family"] == "inet"
-      end
-    end
-  end
-
-  collect_data(:linux) do
-    # Setup linode mash if it is a linode system
-    if looks_like_linode?
-      logger.trace("Plugin Linode: looks_like_linode? == true")
-      linode Mash.new
-      get_ip_address(:public_ip, :eth0)
-      get_ip_address(:private_ip, "eth0:1")
-      hint?("linode").each { |k, v| linode[k] = v } if hint?("linode").is_a?(Hash)
-    else
-      logger.trace("Plugin Linode: looks_like_linode? == false")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Aaron Kalin (<akalin@martinisoftware.com>)
+# 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(:Linode) do
+  provides "linode"
+
+  depends "domain"
+  depends "network/interfaces"
+
+  # Checks to see if the node is in the members.linode.com domain
+  #
+  # @return [Boolean]
+  #
+  def has_linode_domain?
+    domain&.include?("linode")
+  end
+
+  # Checks for linode mirrors in the apt sources.list file
+  #
+  # @return [Boolean]
+  #
+  def has_linode_apt_repos?
+    file_exist?("/etc/apt/sources.list") && file_read("/etc/apt/sources.list").include?("linode")
+  end
+
+  # Identifies the linode cloud by preferring the hint, then
+  #
+  # @return [Boolean]
+  #
+  def looks_like_linode?
+    hint?("linode") || has_linode_domain? || has_linode_apt_repos?
+  end
+
+  # Alters linode mash with new interface based on name parameter
+  #
+  # @param [Symbol] name Ohai name (e.g. :public_ip)
+  # @param [Symbol] eth Interface name (e.g. :eth0)
+  #
+  def get_ip_address(name, eth)
+    if ( eth_iface = network[:interfaces][eth] )
+      eth_iface[:addresses].each do |key, info|
+        linode[name] = key if info["family"] == "inet"
+      end
+    end
+  end
+
+  collect_data(:linux) do
+    # Setup linode mash if it is a linode system
+    if looks_like_linode?
+      logger.trace("Plugin Linode: looks_like_linode? == true")
+      linode Mash.new
+      get_ip_address(:public_ip, :eth0)
+      get_ip_address(:private_ip, "eth0:1")
+      hint?("linode").each { |k, v| linode[k] = v } if hint?("linode").is_a?(Hash)
+    else
+      logger.trace("Plugin Linode: looks_like_linode? == false")
+    end
+  end
+end

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

@@ -1,48 +1,48 @@
-# 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(:BlockDevice) do
-  provides "block_device"
-
-  collect_data(:linux) do
-    if file_exist?("/sys/block")
-      block = Mash.new
-      dir_glob("/sys/block/*").each do |block_device_dir|
-        dir = File.basename(block_device_dir)
-        block[dir] = Mash.new
-        %w{size removable}.each do |check|
-          if file_exist?("/sys/block/#{dir}/#{check}")
-            file_open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
-          end
-        end
-        %w{model rev state timeout vendor queue_depth}.each do |check|
-          if file_exist?("/sys/block/#{dir}/device/#{check}")
-            file_open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
-          end
-        end
-        %w{rotational physical_block_size logical_block_size}.each do |check|
-          if file_exist?("/sys/block/#{dir}/queue/#{check}")
-            file_open("/sys/block/#{dir}/queue/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
-          end
-        end
-      end
-      block_device block
-    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(:BlockDevice) do
+  provides "block_device"
+
+  collect_data(:linux) do
+    if file_exist?("/sys/block")
+      block = Mash.new
+      dir_glob("/sys/block/*").each do |block_device_dir|
+        dir = File.basename(block_device_dir)
+        block[dir] = Mash.new
+        %w{size removable}.each do |check|
+          if file_exist?("/sys/block/#{dir}/#{check}")
+            file_open("/sys/block/#{dir}/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          end
+        end
+        %w{model rev state timeout vendor queue_depth}.each do |check|
+          if file_exist?("/sys/block/#{dir}/device/#{check}")
+            file_open("/sys/block/#{dir}/device/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          end
+        end
+        %w{rotational physical_block_size logical_block_size}.each do |check|
+          if file_exist?("/sys/block/#{dir}/queue/#{check}")
+            file_open("/sys/block/#{dir}/queue/#{check}") { |f| block[dir][check] = f.read_nonblock(1024).strip }
+          end
+        end
+      end
+      block_device block
+    end
+  end
+end

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

@@ -1,34 +1,34 @@
-# 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(:Hostnamectl) do
-  provides "hostnamectl"
-
-  collect_data(:linux) do
-    hostnamectl Mash.new unless hostnamectl
-
-    hostnamectl_path = which("hostnamectl")
-    if hostnamectl_path
-      shell_out(hostnamectl_path).stdout.split("\n").each do |line|
-        key, val = line.split(": ", 2)
-        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val
-      end
-    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(:Hostnamectl) do
+  provides "hostnamectl"
+
+  collect_data(:linux) do
+    hostnamectl Mash.new unless hostnamectl
+
+    hostnamectl_path = which("hostnamectl")
+    if hostnamectl_path
+      shell_out(hostnamectl_path).stdout.split("\n").each do |line|
+        key, val = line.split(": ", 2)
+        hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val
+      end
+    end
+  end
+end