kurchatov 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465cfbb25d231a3ffedaa85ac160858016fa0329
-  data.tar.gz: a82edc6e0e929895e07de030da62b371facc5b17
+  metadata.gz: a8d6eb36e174f42d37ad9c7cba3c33dd0c60fff4
+  data.tar.gz: 59be76330cb9ffdab86f2ea892f3c399b49ce99d
 SHA512:
-  metadata.gz: d67ebeb9d6914c97e7c791b67996ec784f8600226b695d2fb7def699365f25ebd7e334ee5c44d2f8c4323afab7256ff38e2848c2e8d2c98e1caae44344374ab1
-  data.tar.gz: 710f443ae3d5b56ceaa81111880f178aea99e9c3deebc09d2a99e408c029b29771db59d0f9d0a5bbc1fe46935ea3209caf6289ab7b03d1be5a562d898a307878
+  metadata.gz: e94b9621f4315d9657375eeb8197a8b54dc22ed0a97b56c27188162b8208fa962342bce75af7caf0ab4b08a325d24ca69ef44180f69f1692cf8f660cff00179b
+  data.tar.gz: c07a3581a3e1dbff6925a52a4585c98b92a16205e599ed520e836d27a859c76d1f7f5fbd911babb16a19ddb8ea52879dda9273ccf7ffef948f14a361e257ba42

data/app/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "kurchatov", "= 0.3.5"
+gem "kurchatov", "= 0.3.6"
 gem "beefcake", "=0.5.0"
 gem "sys-filesystem"
 gem "sys-proctable"

data/app/Gemfile.lock

@@ -11,7 +11,7 @@ GEM
     file-tail (1.0.12)
       tins (~> 0.5)
     ipaddress (0.8.0)
-    kurchatov (0.3.5)
+    kurchatov (0.3.6)
       beefcake (>= 0.3.5)
       ohai (~> 6.20.0)
     mixlib-cli (1.5.0)
@@ -46,7 +46,7 @@ DEPENDENCIES
   beefcake (= 0.5.0)
   ffi-rzmq
   file-tail
-  kurchatov (= 0.3.5)
+  kurchatov (= 0.3.6)
   net-ntp
   net-ping
   parallel

data/debian/changelog

@@ -1,3 +1,9 @@
+riemann-client (1:0.3.6) stable; urgency=low
+
+  * Max queue size.
+
+ -- Undev DevOps Team <devops@undev.ru>  Sun, 14 Aug 2014 05:13:45 +0000
+
 riemann-client (1:0.3.5) stable; urgency=low
 
   * Full ohai support.

data/lib/kurchatov/application.rb

@@ -108,8 +108,6 @@ module Kurchatov
     end
 
     def configure_defaults
-      ::Ohai::Config[:plugin_path] = [::Ohai::Config[:plugin_path], 
-        File.expand_path(File.join('..', 'ohai', 'plugins'), File.dirname(__FILE__))].flatten.compact
       if Config[:ohai_plugins_paths]
         ::Ohai::Config[:plugin_path] += Config[:ohai_plugins_paths]
       end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -182,24 +182,6 @@ files:
 - lib/kurchatov/riemann/event.rb
 - lib/kurchatov/riemann/message.rb
 - lib/kurchatov/version.rb
-- lib/ohai/plugins/darwin/cpu.rb
-- lib/ohai/plugins/darwin/hostname.rb
-- lib/ohai/plugins/darwin/platform.rb
-- lib/ohai/plugins/freebsd/cpu.rb
-- lib/ohai/plugins/freebsd/hostname.rb
-- lib/ohai/plugins/freebsd/platform.rb
-- lib/ohai/plugins/freebsd/virtualization.rb
-- lib/ohai/plugins/hostname.rb
-- lib/ohai/plugins/linux/cpu.rb
-- lib/ohai/plugins/linux/hostname.rb
-- lib/ohai/plugins/linux/platform.rb
-- lib/ohai/plugins/linux/virtualization.rb
-- lib/ohai/plugins/os.rb
-- lib/ohai/plugins/platform.rb
-- lib/ohai/plugins/virtualization.rb
-- lib/ohai/plugins/windows/cpu.rb
-- lib/ohai/plugins/windows/hostname.rb
-- lib/ohai/plugins/windows/platform.rb
 - tests/data/config.yml
 - tests/data/event.yml
 - tests/data/plugins/plugin_data.rb

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

