ohai 18.2.6 → 19.0.3

data/lib/ohai/mixin/softlayer_metadata.rb

@@ -1,74 +1,74 @@
-# frozen_string_literal: true
-#
-# Author:: Alexey Karpik <alexey.karpik@rightscale.com>
-# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
-# Author:: Stas Turlo <stanislav.turlo@rightscale.com>
-# Copyright:: Copyright (c) 2010-2014 RightScale 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.
-
-require "net/http" unless defined?(Net::HTTP)
-require "uri" unless defined?(URI)
-
-# https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/
-module ::Ohai::Mixin::SoftlayerMetadata
-  SOFTLAYER_API_QUERY_URL ||= "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata"
-
-  # fetch metadata items and build out hash of data
-  #
-  # @return [Hash]
-  def fetch_metadata
-    {
-      "public_fqdn" => fetch_metadata_item("getFullyQualifiedDomainName.txt"),
-      "local_ipv4" => fetch_metadata_item("getPrimaryBackendIpAddress.txt"),
-      "public_ipv4" => fetch_metadata_item("getPrimaryIpAddress.txt"),
-      "region" => fetch_metadata_item("getDatacenter.txt"),
-      "instance_id" => fetch_metadata_item("getId.txt"),
-    }
-  end
-
-  # Softlayer's metadata api is only available over HTTPS.
-  # Ruby by default does not link to the system's CA bundle
-  # however Chef-omnibus should set SSL_CERT_FILE to point to a valid file.
-  # Manually supply and specify a suitable CA bundle here or
-  # set the SSL_CERT_FILE file environment variable to a valid value otherwise.
-  #
-  # @return [String]
-  def ca_file_location
-    ::Ohai::Config[:ca_file]
-  end
-
-  # fetch a specified item from the Softlayer metadata API
-  # @param item [String] the metadata item to fetch
-  #
-  # @return [String] the response body
-  def fetch_metadata_item(item)
-    full_url = "#{SOFTLAYER_API_QUERY_URL}/#{item}"
-    u = URI(full_url)
-    net = ::Net::HTTP.new(u.hostname, u.port)
-    net.ssl_version = :TLSv1_2
-    net.use_ssl = true
-    net.ca_file = ca_file_location
-    res = net.get(u.request_uri)
-    if res.code.to_i.between?(200, 299)
-      res.body
-    else
-      logger.error("Mixin Softlayer: Unable to fetch item #{full_url}: status (#{res.code}) body (#{res.body})")
-      nil
-    end
-  rescue => e
-    logger.error("Mixin Softlayer: Unable to fetch softlayer metadata from #{u}: #{e.class}: #{e.message}")
-    raise e
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Alexey Karpik <alexey.karpik@rightscale.com>
+# Author:: Peter Schroeter <peter.schroeter@rightscale.com>
+# Author:: Stas Turlo <stanislav.turlo@rightscale.com>
+# Copyright:: Copyright (c) 2010-2014 RightScale 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.
+
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
+
+# https://softlayer.github.io/reference/services/SoftLayer_Resource_Metadata/
+module ::Ohai::Mixin::SoftlayerMetadata
+  SOFTLAYER_API_QUERY_URL ||= "https://api.service.softlayer.com/rest/v3.1/SoftLayer_Resource_Metadata"
+
+  # fetch metadata items and build out hash of data
+  #
+  # @return [Hash]
+  def fetch_metadata
+    {
+      "public_fqdn" => fetch_metadata_item("getFullyQualifiedDomainName.txt"),
+      "local_ipv4" => fetch_metadata_item("getPrimaryBackendIpAddress.txt"),
+      "public_ipv4" => fetch_metadata_item("getPrimaryIpAddress.txt"),
+      "region" => fetch_metadata_item("getDatacenter.txt"),
+      "instance_id" => fetch_metadata_item("getId.txt"),
+    }
+  end
+
+  # Softlayer's metadata api is only available over HTTPS.
+  # Ruby by default does not link to the system's CA bundle
+  # however Chef-omnibus should set SSL_CERT_FILE to point to a valid file.
+  # Manually supply and specify a suitable CA bundle here or
+  # set the SSL_CERT_FILE file environment variable to a valid value otherwise.
+  #
+  # @return [String]
+  def ca_file_location
+    ::Ohai::Config[:ca_file]
+  end
+
+  # fetch a specified item from the Softlayer metadata API
+  # @param item [String] the metadata item to fetch
+  #
+  # @return [String] the response body
+  def fetch_metadata_item(item)
+    full_url = "#{SOFTLAYER_API_QUERY_URL}/#{item}"
+    u = URI(full_url)
+    net = ::Net::HTTP.new(u.hostname, u.port)
+    net.ssl_version = :TLSv1_2
+    net.use_ssl = true
+    net.ca_file = ca_file_location
+    res = net.get(u.request_uri)
+    if res.code.to_i.between?(200, 299)
+      res.body
+    else
+      logger.error("Mixin Softlayer: Unable to fetch item #{full_url}: status (#{res.code}) body (#{res.body})")
+      nil
+    end
+  rescue => e
+    logger.error("Mixin Softlayer: Unable to fetch softlayer metadata from #{u}: #{e.class}: #{e.message}")
+    raise e
+  end
+end

