kurchatov 0.0.5.pre5 → 0.0.5

data/lib/kurchatov/plugin/riemann.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 
-require "kurchatov/plugin"
-require "kurchatov/mashie"
+require 'kurchatov/plugin'
+require 'kurchatov/mashie'
 
 module Kurchatov
   module Plugins
     class Riemann < Kurchatov::Plugin
 
-      include Kurchatov::Mixin::Queue
       include Kurchatov::Mixin::Ohai
       include Kurchatov::Mixin::Event
       include Kurchatov::Mixin::Command
@@ -17,7 +16,7 @@ module Kurchatov
 
       def initialize(name = '')
         super(name)
-        @run_if = Proc.new {true}
+        @run_if = Proc.new { true }
         @plugin = Mashie.new
         @always_start = false
         @collect = nil
@@ -35,15 +34,15 @@ module Kurchatov
       end
 
       def respond_to_ohai?(opts = {})
-        opts.each { |k,v| return false unless ohai[k] == v }
+        opts.each { |k, v| return false unless ohai[k] == v }
         true
       end
 
       def runnable_by_config?
         Log.info("Plugin '#{self.name}' disabled by nil collect") and return if collect.nil?
-        Log.info("Plugin '#{self.name}' disabled in config") and return if plugin[:disable] == true
-        Log.info("Plugin '#{self.name}' not started by run_if condition ") and 
-          return if !self.instance_eval(&run_if)
+        Log.info("Plugin '#{self.name}' disabled in config") and return if (plugin[:disable] == true)
+        Log.info("Plugin '#{self.name}' not started by run_if condition ") and
+            return unless self.instance_eval(&run_if)
         @plugin[:service] = name if @plugin[:service].nil?
         true
       end

data/lib/kurchatov/responders/http.rb

@@ -15,9 +15,9 @@ module Kurchatov
           response = info
           client.gets
           headers = "HTTP/1.1 200 OK\r\n" +
-            "Server: Kurchatov Ruby\r\n" +
-            "Content-Length: #{response.bytesize}\r\n" +
-            "Content-Type: application/json\r\n\r\n"
+              "Server: Kurchatov Ruby\r\n" +
+              "Content-Length: #{response.bytesize}\r\n" +
+              "Content-Type: application/json\r\n\r\n"
           client.print headers
           client.print response
           client.close
@@ -26,9 +26,9 @@ module Kurchatov
 
       def info
         {
-          :version => Kurchatov::VERSION,
-          :uptime => (Time.now - @s_time).to_i,
-          :config => Kurchatov::Config.to_hash,
+            :version => Kurchatov::VERSION,
+            :uptime => (Time.now - @s_time).to_i,
+            :config => Kurchatov::Config.to_hash,
         }.to_json + "\n"
       end
 

data/lib/kurchatov/responders/init.rb

@@ -1,3 +1,3 @@
-require_relative "http"
-require_relative "riemann"
-require_relative "udp"
+require_relative 'http'
+require_relative 'riemann'
+require_relative 'udp'

data/lib/kurchatov/responders/riemann.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require "kurchatov/riemann/client"
+require 'kurchatov/riemann/client'
 
 module Kurchatov
   module Responders
@@ -34,7 +32,7 @@ module Kurchatov
       def flush
         @events_to_send ||= events.all
         unless @events_to_send.empty?
-          @riemanns.each {|riemann| riemann << @events_to_send }
+          @riemanns.each { |riemann| riemann << @events_to_send }
           Log.debug("Sended events via #{@name.inspect}: #{@events_to_send}")
         end
         @events_to_send = nil

data/lib/kurchatov/responders/udp.rb

@@ -3,7 +3,6 @@ module Kurchatov
     class Udp < Kurchatov::Plugin
 
       include Kurchatov::Mixin::Event
-      include Kurchatov::Mixin::Queue
 
       def initialize(conn)
         @host, @port = conn.split(':')
@@ -17,9 +16,9 @@ module Kurchatov
         end
       end
 
-      def process(data,src)
+      def process(data, src)
         begin