@@ -1,23 +0,0 @@
-#
-# Author:: Nathan L Smith (<nlloyds@gmail.com>)
-# Copyright:: Copyright (c) 2013 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.
-#
-
-provides 'cpu'
-
-cpu Mash.new
-cpu[:real] = from('sysctl -n hw.physicalcpu').to_i
-cpu[:total] = from('sysctl -n hw.logicalcpu').to_i

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

@@ -1,22 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'fqdn', 'hostname'
-
-hostname from('hostname -s')
-fqdn from('hostname')

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

@@ -1,38 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'platform', 'platform_version', 'platform_build', 'platform_family'
-
-popen4('/usr/bin/sw_vers') do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-      when /^ProductName:\s+(.+)$/
-        macname = $1
-        macname.downcase!
-        macname.gsub!(' ', '_')
-        platform macname
-      when /^ProductVersion:\s+(.+)$/
-        platform_version $1
-      when /^BuildVersion:\s+(.+)$/
-        platform_build $1
-    end
-  end
-end
-
-platform_family 'mac_os_x'

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

@@ -1,52 +0,0 @@
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides "cpu"
-
-# all dmesg output for smp I can find only provides info about a single processor
-# identical processors is probably a hardware requirement so we'll duplicate data for each cpu
-# old examples: http://www.bnv-bamberg.de/home/ba3294/smp/rbuild/index.htm
-cpuinfo = Mash.new
-
-# /var/run/dmesg.boot
-#CPU: QEMU Virtual CPU version 0.9.1 (1862.02-MHz 686-class CPU)
-#  Origin = "GenuineIntel"  Id = 0x623  Stepping = 3
-#  Features=0x78bfbfd<FPU,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,MMX,FXSR,SSE,SSE2>
-#  Features2=0x80000001<SSE3,<b31>>
-
-File.open("/var/run/dmesg.boot").each do |line|
-  case line
-  when /CPU:\s+(.+) \(([\d.]+).+\)/
-    cpuinfo["model_name"] = $1
-    cpuinfo["mhz"] = $2
-  when /Origin = "(.+)"\s+Id = (.+)\s+Stepping = (.+)/
-    cpuinfo["vendor_id"] = $1
-    cpuinfo["stepping"] = $3
-  # These _should_ match /AMD Features2?/ lines as well 
-  when /Features=.+<(.+)>/
-    cpuinfo["flags"] = $1.downcase.split(',')
-  # Features2=0x80000001<SSE3,<b31>>
-  when /Features2=[a-f\dx]+<(.+)>/
-    cpuinfo["flags"].concat($1.downcase.split(','))
-  when /Logical CPUs per core: (\d+)/
-    cpuinfo["cores"] = $1
-  end
-end
-
-cpu cpuinfo
-cpu[:total] = from("sysctl -n hw.ncpu")

data/lib/ohai/plugins/freebsd/hostname.rb

@@ -1,22 +0,0 @@
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# 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.
-#
-
-provides "hostname", "fqdn"
-
-hostname from("hostname -s")
-fqdn from("hostname -f")

data/lib/ohai/plugins/freebsd/platform.rb

@@ -1,23 +0,0 @@
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# 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.
-#
-
-provides "platform", "platform_version"
-
-platform from("uname -s").downcase
-platform_version from("uname -r")
-

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

