ohai 7.4.1 → 7.6.0.rc.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Yjk5OTY3MGYwNTBhNGFmODNlYWYwMGIxNTcxZmY4ZDA4MzQxNTdlMg==
-  data.tar.gz: !binary |-
-    ZjRlYjkwYjE5ODRkYmRjMjljZWQ1ZDQ0YjVhMzk4NGUxNDRlZGRmMg==
+SHA1:
+  metadata.gz: 9b3fe8adb1220f8ba23d9f4580d72c51b31e39cc
+  data.tar.gz: 8d2f029cbbc2c838b8e3f5844ffbeacc335af035
 SHA512:
-  metadata.gz: !binary |-
-    MGNiNTJmM2Q3NDQ5NWZiZjY4MWFjMGJlOGFhOTUyYzE0MjQxNjg3MTIzODQ0
-    ZThmOTgxMDM2MzhlYWJjOTkxYjFmYjZhMDU1MzE5MjFmOGVlNjI5ZTcyNTVl
-    OWVkYTM1NWU5NWZmNTljNTE3YmZmM2Y3YWIxYWY3YTJjMGU2MDU=
-  data.tar.gz: !binary |-
-    N2Q5Y2UzMzczYWU3MzRkNTNkZjk3ZmI5NGM0ODU5Y2M5NDMwMjUxM2NlZmUz
-    NDMwYzhjYWQ2MWMwMDgzOGYyNzUxOTQ4MjI3OWNhMTQyNTFjMWM5MGU0NzVi
-    N2Y3NDExZWNmYmFlNGM0NTFjNmRmZDE2ZDhkY2YyYTc4YTBjYWU=
+  metadata.gz: ab5925dd17bdd934be8c747e764611259a416ecb02d62d54b4be2eb6b99054c59a7444d98977b71c1e47a6c1f0e9405484758f910c0cff62b2b6451d5edcab0a
+  data.tar.gz: b248e02c48954d9166bc2a96b07576de71f31e54bc9773c8c49ffa4672f726745594e59cb3c976c0e6933d8929c78535144adaab8b33ece599e3a6510c597a8a

data/README.md

@@ -3,7 +3,7 @@
 # DESCRIPTION:
 
 Ohai detects data about your operating system. It can be used
-standalone, but it's primary purpose is to provide node data to Chef.
+standalone, but its primary purpose is to provide node data to Chef.
 
 Ohai will print out a JSON data blob for all the known data about your
 system. When used with Chef, that data is reported back via node
@@ -66,20 +66,19 @@ Source:
 
 * http://github.com/opscode/ohai/tree/master
 
-Tickets/Issues:
+Issues:
 
-* http://tickets.opscode.com/
-
-(Use the OHAI project)
+* https://github.com/opscode/ohai/issues
 
 # LICENSE:
 
 Ohai - system information application
 
-Author:: Adam Jacob (<adam@getchef.com>)
-Copyright:: Copyright (c) 2008-2014 Chef Software, Inc.
-License:: Apache License, Version 2.0
+* Author:: Adam Jacob (<adam@getchef.com>)
+* Copyright:: Copyright (c) 2008-2014 Chef Software, Inc.
+* License:: Apache License, Version 2.0
 
+```text
 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
@@ -91,3 +90,4 @@ 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.
+```

data/Rakefile

@@ -2,15 +2,15 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'rubygems/specification'
 require 'date'
+require 'ohai/version'
 
 gemspec = eval(IO.read("ohai.gemspec"))
 
-
 Gem::PackageTask.new(gemspec).define
 
 desc "install the gem locally"
 task :install => [:package] do