-          event << JSON.parse(data)
+          event(JSON.parse(data))
           src.reply "sended\n\n"
         rescue => e
           src.reply "failed to send: #{data.inspect}\n"

data/lib/kurchatov/riemann/client.rb

@@ -1,6 +1,6 @@
-require "timeout"
-require "socket"
-require "kurchatov/riemann/message"
+require 'timeout'
+require 'socket'
+require 'kurchatov/riemann/message'
 
 module Kurchatov
   module Riemann
@@ -19,15 +19,15 @@ module Kurchatov
       end
 
       def <<(events)
-       events = events.map {|e| Event.new(e) }
-       message = Message.new(:events => events)
-       with_connection do |socket|
-        x = message.encode_with_length
-        Timeout::timeout(SEND_TIMEOUT) {
-          socket.write(x)
-          socket.flush
-        }
-       end
+        events = events.map { |e| Event.new(e) }
+        message = Message.new(:events => events)
+        with_connection do |socket|
+          x = message.encode_with_length
+          Timeout::timeout(SEND_TIMEOUT) {
+            socket.write(x)
+            socket.flush
+          }
+        end
       end
 
       def with_connection

data/lib/kurchatov/riemann/event.rb

@@ -3,7 +3,7 @@ module Kurchatov
     class Event
       include Beefcake::Message
       optional :time, :int64, 1
-      optional :state, :string,  2
+      optional :state, :string, 2
       optional :service, :string, 3
       optional :host, :string, 4
       optional :description, :string, 5

data/lib/kurchatov/riemann/message.rb

@@ -1,5 +1,5 @@
-require "beefcake"
-require "kurchatov/riemann/event"
+require 'beefcake'
+require 'kurchatov/riemann/event'
 
 module Kurchatov
   module Riemann

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.0.5.pre5"
+  VERSION = "0.0.5"
 end

data/lib/kurchatov.rb

@@ -1,3 +1,5 @@
-require "kurchatov/version"
+require 'kurchatov/version'
 
-module Kurchatov; end
+module Kurchatov
+  ;
+end

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

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-provides "cpu"
+provides 'cpu'
 
 cpu Mash.new
-cpu[:real]  = from("sysctl -n hw.physicalcpu").to_i
-cpu[:total] = from("sysctl -n hw.logicalcpu").to_i
+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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-provides "fqdn", "hostname"
+provides 'fqdn', 'hostname'
 
-hostname from("hostname -s")
-fqdn from("hostname")
+hostname from('hostname -s')
+fqdn from('hostname')

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

@@ -16,23 +16,23 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version", "platform_build", "platform_family"
+provides 'platform', 'platform_version', 'platform_build', 'platform_family'
 
-popen4("/usr/bin/sw_vers") do |pid, stdin, stdout, stderr|
+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
+      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"
+platform_family 'mac_os_x'

data/lib/ohai/plugins/hostname.rb

@@ -16,12 +16,12 @@
 # limitations under the License.
 #
 
-provides "fqdn", "domain"
+provides 'fqdn', 'domain'
 
 require_plugin "#{os}::hostname"
 
 # Domain is everything after the first dot
 if fqdn
   fqdn =~ /.+?\.(.*)/
-  domain $1 
+  domain $1
 end

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

@@ -16,42 +16,42 @@
 # limitations under the License.
 #
 
-provides "cpu"
+provides 'cpu'
 
 cpuinfo = Mash.new
 real_cpu = Mash.new
 cpu_number = 0
 current_cpu = nil
 
-File.open("/proc/cpuinfo").each do |line|
+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(' ')
+    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
 

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

@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-provides "hostname", "fqdn"
+provides 'hostname', 'fqdn'
 
-hostname from("hostname -s")
+hostname from('hostname -s')
 begin
-  fqdn from("hostname --fqdn")
+  fqdn from('hostname --fqdn')
 rescue
-  Ohai::Log.debug("hostname -f returned an error, probably no domain is set")
+  Ohai::Log.debug('hostname -f returned an error, probably no domain is set')
 end

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

@@ -17,77 +17,77 @@
 #
 
 def get_redhatish_platform(contents)