@@ -1,93 +0,0 @@
-#
-# Author:: Bryan McLellan (btm@loftninjas.org)
-# 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.
-#
-
-provides "virtualization"
-
-virtualization Mash.new
-
-if from("sysctl -n security.jail.jailed").to_i == 1
-  virtualization[:system] = "jail"
-  virtualization[:role] = "guest"
-end
-
-# detect from modules
-popen4("/sbin/kldstat") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /vboxdrv/
-      virtualization[:system] = "vbox"
-      virtualization[:role] = "host"
-    when /vboxguest/
-      virtualization[:system] = "vbox"
-      virtualization[:role] = "guest"
-    end
-  end
-end
-
-
-# XXX doesn't work when jail is there but not running (ezjail-admin stop)
-if from("jls -n \| wc -l").to_i >= 1
-    virtualization[:system] = "jail"
-    virtualization[:role] = "host"
-end
-
-# KVM Host support for FreeBSD is in development
-# http://feanor.sssup.it/~fabio/freebsd/lkvm/
-
-# Detect KVM/QEMU from cpu, report as KVM
-# hw.model: QEMU Virtual CPU version 0.9.1
-if from("sysctl -n hw.model") =~ /QEMU Virtual CPU/
-  virtualization[:system] = "kvm"
-  virtualization[:role] = "guest"
-end
-
-# http://www.dmo.ca/blog/detecting-virtualization-on-linux
-if File.exists?("/usr/local/sbin/dmidecode")
-  popen4("dmidecode") do |pid, stdin, stdout, stderr|
-    stdin.close
-    found_virt_manufacturer = nil
-    found_virt_product = nil
-    stdout.each do |line|
-      case line
-      when /Manufacturer: Microsoft/
-        found_virt_manufacturer = "microsoft"
-      when /Product Name: Virtual Machine/
-        found_virt_product = "microsoft"
-      when /Version: 5.0/
-        if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
-          virtualization[:system] = "virtualpc"
-          virtualization[:role] = "guest"
-        end
-      when /Version: VS2005R2/
-        if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
-          virtualization[:system] = "virtualserver"
-          virtualization[:role] = "guest"
-        end
-      when /Manufacturer: VMware/
-        found_virt_manufacturer = "vmware"
-      when /Product Name: VMware Virtual Platform/
-        if found_virt_manufacturer == "vmware" 
-          virtualization[:system] = "vmware"
-          virtualization[:role] = "guest"
-        end
-      end
-    end
-  end
-end
-

data/lib/ohai/plugins/hostname.rb

@@ -1,27 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'fqdn', 'domain'
-
-require_plugin "#{os}::hostname"
-
-# Domain is everything after the first dot
-if fqdn
-  fqdn =~ /.+?\.(.*)/
-  domain $1
-end

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

@@ -1,60 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'cpu'
-
-cpuinfo = Mash.new
-real_cpu = Mash.new
-cpu_number = 0
-current_cpu = nil
-
-File.open('/proc/cpuinfo').each do |line|
-  case line
-    when /processor\s+:\s(.+)/
-      cpuinfo[$1] = Mash.new
-      current_cpu = $1
-      cpu_number += 1
-    when /vendor_id\s+:\s(.+)/
-      cpuinfo[current_cpu]['vendor_id'] = $1
-    when /cpu family\s+:\s(.+)/
-      cpuinfo[current_cpu]['family'] = $1
-    when /model\s+:\s(.+)/
-      cpuinfo[current_cpu]['model'] = $1
-    when /stepping\s+:\s(.+)/
-      cpuinfo[current_cpu]['stepping'] = $1
-    when /physical id\s+:\s(.+)/
-      cpuinfo[current_cpu]['physical_id'] = $1
-      real_cpu[$1] = true
-    when /core id\s+:\s(.+)/
-      cpuinfo[current_cpu]['core_id'] = $1
-    when /cpu cores\s+:\s(.+)/
-      cpuinfo[current_cpu]['cores'] = $1
-    when /model name\s+:\s(.+)/
-      cpuinfo[current_cpu]['model_name'] = $1
-    when /cpu MHz\s+:\s(.+)/
-      cpuinfo[current_cpu]['mhz'] = $1
-    when /cache size\s+:\s(.+)/
-      cpuinfo[current_cpu]['cache_size'] = $1
-    when /flags\s+:\s(.+)/
-      cpuinfo[current_cpu]['flags'] = $1.split(' ')
-  end
-end
-
-cpu cpuinfo
-cpu[:total] = cpu_number
-cpu[:real] = real_cpu.keys.length

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