-  sh %{gem install pkg/#{ohai}-#{OHAI_VERSION}}
+  sh %{gem install pkg/ohai-#{Ohai::VERSION}.gem}
 end
 
 begin

data/lib/ohai/mixin/cloudstack_metadata.rb

@@ -0,0 +1,88 @@
+#
+# Author:: Olle Lundberg (<geek@nerd.sh>)
+# Copyright:: Copyright (c) 2014 Opscode, 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 'ohai/mixin/ec2_metadata'
+require 'ohai/hints'
+require 'net/dhcp'
+require 'socket'
+
+
+module Ohai
+  module Mixin
+    module CloudstackMetadata
+      include Ohai::Mixin::Ec2Metadata
+
+      def self.discover_dhcp_server
+        response = ''
+        if Ohai::Hints.hint?('cloudstack')
+          begin
+            request = DHCP::Discover.new
+
+            listensock = UDPSocket.new
+            sendsock   = UDPSocket.new
+
+            listensock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+            sendsock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+
+            sendsock.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+            sendaddr   = "<broadcast>"
+            listenport = 68
+
+            listensock.bind('', listenport)
+            sendsock.connect(sendaddr, 67)
+
+            sendsock.send(request.pack, 0)
+
+            data = listensock.recvfrom_nonblock(1500)
+          rescue Exception => e
+            if (defined?(IO::WaitReadable) && e.instance_of?(IO::WaitReadable)) ||
+                (e.instance_of?(Errno::EAGAIN) || e.instance_of?(Errno::EWOULDBLOCK)) # This OR branch can be removed when ruby > 1.8.7
+              unless IO.select([listensock], nil, nil, 10)
+                # timeout reached
+                Ohai::Log.debug("Timeout reached awaiting response from DHCP server")
+              else
+                # try to read from the socket again
+                data = listensock.recvfrom_nonblock(1500)
+              end
+            else
+              Ohai::Log.debug("Exceptions encountered when trying to connect to dhcp server. #{e.message}")
+            end
+          ensure
+            sendsock.close
+            listensock.close
+            if data
+              response = [DHCP::Message.from_udp_payload(data[0]).siaddr].pack('N').unpack('C4').join('.')
+            end
+          end
+        end
+        response
+      end
+
+      CLOUDSTACK_METADATA_ADDR = self.discover_dhcp_server unless defined?(CLOUDSTACK_METADATA_ADDR)
+
+      def http_client
+        Net::HTTP.start(CLOUDSTACK_METADATA_ADDR).tap { |h| h.read_timeout = 600 }
+      end
+
+      def best_api_version
+        'latest'
+      end
+
+    end
+  end
+end
+

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

@@ -26,6 +26,20 @@ Ohai.plugin(:Kernel) do
     kernel[:release] = shell_out("uname -r").stdout.split($/)[0]
     kernel[:version] = shell_out("uname -v").stdout.split($/)[0]
     kernel[:machine] = shell_out("uname -p").stdout.split($/)[0]
-    kernel[:modules] = Mash.new
+
+    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 =~ /\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/network.rb

@@ -42,6 +42,9 @@ Ohai.plugin(:Network) do
 
     iface = Mash.new
 
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+
     # :default_interface, :default_gateway - route -n get 0
     so = shell_out("route -n get 0")
     so.stdout.lines.each do |line|
@@ -90,10 +93,10 @@ Ohai.plugin(:Network) do
               if line =~ /broadcast\s(\S+)\s/
                 iface[interface][:addresses][tmp_addr][:broadcast] = $1
               end
-            elsif line =~ /inet6 ([a-f0-9\:%]+)\/(\d+)/
+            elsif line =~ /inet6 ([a-f0-9\:]+)%?([\d]*)\/?(\d*)/
               # TODO do we have more properties on inet6 in aix? broadcast
               iface[interface][:addresses] = Mash.new unless iface[interface][:addresses]
-              iface[interface][:addresses][$1] = { "family" => "inet6", "prefixlen" => $2 }
+              iface[interface][:addresses][$1] = { "family" => "inet6", "zone_index" => $2, "prefixlen" => $3 }
             else
               # load all key-values, example "tcp_sendspace 131072 tcp_recvspace 131072 rfc1323 1"
               properties = line.split

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

@@ -0,0 +1,39 @@
+#
+# Author:: Julian C. Dunn (<jdunn@getchef.com>)
+# Copyright:: Copyright (c) 2014 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(:Virtualization) do
+  provides "virtualization"
+
+  collect_data(:aix) do
+    virtualization Mash.new
+
+    so = shell_out("uname -L")
+    lpar_no = so.stdout.split($/)[0].split(/\s/)[0]
+    lpar_name = so.stdout.split($/)[0].split(/\s/)[1]
+
+    unless lpar_no.to_i == -1 || (lpar_no.to_i == 1 && lpar_name == "NULL")
+      virtualization[:lpar_no] = lpar_no
+      virtualization[:lpar_name] = lpar_name
+    end
+
+    so = shell_out("uname -W")
+    wpar_no = so.stdout.split($/)[0]
+    virtualization[:wpar_no] = wpar_no unless wpar_no.to_i == 0
+
+  end
+end

data/lib/ohai/plugins/cloud.rb

@@ -24,6 +24,7 @@ Ohai.plugin(:Cloud) do
   depends "linode"
   depends "openstack"
   depends "azure"
+  depends "cloudstack"
 
   # Make top-level cloud hashes
   #
@@ -215,6 +216,31 @@ Ohai.plugin(:Cloud) do
     cloud[:provider] = "azure"
   end
 
+  # ----------------------------------------
+  # cloudstack
+  # ----------------------------------------
+
+  # Is current cloud cloudstack-based?
+  #
+  # === Return
+  # true:: If cloudstack Hash is defined
+  # false:: Otherwise
+  def on_cloudstack?
+    cloudstack != nil
+  end
+
+  # Fill cloud hash with cloudstack values
+  def get_cloudstack_values
+    cloud[:public_ips] << cloudstack['public_ipv4']
+    cloud[:private_ips] << cloudstack['local_ipv4']
+    cloud[:public_ipv4] = cloudstack['public_ipv4']
+    cloud[:public_hostname] = cloudstack['public_hostname']
+    cloud[:local_ipv4] = cloudstack['local_ipv4']
+    cloud[:local_hostname] = cloudstack['local_hostname']
+    cloud[:vm_id] = cloudstack['vm_id']
+    cloud[:provider] = "cloudstack"
+  end
+
   collect_data do    
     # setup gce cloud
     if on_gce?
@@ -256,5 +282,11 @@ Ohai.plugin(:Cloud) do
       create_objects
       get_azure_values
     end
+
+    # setup cloudstack cloud
+    if on_cloudstack?
+      create_objects
+      get_cloudstack_values
+    end
   end
 end

data/lib/ohai/plugins/cloudstack.rb

@@ -0,0 +1,43 @@
+#
+# Author:: Olle Lundberg (<geek@nerd.sh>)
+# Copyright:: Copyright (c) 2014 Opscode, 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 'ohai/mixin/cloudstack_metadata'
+
+Ohai.plugin(:Cloudstack) do
+  provides "cloudstack"
+
+  include Ohai::Mixin::CloudstackMetadata
+
+  collect_data do
+    # Adds cloudstack Mash
+    if hint?('cloudstack')
+      Ohai::Log.debug("found 'cloudstack' hint. Will try to connect to the metadata server")
+
+      if can_metadata_connect?(Ohai::Mixin::CloudstackMetadata::CLOUDSTACK_METADATA_ADDR, 80)
+        cloudstack Mash.new
+        Ohai::Log.debug("connecting to the 'cloudstack' metadata service")
+        fetch_metadata.each { |k, v| cloudstack[k] = v }
+      else
+        Ohai::Log.debug("unable to connect to the 'cloudstack' metadata service")
+      end
+    else
+      Ohai::Log.debug("unable to find 'cloudstack' hint. Won't connect to the metadata server.")
+    end
+  end
+end
+
+

data/lib/ohai/plugins/darwin/cpu.rb

@@ -29,9 +29,9 @@ Ohai.plugin(:CPU) do
     so = shell_out("sysctl -n hw.cpufrequency")
     cpu[:mhz] = so.stdout.to_i / 1000000
     so = shell_out("sysctl -n machdep.cpu.vendor")
-    cpu[:vendor_id] = so.stdout
+    cpu[:vendor_id] = so.stdout.chomp
     so = shell_out("sysctl -n machdep.cpu.brand_string")
-    cpu[:model_name] = so.stdout
+    cpu[:model_name] = so.stdout.chomp
     so = shell_out("sysctl -n machdep.cpu.model")
     cpu[:model] = so.stdout.to_i
     so = shell_out("sysctl -n machdep.cpu.family")

data/lib/ohai/plugins/go.rb

@@ -0,0 +1,30 @@
+# 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"
+
+  collect_data do
+    output = nil
+    go = Mash.new
+    so = shell_out("go version")
+    if so.exitstatus == 0
+      output = so.stdout.split
+      go[:version] = output[2].slice!(2..16)
+      languages[:go] = go if go[:version]
+    end
+  end
+end

data/lib/ohai/plugins/hostname.rb

@@ -67,7 +67,7 @@ Ohai.plugin(:Hostname) do
   def collect_hostname
     # Hostname is everything before the first dot
     if machinename
-      machinename =~ /(.+?)\./
+      machinename =~ /(\w+)\.?/
       hostname $1
     elsif fqdn
       fqdn =~ /(.+?)\./

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

@@ -32,6 +32,14 @@ Ohai.plugin(:Filesystem) do
     have_lsblk ? /^(\S+) (\S+)/ : /^(\S+): #{attr}="(\S+)"/
   end
 
+  def find_device(name)
+    %w{/dev /dev/mapper}.each do |dir|
+      path = File.join(dir, name)
+      return path if File.exist?(path)
+    end
+    name
+  end
+
   collect_data(:linux) do
     fs = Mash.new
     have_lsblk = File.executable?('/bin/lsblk')
@@ -82,7 +90,7 @@ Ohai.plugin(:Filesystem) do
       end
     end
 
-    have_lsblk = File.exists?('/bin/lsblk')
+    have_lsblk = File.exist?('/bin/lsblk')
 
     # Gather more filesystem types via libuuid, even devices that's aren't mounted
     cmd = get_blk_cmd('TYPE', have_lsblk)
@@ -91,8 +99,10 @@ Ohai.plugin(:Filesystem) do
     so.stdout.lines do |line|
       if line =~ regex
         filesystem = $1
+        type = $2
+        filesystem = find_device(filesystem) unless filesystem.start_with?('/')
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-        fs[filesystem][:fs_type] = $2
+        fs[filesystem][:fs_type] = type
       end
     end
 
@@ -103,8 +113,10 @@ Ohai.plugin(:Filesystem) do
     so.stdout.lines do |line|
       if line =~ regex
         filesystem = $1
+        uuid = $2
+        filesystem = find_device(filesystem) unless filesystem.start_with?('/')
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-        fs[filesystem][:uuid] = $2
+        fs[filesystem][:uuid] = uuid
       end
     end
 
@@ -115,13 +127,15 @@ Ohai.plugin(:Filesystem) do
     so.stdout.lines do |line|
       if line =~ regex
         filesystem = $1
+        label = $2
+        filesystem = find_device(filesystem) unless filesystem.start_with?('/')
         fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-        fs[filesystem][:label] = $2
+        fs[filesystem][:label] = label
       end
     end
 
     # Grab any missing mount information from /proc/mounts
-    if File.exists?('/proc/mounts')
+    if File.exist?('/proc/mounts')
       mounts = ''
       # Due to https://tickets.opscode.com/browse/OHAI-196
       # we have to non-block read dev files. Ew.