ohai 18.0.26 → 18.1.0

data/lib/ohai/plugins/gce.rb

@@ -1,89 +1,89 @@
-# frozen_string_literal: true
-#
-# Author:: Ranjib Dey (<dey.ranjib@google.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(:GCE) do
-  require_relative "../mixin/gce_metadata"
-  require_relative "../mixin/http_helper"
-
-  include Ohai::Mixin::GCEMetadata
-  include Ohai::Mixin::HttpHelper
-
-  provides "gce"
-
-  # look for GCE string in dmi vendor bios data within the sys tree.
-  # this works even if the system lacks dmidecode use by the Dmi plugin
-  # @return [Boolean] do we have Google Compute Engine DMI data?
-  def has_gce_dmi?
-    if /Google Compute Engine/.match?(file_val_if_exists("/sys/class/dmi/id/product_name"))
-      logger.trace("Plugin GCE: has_gce_dmi? == true")
-      true
-    else
-      logger.trace("Plugin GCE: has_gce_dmi? == false")
-      false
-    end
-  end
-
-  # return the contents of a file if the file exists
-  # @param path[String] abs path to the file
-  # @return [String] contents of the file if it exists
-  def file_val_if_exists(path)
-    if file_exist?(path)
-      file_read(path)
-    end
-  end
-
-  # looks at the Manufacturer and Model WMI values to see if they starts with Google.
-  # @return [Boolean] Are the manufacturer and model Google?
-  def has_gce_system_info?
-    if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
-      require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
-      wmi = WmiLite::Wmi.new
-      computer_system = wmi.first_of("Win32_ComputerSystem")
-      if computer_system["Manufacturer"] =~ /^Google/ && computer_system["Model"] =~ /^Google/
-        logger.trace("Plugin GCE: has_gce_system_info? == true")
-        true
-      end
-    else
-      logger.trace("Plugin GCE: has_gce_system_info? == false")
-      false
-    end
-  end
-
-  # Identifies gce
-  #
-  # === Return
-  # true:: If gce can be identified
-  # false:: Otherwise
-  def looks_like_gce?
-    return true if hint?("gce")
-
-    if has_gce_dmi? || has_gce_system_info?
-      return true if can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
-    end
-  end
-
-  collect_data do
-    if looks_like_gce?
-      logger.trace("Plugin GCE: looks_like_gce? == true")
-      gce Mash.new
-      fetch_metadata.each { |k, v| gce[k] = v }
-    else
-      logger.trace("Plugin GCE: looks_like_gce? == false")
-      false
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Ranjib Dey (<dey.ranjib@google.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(:GCE) do
+  require_relative "../mixin/gce_metadata"
+  require_relative "../mixin/http_helper"
+
+  include Ohai::Mixin::GCEMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "gce"
+
+  # look for GCE string in dmi vendor bios data within the sys tree.
+  # this works even if the system lacks dmidecode use by the Dmi plugin
+  # @return [Boolean] do we have Google Compute Engine DMI data?
+  def has_gce_dmi?
+    if file_val_if_exists("/sys/class/dmi/id/product_name").to_s.include?("Google Compute Engine")
+      logger.trace("Plugin GCE: has_gce_dmi? == true")
+      true
+    else
+      logger.trace("Plugin GCE: has_gce_dmi? == false")
+      false
+    end
+  end
+
+  # return the contents of a file if the file exists
+  # @param path[String] abs path to the file
+  # @return [String] contents of the file if it exists
+  def file_val_if_exists(path)
+    if file_exist?(path)
+      file_read(path)
+    end
+  end
+
+  # looks at the Manufacturer and Model WMI values to see if they starts with Google.
+  # @return [Boolean] Are the manufacturer and model Google?
+  def has_gce_system_info?
+    if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
+      require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+      wmi = WmiLite::Wmi.new
+      computer_system = wmi.first_of("Win32_ComputerSystem")
+      if computer_system["Manufacturer"] =~ /^Google/ && computer_system["Model"] =~ /^Google/
+        logger.trace("Plugin GCE: has_gce_system_info? == true")
+        true
+      end
+    else
+      logger.trace("Plugin GCE: has_gce_system_info? == false")
+      false
+    end
+  end
+
+  # Identifies gce
+  #
+  # === Return
+  # true:: If gce can be identified
+  # false:: Otherwise
+  def looks_like_gce?
+    return true if hint?("gce")
+
+    if has_gce_dmi? || has_gce_system_info?
+      return true if can_socket_connect?(Ohai::Mixin::GCEMetadata::GCE_METADATA_ADDR, 80)
+    end
+  end
+
+  collect_data do
+    if looks_like_gce?
+      logger.trace("Plugin GCE: looks_like_gce? == true")
+      gce Mash.new
+      fetch_metadata.each { |k, v| gce[k] = v }
+    else
+      logger.trace("Plugin GCE: looks_like_gce? == false")
+      false
+    end
+  end
+end

data/lib/ohai/plugins/go.rb

@@ -1,34 +1,34 @@
-# Author:: Christian Vozar (<christian@rogueethic.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(:Go) do
-  provides "languages/go"
-  depends "languages".freeze
-
-  collect_data do
-
-    so = shell_out("go version")
-    # Sample output:
-    # go version go1.6.1 darwin/amd64
-    if so.exitstatus == 0 && so.stdout =~ /go(\S+)/
-      go = Mash.new
-      go[:version] = $1
-      languages[:go] = go
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Go: Could not shell_out "go version". Skipping plugin')
-
-  end
-end
+# Author:: Christian Vozar (<christian@rogueethic.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(:Go) do
+  provides "languages/go"
+  depends "languages".freeze
+
+  collect_data do
+
+    so = shell_out("go version")
+    # Sample output:
+    # go version go1.6.1 darwin/amd64
+    if so.exitstatus == 0 && so.stdout =~ /go(\S+)/
+      go = Mash.new
+      go[:version] = $1
+      languages[:go] = go
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Go: Could not shell_out "go version". Skipping plugin')
+
+  end
+end

data/lib/ohai/plugins/groovy.rb

@@ -1,38 +1,38 @@
-#
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2009 VMware, 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(:Groovy) do
-  provides "languages/groovy"
-  depends "languages".freeze
-
-  collect_data do
-
-    so = shell_out("groovy -v")
-    # Sample output:
-    # Groovy Version: 2.4.6 JVM: 1.8.0_60 Vendor: Oracle Corporation OS: Mac OS X
-    if so.exitstatus == 0 && so.stdout =~ /Groovy Version: (\S+).*JVM: (\S+)/
-      groovy = Mash.new
-      groovy[:version] = $1
-      groovy[:jvm] = $2
-      languages[:groovy] = groovy
-    end
-  rescue Ohai::Exceptions::Exec
-    logger.trace('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
-
-  end
-end
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 VMware, 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(:Groovy) do
+  provides "languages/groovy"
+  depends "languages".freeze
+
+  collect_data do
+
+    so = shell_out("groovy -v")
+    # Sample output:
+    # Groovy Version: 2.4.6 JVM: 1.8.0_60 Vendor: Oracle Corporation OS: Mac OS X
+    if so.exitstatus == 0 && so.stdout =~ /Groovy Version: (\S+).*JVM: (\S+)/
+      groovy = Mash.new
+      groovy[:version] = $1
+      groovy[:jvm] = $2
+      languages[:groovy] = groovy
+    end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Groovy: Could not shell_out "groovy -v". Skipping plugin')
+
+  end
+end

data/lib/ohai/plugins/grub2.rb

@@ -1,40 +1,40 @@
-# 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(:Grub2) do
-  provides "grub2/environment"
-  optional true
-
-  collect_data(:dragonflybsd, :freebsd, :linux, :netbsd) do
-    editenv_path = which("grub2-editenv")
-    if editenv_path
-      editenv_out = shell_out("#{editenv_path} list")
-
-      grub2 Mash.new unless grub2
-      grub2[:environment] ||= Mash.new
-
-      editenv_out.stdout.each_line do |line|
-        key, val = line.split("=", 2)
-        grub2[:environment][key] = val.strip
-      end
-    else
-      logger.trace("Plugin Grub2: Could not find grub2-editenv. 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(:Grub2) do
+  provides "grub2/environment"
+  optional true
+
+  collect_data(:dragonflybsd, :freebsd, :linux, :netbsd) do
+    editenv_path = which("grub2-editenv")
+    if editenv_path
+      editenv_out = shell_out("#{editenv_path} list")
+
+      grub2 Mash.new unless grub2
+      grub2[:environment] ||= Mash.new
+
+      editenv_out.stdout.each_line do |line|
+        key, val = line.split("=", 2)
+        grub2[:environment][key] = val.strip
+      end
+    else
+      logger.trace("Plugin Grub2: Could not find grub2-editenv. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/habitat.rb

@@ -1,73 +1,73 @@
-# frozen_string_literal: true
-#
-# 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(:Habitat) do
-  provides "habitat"
-
-  def habitat_binary
-    @habitat_binary ||= which("hab")
-  end
-
-  def fetch_habitat_version
-    shell_out([habitat_binary, "-V"]).stdout.gsub(/hab\s*/, "").strip
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin Habitat: Unable to determine the installed version of Habitat, skipping collection.")
-  end
-
-  def fetch_habitat_packages
-    shell_out([habitat_binary, "pkg", "list", "--all"]).stdout.split.sort.select { |pkg| pkg.match?(%r{.*/.*/.*/.*}) }
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin Habitat: Unable to determine the installed Habitat packages, skipping collection.")
-  end
-
-  def load_habitat_service_via_cli(status_stdout)
-    # package                           type        desired  state  elapsed (s)  pid   group
-    # core/httpd/2.4.35/20190307151146  standalone  up       up     158169       1410  httpd.default
-    @services = []
-    status_stdout.each_line do |line|
-      fields = line.split(/\s+/)
-      next unless fields[0].match?(%r{.*/.*/.*/.*}) # ignore header line
-
-      service = {}
-      service[:identity] = fields[0]
-      service[:topology] = fields[1]
-      service[:state_desired] = fields[2]
-      service[:state_actual] = fields[2]
-      (@services).push(service)
-    end
-    @services
-  end
-
-  def fetch_habitat_services
-    services_shell_out = shell_out([habitat_binary, "svc", "status"]).stdout
-    load_habitat_service_via_cli(services_shell_out) if services_shell_out
-  rescue Ohai::Exceptions::Exec
-    logger.trace("Plugin Habitat: Unable to determine the installed Habitat services, skipping collection.")
-  end
-
-  collect_data(:default) do
-    if habitat_binary
-      habitat Mash.new
-      habitat["version"] = fetch_habitat_version
-      habitat["packages"] = fetch_habitat_packages
-      habitat["services"] = fetch_habitat_services
-    else
-      logger.trace("Plugin Habitat: Could not find hab binary. Skipping plugin.")
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# 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(:Habitat) do
+  provides "habitat"
+
+  def habitat_binary
+    @habitat_binary ||= which("hab")
+  end
+
+  def fetch_habitat_version
+    shell_out([habitat_binary, "-V"]).stdout.gsub(/hab\s*/, "").strip
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Habitat: Unable to determine the installed version of Habitat, skipping collection.")
+  end
+
+  def fetch_habitat_packages
+    shell_out([habitat_binary, "pkg", "list", "--all"]).stdout.split.sort.select { |pkg| pkg.match?(%r{.*/.*/.*/.*}) }
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Habitat: Unable to determine the installed Habitat packages, skipping collection.")
+  end
+
+  def load_habitat_service_via_cli(status_stdout)
+    # package                           type        desired  state  elapsed (s)  pid   group
+    # core/httpd/2.4.35/20190307151146  standalone  up       up     158169       1410  httpd.default
+    @services = []
+    status_stdout.each_line do |line|
+      fields = line.split(/\s+/)
+      next unless fields[0].match?(%r{.*/.*/.*/.*}) # ignore header line
+
+      service = {}
+      service[:identity] = fields[0]
+      service[:topology] = fields[1]
+      service[:state_desired] = fields[2]
+      service[:state_actual] = fields[2]
+      (@services).push(service)
+    end
+    @services
+  end
+
+  def fetch_habitat_services
+    services_shell_out = shell_out([habitat_binary, "svc", "status"]).stdout
+    load_habitat_service_via_cli(services_shell_out) if services_shell_out
+  rescue Ohai::Exceptions::Exec
+    logger.trace("Plugin Habitat: Unable to determine the installed Habitat services, skipping collection.")
+  end
+
+  collect_data(:default) do
+    if habitat_binary
+      habitat Mash.new
+      habitat["version"] = fetch_habitat_version
+      habitat["packages"] = fetch_habitat_packages
+      habitat["services"] = fetch_habitat_services
+    else
+      logger.trace("Plugin Habitat: Could not find hab binary. Skipping plugin.")
+    end
+  end
+end