@@ -1,26 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'hostname', 'fqdn'
-
-hostname from('hostname -s')
-begin
-  fqdn from('hostname --fqdn')
-rescue
-  Ohai::Log.debug('hostname -f returned an error, probably no domain is set')
-end

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

@@ -1,113 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-def get_redhatish_platform(contents)
-  contents[/^Red Hat/i] ? 'redhat' : contents[/(\w+)/i, 1].downcase
-end
-
-def get_redhatish_version(contents)
-  contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
-end
-
-provides 'platform', 'platform_version', 'platform_family'
-
-require_plugin 'linux::lsb'
-
-# platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching 
-if File.exists?('/etc/oracle-release')
-  contents = File.read('/etc/oracle-release').chomp
-  platform 'oracle'
-  platform_version get_redhatish_version(contents)
-elsif File.exists?('/etc/enterprise-release')
-  contents = File.read('/etc/enterprise-release').chomp
-  platform 'oracle'
-  platform_version get_redhatish_version(contents)
-elsif File.exists?('/etc/debian_version')
-  # Ubuntu and Debian both have /etc/debian_version
-  # Ubuntu should always have a working lsb, debian does not by default
-  if lsb[:id] =~ /Ubuntu/i
-    platform 'ubuntu'
-    platform_version lsb[:release]
-  elsif lsb[:id] =~ /LinuxMint/i
-    platform 'linuxmint'
-    platform_version lsb[:release]
-  else
-    if File.exists?('/usr/bin/raspi-config')
-      platform 'raspbian'
-    else
-      platform 'debian'
-    end
-    platform_version File.read('/etc/debian_version').chomp
-  end
-elsif File.exists?('/etc/redhat-release')
-  contents = File.read('/etc/redhat-release').chomp
-  platform get_redhatish_platform(contents)
-  platform_version get_redhatish_version(contents)
-elsif File.exists?('/etc/system-release')
-  contents = File.read('/etc/system-release').chomp
-  platform get_redhatish_platform(contents)
-  platform_version get_redhatish_version(contents)
-elsif File.exists?('/etc/gentoo-release')
-  platform 'gentoo'
-  platform_version File.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
-elsif File.exists?('/etc/SuSE-release')
-  platform 'suse'
-  suse_release = File.read('/etc/SuSE-release')
-  platform_version suse_release.scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join('.')
-  platform_version suse_release.scan(/VERSION = ([\d\.]{2,})/).flatten.join('.') if platform_version == ''
-elsif File.exists?('/etc/slackware-version')
-  platform 'slackware'
-  platform_version File.read('/etc/slackware-version').scan(/(\d+|\.+)/).join
-elsif File.exists?('/etc/arch-release')
-  platform 'arch'
-  # no way to determine platform_version in a rolling release distribution
-  # kernel release will be used - ex. 2.6.32-ARCH
-elsif lsb[:id] =~ /RedHat/i
-  platform 'redhat'
-  platform_version lsb[:release]
-elsif lsb[:id] =~ /Amazon/i
-  platform 'amazon'
-  platform_version lsb[:release]
-elsif lsb[:id] =~ /ScientificSL/i
-  platform 'scientific'
-  platform_version lsb[:release]
-elsif lsb[:id] =~ /XenServer/i
-  platform 'xenserver'
-  platform_version lsb[:release]
-elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties 
-  platform lsb[:id].downcase
-  platform_version lsb[:release]
-end
-
-
-case platform
-  when /debian/, /ubuntu/, /linuxmint/, /raspbian/
-    platform_family 'debian'
-  when /fedora/
-    platform_family 'fedora'
-  when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
-    platform_family 'rhel'
-  when /suse/
-    platform_family 'suse'
-  when /gentoo/
-    platform_family 'gentoo'
-  when /slackware/
-    platform_family 'slackware'
-  when /arch/
-    platform_family 'arch'
-end

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