-  contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
+  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"
+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"
+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"
+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")
+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 'ubuntu'
     platform_version lsb[:release]
   elsif lsb[:id] =~ /LinuxMint/i
-    platform "linuxmint"
+    platform 'linuxmint'
     platform_version lsb[:release]
-  else 
-    if File.exists?("/usr/bin/raspi-config")
-      platform "raspbian"
+  else
+    if File.exists?('/usr/bin/raspi-config')
+      platform 'raspbian'
     else
-      platform "debian"
+      platform 'debian'
     end
-    platform_version File.read("/etc/debian_version").chomp
+    platform_version File.read('/etc/debian_version').chomp
   end
-elsif File.exists?("/etc/redhat-release")
-  contents = File.read("/etc/redhat-release").chomp
+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
+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 '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 == ""
+  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
+  platform 'slackware'
+  platform_version File.read('/etc/slackware-version').scan(/(\d+|\.+)/).join
 elsif File.exists?('/etc/arch-release')
-  platform "arch"
+  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 'redhat'
   platform_version lsb[:release]
 elsif lsb[:id] =~ /Amazon/i
-  platform "amazon"
+  platform 'amazon'
   platform_version lsb[:release]
 elsif lsb[:id] =~ /ScientificSL/i
-  platform "scientific"
+  platform 'scientific'
   platform_version lsb[:release]
 elsif lsb[:id] =~ /XenServer/i
-  platform "xenserver"
+  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
@@ -97,17 +97,17 @@ end
 
 case platform
   when /debian/, /ubuntu/, /linuxmint/, /raspbian/
-    platform_family "debian"
+    platform_family 'debian'
   when /fedora/
-    platform_family "fedora"
+    platform_family 'fedora'
   when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /amazon/, /xenserver/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID"
-    platform_family "rhel"
+    platform_family 'rhel'
   when /suse/
-    platform_family "suse"
+    platform_family 'suse'
   when /gentoo/
-    platform_family "gentoo"
+    platform_family 'gentoo'
   when /slackware/
-    platform_family "slackware"
-  when /arch/ 
-    platform_family "arch" 
+    platform_family 'slackware'
+  when /arch/
+    platform_family 'arch'
 end

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-provides "virtualization"
+provides 'virtualization'
 
 virtualization Mash.new
 
@@ -25,15 +25,15 @@ virtualization Mash.new
 
 ## Xen
 # /proc/xen is an empty dir for EL6 + Linode Guests
-if File.exists?("/proc/xen")
-  virtualization[:system] = "xen"
+if File.exists?('/proc/xen')
+  virtualization[:system] = 'xen'
   # Assume guest
-  virtualization[:role] = "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"
+  if File.exists?('/proc/xen/capabilities')
+    if File.read('/proc/xen/capabilities') =~ /control_d/i
+      virtualization[:role] = 'host'
     end
   end
 end
@@ -46,17 +46,17 @@ end
 #   but rather be additive - btm
 
 # Detect from kernel module
-if File.exists?("/proc/modules")
-  modules = File.read("/proc/modules")
+if File.exists?('/proc/modules')
+  modules = File.read('/proc/modules')
   if modules =~ /^kvm/
-    virtualization[:system] = "kvm"
-    virtualization[:role] = "host"
+    virtualization[:system] = 'kvm'
+    virtualization[:role] = 'host'
   elsif modules =~ /^vboxdrv/
-    virtualization[:system] = "vbox"
-    virtualization[:role] = "host"
+    virtualization[:system] = 'vbox'
+    virtualization[:role] = 'host'
   elsif modules =~ /^vboxguest/
-    virtualization[:system] = "vbox"
-    virtualization[:role] = "guest"
+    virtualization[:system] = 'vbox'
+    virtualization[:role] = 'guest'
   end
 end
 
@@ -65,61 +65,61 @@ end
 # 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"
+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"
+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|
+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
+      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")
+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"
+    virtualization[:system] = 'linux-vserver'
+    if vxid[2] == '0'
+      virtualization[:role] = 'host'
     else
-      virtualization[:role] = "guest"
-     end
+      virtualization[:role] = 'guest'
+    end
   end
 end