data/lib/ohai/mixin/string.rb

@@ -1,31 +1,31 @@
-# frozen_string_literal: true
-#
-# Author:: James Gartrell (<jgartrel@gmail.com>)
-# 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.
-#
-
-class String
-  # Add string function to handle WMI property conversion to json hash keys
-  # Makes an underscored, lowercase form from the expression in the string.
-  # underscore will also change ’::’ to ’/’ to convert namespaces to paths.
-  # This should implement the same functionality as underscore method in
-  # ActiveSupport::CoreExtensions::String::Inflections
-  # @return [String]
-  def wmi_underscore
-    gsub("::", "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: James Gartrell (<jgartrel@gmail.com>)
+# 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.
+#
+
+class String
+  # Add string function to handle WMI property conversion to json hash keys
+  # Makes an underscored, lowercase form from the expression in the string.
+  # underscore will also change ’::’ to ’/’ to convert namespaces to paths.
+  # This should implement the same functionality as underscore method in
+  # ActiveSupport::CoreExtensions::String::Inflections
+  # @return [String]
+  def wmi_underscore
+    gsub(/::/, "/").gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2').tr("-", "_").downcase
+  end
+end

data/lib/ohai/mixin/train_helpers.rb

@@ -1,36 +1,36 @@
-# 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.
-
-require "chef-utils/dsl/train_helpers" unless defined?(ChefUtils::DSL::TrainHelpers)
-require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
-
-module Ohai
-  module Mixin
-    module TrainHelpers
-      include ChefUtils::DSL::TrainHelpers
-      include ChefUtilsWiring
-
-      # anything added to this file temporarily should be pushed back up
-      # into ChefUtils::DSL::TrainHelpers
-
-      # XXX: this needs better support directly in train
-      def dir_glob(path)
-        shell_out!("ls -d #{path}").stdout.split
-      end
-    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.
+
+require "chef-utils/dsl/train_helpers" unless defined?(ChefUtils::DSL::TrainHelpers)
+require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
+
+module Ohai
+  module Mixin
+    module TrainHelpers
+      include ChefUtils::DSL::TrainHelpers
+      include ChefUtilsWiring
+
+      # anything added to this file temporarily should be pushed back up
+      # into ChefUtils::DSL::TrainHelpers
+
+      # XXX: this needs better support directly in train
+      def dir_glob(path)
+        shell_out!("ls -d #{path}").stdout.split
+      end
+    end
+  end
+end

data/lib/ohai/mixin/which.rb

@@ -1,39 +1,39 @@
-# 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.
-
-require "chef-utils/dsl/which" unless defined?(ChefUtils::DSL::Which)
-require "chef-utils/dsl/default_paths" unless defined?(ChefUtils::DSL::DefaultPaths)
-require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
-
-module Ohai
-  module Mixin
-    module Which
-      include ChefUtils::DSL::Which
-      include ChefUtils::DSL::DefaultPaths
-      include ChefUtilsWiring
-
-      private
-
-      # we dep-inject default paths into this API for historical reasons
-      #
-      # @api private
-      def __extra_path
-        __default_paths
-      end
-    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.
+
+require "chef-utils/dsl/which" unless defined?(ChefUtils::DSL::Which)
+require "chef-utils/dsl/default_paths" unless defined?(ChefUtils::DSL::DefaultPaths)
+require_relative "chef_utils_wiring" unless defined?(Ohai::Mixin::ChefUtilsWiring)
+
+module Ohai
+  module Mixin
+    module Which
+      include ChefUtils::DSL::Which
+      include ChefUtils::DSL::DefaultPaths
+      include ChefUtilsWiring
+
+      private
+
+      # we dep-inject default paths into this API for historical reasons
+      #
+      # @api private
+      def __extra_path
+        __default_paths
+      end
+    end
+  end
+end

data/lib/ohai/plugin_config.rb

@@ -1,47 +1,47 @@
-# 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.
-#
-
-require_relative "exception"
-
-module Ohai
-  class PluginConfig < Hash
-
-    def []=(key, value_or_hash)
-      enforce_symbol(key)
-      enforce_symbol_keys(value_or_hash) if value_or_hash.is_a?(Hash)
-      super(key, value_or_hash)
-    end
-
-    private
-
-    def enforce_symbol(key)
-      unless key.is_a?(Symbol)
-        msg = "Expected Symbol, got #{key.inspect}"
-        raise Ohai::Exceptions::PluginConfigError, msg
-      end
-    end
-
-    def enforce_symbol_keys(hash)
-      hash.each do |key, value|
-        enforce_symbol(key)
-        enforce_symbol_keys(value) if value.is_a?(Hash)
-      end
-    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.
+#
+
+require_relative "exception"
+
+module Ohai
+  class PluginConfig < Hash
+
+    def []=(key, value_or_hash)
+      enforce_symbol(key)
+      enforce_symbol_keys(value_or_hash) if value_or_hash.is_a?(Hash)
+      super(key, value_or_hash)
+    end
+
+    private
+
+    def enforce_symbol(key)
+      unless key.is_a?(Symbol)
+        msg = "Expected Symbol, got #{key.inspect}"
+        raise Ohai::Exceptions::PluginConfigError, msg
+      end
+    end
+
+    def enforce_symbol_keys(hash)
+      hash.each do |key, value|
+        enforce_symbol(key)
+        enforce_symbol_keys(value) if value.is_a?(Hash)
+      end
+    end
+
+  end
+end

data/lib/ohai/plugins/aix/kernel.rb

@@ -1,50 +1,50 @@
-# frozen_string_literal: true
-#
-# Author:: Joshua Timberman <joshua@chef.io>
-# Author:: Isa Farnik (<isa@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(:Kernel) do
-  provides "kernel", "kernel/modules"
-
-  collect_data(:aix) do
-    kernel Mash.new
-
-    uname_so = shell_out("uname -rvp").stdout.split
-
-    kernel[:name] = "aix" # this is here for historical reasons, but it's always aix
-    kernel[:release] = uname_so[0]
-    kernel[:version] = uname_so[1]
-    kernel[:machine] = uname_so[2]
-    kernel[:bits] = shell_out("getconf KERNEL_BITMODE").stdout.strip
-
-    modules = Mash.new
-    so = shell_out("genkex -d")
-    #     Text address     Size     Data address     Size File
-    #
-    # f1000000c0338000    77000 f1000000c0390000    1ec8c /usr/lib/drivers/cluster
-    #          6390000    20000          63a0000      ba8 /usr/lib/drivers/if_en
-    # f1000000c0318000    20000 f1000000c0320000    17138 /usr/lib/drivers/random
-    so.stdout.lines do |line|
-      if line =~ %r{\s*([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([a-zA-Z0-9/\._]+)}
-        modules[$5] = { text: { address: $1, size: $2 }, data: { address: $3, size: $4 } }
-      end
-    end
-
-    kernel[:modules] = modules
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Joshua Timberman <joshua@chef.io>
+# Author:: Isa Farnik (<isa@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(:Kernel) do
+  provides "kernel", "kernel/modules"
+
+  collect_data(:aix) do
+    kernel Mash.new
+
+    uname_so = shell_out("uname -rvp").stdout.split
+
+    kernel[:name] =    "aix" # this is here for historical reasons, but it's always aix
+    kernel[:release] = uname_so[0]
+    kernel[:version] = uname_so[1]
+    kernel[:machine] = uname_so[2]
+    kernel[:bits] =    shell_out("getconf KERNEL_BITMODE").stdout.strip
+
+    modules = Mash.new
+    so = shell_out("genkex -d")
+    #     Text address     Size     Data address     Size File
+    #
+    # f1000000c0338000    77000 f1000000c0390000    1ec8c /usr/lib/drivers/cluster
+    #          6390000    20000          63a0000      ba8 /usr/lib/drivers/if_en
+    # f1000000c0318000    20000 f1000000c0320000    17138 /usr/lib/drivers/random
+    so.stdout.lines do |line|
+      if line =~ %r{\s*([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([0-9a-f]+)\s+([a-zA-Z0-9/\._]+)}
+        modules[$5] = { text: { address: $1, size: $2 }, data: { address: $3, size: $4 } }
+      end
+    end
+
+    kernel[:modules] = modules
+  end
+end

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

@@ -1,37 +1,37 @@
-# frozen_string_literal: true
-#
-# Author:: Joshua Timberman <joshua@chef.io>
-# Author:: Isa Farnik (<isa@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(:Memory) do
-  provides "memory"
-
-  collect_data(:aix) do
-    memory Mash.new
-    memory[:swap] = Mash.new
-
-    meminfo = shell_out("svmon -G -O unit=KB,summary=longreal | grep '[0-9]'").stdout
-    total_in_mb, _u, free_in_mb = meminfo.split
-    memory[:total] = "#{total_in_mb.to_i}kB"
-    memory[:free] = "#{free_in_mb.to_i}kB"
-
-    swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
-    memory[:swap]["total"] = "#{swap_info[2].to_i * 4}kB"
-    memory[:swap]["free"] = "#{swap_info[10].to_i * 4}kB"
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Joshua Timberman <joshua@chef.io>
+# Author:: Isa Farnik (<isa@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(:Memory) do
+  provides "memory"
+
+  collect_data(:aix) do
+    memory Mash.new
+    memory[:swap] = Mash.new
+
+    meminfo = shell_out("svmon -G -O unit=KB,summary=longreal | grep '[0-9]'").stdout
+    total_in_mb, _u, free_in_mb = meminfo.split
+    memory[:total] = "#{total_in_mb.to_i}kB"
+    memory[:free] = "#{free_in_mb.to_i}kB"
+
+    swap_info = shell_out("swap -s").stdout.split # returns swap info in 4K blocks
+    memory[:swap]["total"] = "#{swap_info[2].to_i * 4}kB"
+    memory[:swap]["free"] = "#{swap_info[10].to_i * 4}kB"
+  end
+end