@@ -1,125 +0,0 @@
-#
-# Author:: Thom May (<thom@clearairturbulence.org>)
-# Copyright:: Copyright (c) 2009 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.
-#
-
-provides 'virtualization'
-
-virtualization Mash.new
-
-# if it is possible to detect paravirt vs hardware virt, it should be put in
-# virtualization[:mechanism]
-
-## Xen
-# /proc/xen is an empty dir for EL6 + Linode Guests
-if File.exists?('/proc/xen')
-  virtualization[:system] = 'xen'
-  # Assume guest
-  virtualization[:role] = 'guest'
-
-  # This file should exist on most Xen systems, normally empty for guests
-  if File.exists?('/proc/xen/capabilities')
-    if File.read('/proc/xen/capabilities') =~ /control_d/i
-      virtualization[:role] = 'host'
-    end
-  end
-end
-
-# Xen Notes:
-# - cpuid of guests, if we could get it, would also be a clue
-# - may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
-# - EL6 guests carry a 'hypervisor' cpu flag
-# - Additional edge cases likely should not change the above assumptions
-#   but rather be additive - btm
-
-# Detect from kernel module
-if File.exists?('/proc/modules')
-  modules = File.read('/proc/modules')
-  if modules =~ /^kvm/
-    virtualization[:system] = 'kvm'
-    virtualization[:role] = 'host'
-  elsif modules =~ /^vboxdrv/
-    virtualization[:system] = 'vbox'
-    virtualization[:role] = 'host'
-  elsif modules =~ /^vboxguest/
-    virtualization[:system] = 'vbox'
-    virtualization[:role] = 'guest'
-  end
-end
-
-# Detect KVM/QEMU from cpuinfo, report as KVM
-# We could pick KVM from 'Booting paravirtualized kernel on KVM' in dmesg
-# 2.6.27-9-server (intrepid) has this / 2.6.18-6-amd64 (etch) does not
-# It would be great if we could read pv_info in the kernel
-# Wait for reply to: http://article.gmane.org/gmane.comp.emulators.kvm.devel/27885
-if File.exists?('/proc/cpuinfo')
-  if File.read('/proc/cpuinfo') =~ /QEMU Virtual CPU/
-    virtualization[:system] = 'kvm'
-    virtualization[:role] = 'guest'
-  end
-end
-
-# Detect OpenVZ / Virtuozzo.
-# http://wiki.openvz.org/BC_proc_entries
-if File.exists?('/proc/bc/0')
-  virtualization[:system] = 'openvz'
-  virtualization[:role] = 'host'
-elsif File.exists?('/proc/vz')
-  virtualization[:system] = 'openvz'
-  virtualization[:role] = 'guest'
-end
-
-# http://www.dmo.ca/blog/detecting-virtualization-on-linux
-if File.exists?('/usr/sbin/dmidecode')
-  popen4('dmidecode') do |pid, stdin, stdout, stderr|
-    stdin.close
-    dmi_info = stdout.read
-    case dmi_info
-      when /Manufacturer: Microsoft/
-        if dmi_info =~ /Product Name: Virtual Machine/
-          virtualization[:system] = 'virtualpc'
-          virtualization[:role] = 'guest'
-        end
-      when /Manufacturer: VMware/
-        if dmi_info =~ /Product Name: VMware Virtual Platform/
-          virtualization[:system] = 'vmware'
-          virtualization[:role] = 'guest'
-        end
-      when /Manufacturer: Xen/
-        if dmi_info =~ /Product Name: HVM domU/
-          virtualization[:system] = 'xen'
-          virtualization[:role] = 'guest'
-        end
-      else
-        nil
-    end
-
-  end
-end
-
-# Detect Linux-VServer
-if File.exists?('/proc/self/status')
-  proc_self_status = File.read('/proc/self/status')
-  vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
-  if vxid and vxid[2]
-    virtualization[:system] = 'linux-vserver'
-    if vxid[2] == '0'
-      virtualization[:role] = 'host'
-    else
-      virtualization[:role] = 'guest'
-    end
-  end
-end

data/lib/ohai/plugins/os.rb

@@ -1,53 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'os', 'os_version'
-
-require 'rbconfig'
-
-require_plugin 'kernel'
-
-case ::RbConfig::CONFIG['host_os']
-  when /aix(.+)$/
-    os 'aix'
-  when /darwin(.+)$/
-    os 'darwin'
-  when /hpux(.+)$/
-    os 'hpux'
-  when /linux/
-    os 'linux'
-  when /freebsd(.+)$/
-    os 'freebsd'
-  when /openbsd(.+)$/
-    os 'openbsd'
-  when /netbsd(.*)$/
-    os 'netbsd'
-  when /solaris2/
-    os 'solaris2'
-  when /mswin|mingw32|windows/
-    # After long discussion in IRC the "powers that be" have come to a concensus
-    # that there is no other Windows platforms exist that were not based on the
-    # Windows_NT kernel, so we herby decree that "windows" will refer to all
-    # platforms built upon the Windows_NT kernel and have access to win32 or win64
-    # subsystems.
-    os 'windows'
-  else
-    os ::RbConfig::CONFIG['host_os']
-end
-
-os_version kernel[:release]

data/lib/ohai/plugins/platform.rb

@@ -1,28 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-provides 'platform', 'platform_version', 'platform_family'
-
-require_plugin "#{os}::platform"
-
-platform os unless attribute?('platform')
-
-platform_version os_version unless attribute?('platform_version')
-
-platform_family platform unless attribute?('platform_family')
-

data/lib/ohai/plugins/virtualization.rb

@@ -1,86 +0,0 @@
-#
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Copyright:: Copyright (c) 2009 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.
-#
-
-provides 'virtualization'
-
-require_plugin "#{os}::virtualization"
-
-unless virtualization.nil? || !(virtualization[:role].eql?('host'))
-  begin
-    require 'libvirt'
-    require 'hpricot'
-
-    emu = (virtualization[:system].eql?('kvm') ? 'qemu' : virtualization[:system])
-    virtualization[:libvirt_version] = Libvirt::version(emu)[0].to_s
-
-    virtconn = Libvirt::open_read_only("#{emu}:///system")
-
-    virtualization[:uri] = virtconn.uri
-    virtualization[:capabilities] = Mash.new
-    virtualization[:capabilities][:xml_desc] = (virtconn.capabilities.split("\n").collect { |line| line.strip }).join
-    #xdoc = Hpricot virtualization[:capabilities][:xml_desc]
-
-    virtualization[:nodeinfo] = Mash.new
-    ni = virtconn.node_get_info
-    %w(cores cpus memory mhz model nodes sockets threads).each { |a| virtualization[:nodeinfo][a] = ni.send(a) }
-
-    virtualization[:domains] = Mash.new
-    virtconn.list_domains.each do |d|
-      dv = virtconn.lookup_domain_by_id d
-      virtualization[:domains][dv.name] = Mash.new
-      virtualization[:domains][dv.name][:id] = d
-      virtualization[:domains][dv.name][:xml_desc] = (dv.xml_desc.split("\n").collect { |line| line.strip }).join
-      %w(os_type uuid).each { |a| virtualization[:domains][dv.name][a] = dv.send(a) }
-      %w(cpu_time max_mem memory nr_virt_cpu state).each { |a| virtualization[:domains][dv.name][a] = dv.info.send(a) }
-      #xdoc = Hpricot virtualization[:domains][dv.name][:xml_desc]
-
-    end
-
-    virtualization[:networks] = Mash.new
-    virtconn.list_networks.each do |n|
-      nv = virtconn.lookup_network_by_name n
-      virtualization[:networks][n] = Mash.new
-      virtualization[:networks][n][:xml_desc] = (nv.xml_desc.split("\n").collect { |line| line.strip }).join
-      %w(bridge_name uuid).each { |a| virtualization[:networks][n][a] = nv.send(a) }
-      #xdoc = Hpricot virtualization[:networks][n][:xml_desc]
-
-    end
-
-    virtualization[:storage] = Mash.new
-    virtconn.list_storage_pools.each do |pool|
-      sp = virtconn.lookup_storage_pool_by_name pool
-      virtualization[:storage][pool] = Mash.new
-      virtualization[:storage][pool][:xml_desc] = (sp.xml_desc.split("\n").collect { |line| line.strip }).join
-      %w(autostart uuid).each { |a| virtualization[:storage][pool][a] = sp.send(a) }
-      %w(allocation available capacity state).each { |a| virtualization[:storage][pool][a] = sp.info.send(a) }
-      #xdoc = Hpricot virtualization[:storage][pool][:xml_desc]
-
-      virtualization[:storage][pool][:volumes] = Mash.new
-      sp.list_volumes.each do |v|
-        virtualization[:storage][pool][:volumes][v] = Mash.new
-        sv = sp.lookup_volume_by_name v
-        %w(key name path).each { |a| virtualization[:storage][pool][:volumes][v][a] = sv.send(a) }
-        %w(allocation capacity type).each { |a| virtualization[:storage][pool][:volumes][v][a] = sv.info.send(a) }
-      end
-    end
-
-    virtconn.close
-  rescue LoadError => e
-    Ohai::Log.debug("Can't load gem: #{e}.  virtualization plugin is disabled.")
-  end
-end

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

@@ -1,64 +0,0 @@
-#
-# Author:: Doug MacEachern <dougm@vmware.com>
-# Copyright:: Copyright (c) 2010 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.
-#
-
-require 'ruby-wmi'
-
-provides 'cpu'
-
-cpuinfo = Mash.new
-cpu_number = 0
-index = 0
-
-WMI::Win32_Processor.find(:all).each do |processor|
-  #
-  # On Windows Server 2003 R2 (i.e. 5.2.*), numberofcores property 
-  # doesn't exist on the Win32_Processor class unless the user has
-  # patched their system with:
-  # http://support.microsoft.com/kb/932370
-  # 
-  # We're returning nil for cpu["cores"] and cpu["count"]
-  # when we don't see numberofcores property
-  #
-
-  number_of_cores = nil
-  begin
-    number_of_cores = processor.numberofcores
-    cpu_number += number_of_cores
-  rescue NoMethodError => e
-    Ohai::Log.info('Can not find numberofcores property on Win32_Processor. Consider applying this patch: http://support.microsoft.com/kb/932370')
-  end
-
-  current_cpu = index.to_s
-  index += 1
-  cpuinfo[current_cpu] = Mash.new
-  cpuinfo[current_cpu]['vendor_id'] = processor.manufacturer
-  cpuinfo[current_cpu]['family'] = processor.family.to_s
-  cpuinfo[current_cpu]['model'] = processor.revision.to_s
-  cpuinfo[current_cpu]['stepping'] = processor.stepping
-  cpuinfo[current_cpu]['physical_id'] = processor.deviceid
-  #cpuinfo[current_cpu]["core_id"] = XXX
-  cpuinfo[current_cpu]['cores'] = number_of_cores
-  cpuinfo[current_cpu]['model_name'] = processor.description
-  cpuinfo[current_cpu]['mhz'] = processor.maxclockspeed.to_s
-  cpuinfo[current_cpu]['cache_size'] = "#{processor.l2cachesize} KB"
-  #cpuinfo[current_cpu]["flags"] = XXX
-end
-
-cpu cpuinfo
-cpu[:total] = (cpu_number == 0) ? nil : cpu_number
-cpu[:real] = index

data/lib/ohai/plugins/windows/hostname.rb

@@ -1,33 +0,0 @@
-#
-# Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2009 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 'ruby-wmi'
-require 'socket'
-
-host = WMI::Win32_ComputerSystem.find(:first)
-hostname "#{host.Name}"
-
-info = Socket.gethostbyname(Socket.gethostname)
-if info.first =~ /.+?\.(.*)/
-  fqdn info.first
-else
-  #host is not in dns. optionally use:
-  #C:\WINDOWS\system32\drivers\etc\hosts
-  fqdn Socket.gethostbyaddr(info.last).first
-end
-

data/lib/ohai/plugins/windows/platform.rb

@@ -1,27 +0,0 @@
-#
-# Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) 2009 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.
-#
-
-# After long discussion in IRC the "powers that be" have come to a concensus
-# that there is no other Windows platforms exist that were not based on the
-# Windows_NT kernel, so we herby decree that "windows" will refer to all
-# platforms built upon the Windows_NT kernel and have access to win32 or win64
-# subsystems.
-platform os
-platform_version kernel['release']
-platform_family 'windows'
-