kurchatov 0.0.6 → 0.0.7.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f75c8dca0ef451afb605c85dc75cb15e7669a3c
-  data.tar.gz: a2573401456215589913a562bf8a0b889f710fd9
+  metadata.gz: f7e6c68a87238baaef79f95a9f6d6da2c1df1eb7
+  data.tar.gz: a196e3e7973c49d16657ab6cb88306091d87933b
 SHA512:
-  metadata.gz: 64c933fb2783d2cddea9d370c82ac7e5044749c64a1e3441ab1c14bb91c0fc98fa174745d76562dc0c2e46a02e575329d5a084c75fbc8a4f0b4c0b068f9eb7a6
-  data.tar.gz: 554337927ac11c606708306d47e2ac5a78458dab25d10970b577e71799042abbccfe002fe0f3f43fa83ac03d8b374b002e497aef8c6924acf8fe84289d2983b1
+  metadata.gz: 7ac544720faa2e0588b20aba059e7e8a55557e58c5c56c2056b8710ff09d1705abc95be805ac73cfdfdbe1d02d05c5bae47955cb4a34df1c351faf5093fd545c
+  data.tar.gz: 0159379599e421a6949a4aff2db8f0ab0cfa29ed027e2cf70748a3c45c35d54a4eb8afd0b69f45cbf4762eec1f553de9288d8b7b973fc95d6393f7c1dee331c8

data/CHANGELOG

@@ -4,3 +4,4 @@
 * Version 0.0.6.pre.4: Required block for plugin
 * Version 0.0.6.pre.5: Improve http responder, add monitor
 * Version 0.0.6: ruby 1.8.7 support
+* Version 0.0.7.pre.1: add FreeBSD support, responders as plugins

data/lib/kurchatov/application.rb

@@ -7,7 +7,6 @@ require 'kurchatov/config'
 require 'kurchatov/log'
 require 'kurchatov/mixin/init'
 require 'kurchatov/plugin/config'
-require 'kurchatov/responders/init'
 require 'kurchatov/monitor'
 
 module Kurchatov
@@ -116,23 +115,11 @@ module Kurchatov
       Config[:host] ||= ohai[:fqdn] || ohai[:hostname]
     end
 
-    def configure_responders
+    def load_plugins(path)
       return if Config[:test_plugin]
-      Log.error('Please set riemann host') and exit Config[:ERROR_CONFIG] unless Config[:riemann_responder]
-      if Config[:udp_responder]
-        monitor << Responders::Udp.new(Config[:udp_responder])
-      end
-      if Config[:http_responder]
-        monitor << Responders::Http.new(Config[:http_responder])
-      end
-      monitor << Responders::Riemann.new(Config[:riemann_responder])
-    end
-
-    def configure_plugins
-      return if Config[:test_plugin]
-      plugins = Kurchatov::Plugins::Config.load_plugins(Config[:plugin_paths],
+      plugins = Kurchatov::Plugins::Config.load_plugins(path,
                                                         Config[:config_file])
-      plugins.each { |p| monitor << p }
+      plugins.each {|p| monitor << p}
     end
 
     def configure_test_plugin
@@ -144,11 +131,10 @@ module Kurchatov
       configure_opts
       configure_logging
       configure_defaults
-      @monitor = Monitor.new(Config[:stop_on_error] || !!Config[:test_plugin])
-      configure_responders
-      configure_plugins
+      load_plugins(Config[:plugin_paths])
+      load_plugins(File.join(File.dirname(__FILE__),'responders'))
       configure_test_plugin
-      monitor.run
+      monitor.start
     end
 
   end

data/lib/kurchatov/monitor.rb

@@ -8,7 +8,7 @@ module Kurchatov
 
       def initialize(plugin)
         @plugin = plugin
-        @thread = Thread.new { @plugin.run }
+        @thread = Thread.new { @plugin.start }
         @count_errors = 0
         @last_error = nil
         @last_error_at = nil
@@ -42,7 +42,7 @@ module Kurchatov
             event(:service => 'riemann client errors', :desc => desc, :state => 'critical')
           end
         end
-        @thread = Thread.new { @plugin.run }
+        @thread = Thread.new { @plugin.start }
         true
       end
 
@@ -61,7 +61,7 @@ module Kurchatov
       @tasks << Task.new(plugin)
     end
 
-    def run
+    def start
       loop do
         @tasks.each { |t| exit Config[:ERROR_PLUGIN_REQ] if t.died? && @stop_on_error }
         Log.debug("Check alive plugins [#{@tasks.count}]")

data/lib/kurchatov/plugin/dsl.rb

@@ -45,6 +45,11 @@ module Kurchatov
         last.collect = block
       end
 
+      def run(opts = {}, *args, &block)
+        return unless last.respond_to_ohai?(opts)
+        last.run = block
+      end
+
       def run_if(opts = {}, &block)
         return unless last.respond_to_ohai?(opts)
         last.run_if = block
@@ -54,6 +59,7 @@ module Kurchatov
         return unless last.respond_to_ohai?(opts)
         last.required = block
       end
+      alias :helpers :required
 
       def last_plugin
         last.plugin
@@ -66,6 +72,7 @@ module Kurchatov
 
       def self.load_riemann_plugins(paths)
         dsl = Kurchatov::Plugins::DSL.new
+        paths = [paths] unless paths.kind_of? Array
         paths.map do |path|
           Log.error("Directory #{path} not exists") and exit Kurchatov::Config[:ERROR_CONFIG] unless
             File.directory?(path)

data/lib/kurchatov/plugin/riemann.rb

@@ -11,13 +11,16 @@ module Kurchatov
       include Kurchatov::Mixin::Event
       include Kurchatov::Mixin::Command
       include Kurchatov::Mixin::Http
+      include Kurchatov::Mixin::Queue
+      include Kurchatov::Mixin::Monitor
 
-      attr_accessor :run_if, :collect, :always_start, :required, :ignore_errors, :interval, :plugin
+      attr_accessor :run_if, :collect, :run, :always_start, :required, :ignore_errors, :interval, :plugin
 
       def initialize(name = '')
         super(name)
         @run_if = Proc.new { true }
         @required = Proc.new { true }
+        @run = nil
         @plugin = Mashie.new
         @always_start = false
         @ignore_errors = false
@@ -29,8 +32,12 @@ module Kurchatov
         plugin
       end
 
-      def run
+      def start
         super
+        run.nil? ? start_collect : start_run
+      end
+
+      def start_collect
         loop do
           t_start = Time.now
           Timeout::timeout(interval * 2.to_f/3) do
@@ -40,6 +47,10 @@ module Kurchatov
         end
       end
 
+      def start_run
+        self.instance_eval(&run)
+      end
+
       def respond_to_ohai?(opts = {})
         opts.each { |k, v| return false unless ohai[k] == v }
         true
@@ -55,7 +66,7 @@ module Kurchatov
       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 by run and collect nil") and return if (collect.nil? && run.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 unless self.instance_eval(&run_if)

data/lib/kurchatov/plugin.rb

@@ -9,7 +9,7 @@ module Kurchatov
       @always_start = false
     end
 
-    def run
+    def start
       #
     end
 

data/lib/kurchatov/responders/http.rb

@@ -1,44 +1,35 @@
-module Kurchatov
-  module Responders
-    class Http < Kurchatov::Plugin
+name 'http'
+always_start true
 
-      include Kurchatov::Mixin::Monitor
+default[:host], default[:port] = Kurchatov::Config[:http_responder].split(":")
 
-      def initialize(conn)
-        @host, @port = conn.split(':')
-        @name = "http server #{@host}:#{@port}"
-        @s_time = Time.now
-      end
-
-      def plugin_config
-        {:host => @host, :port => @port}
-      end
-
-      def run
-        super
-        @server ||= TCPServer.new(@host, @port)
-        loop do
-          client = @server.accept
-          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"
-          client.print headers
-          client.print response
-          client.close
-        end
-      end
+run_if do
+  !!Kurchatov::Config[:http_responder]
+end
 
-      def info
-        {
-            :version => Kurchatov::VERSION,
-            :uptime => (Time.now - @s_time).to_i,
-            :monitor => monitor.inspect,
-        }.to_json + "\n"
-      end
+helpers do
+  @s_time = Time.now
+  def json_info
+    {
+      :version => Kurchatov::VERSION,
+      :uptime => (Time.now - @s_time).to_i,
+      :monitor => monitor.inspect,
+    }.to_json + "\n"
+  end
+end
 
-    end
+run do
+  @server ||= TCPServer.new(plugin.host, plugin.port)
+  loop do
+    client = @server.accept
+    response = json_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"
+      client.print headers
+      client.print response
+      client.close
   end
 end

data/lib/kurchatov/responders/riemann.rb

@@ -1,49 +1,26 @@
 require 'kurchatov/riemann/client'
 
-module Kurchatov
-  module Responders
-    class Riemann < Kurchatov::Plugin
+name 'riemann'
+always_start true
 
-      include Kurchatov::Mixin::Queue
-
-      FLUSH_INTERVAL = 0.5
-
-      def initialize(conn)
-        @ignore_errors = true
-        @hosts = conn
-        @riemanns = Array.new
-      end
-
-      def plugin_config
-        {:hosts => @hosts}
-      end
-
-      def run
-        super
-        make_clients
-        loop { flush; sleep FLUSH_INTERVAL }
-      end
-
-      private
-
-      def make_clients
-        @riemanns.clear
-        @hosts.each do |host|
-          riemann, port = host.split(':')
-          @riemanns << Kurchatov::Riemann::Client.new(:host => riemann, :port => port)
-          @name = @riemanns.map { |c| "riemann client [#{c.host}:#{c.port}]" }.join(' , ')
-        end
-      end
-
-      def flush
-        @events_to_send ||= events.to_flush
-        unless @events_to_send.empty?
-          @riemanns.each { |riemann| riemann << @events_to_send }
-          Log.debug("Sended events via #{@name.inspect}: #{@events_to_send}")
-        end
-        @events_to_send = nil
-      end
+default[:hosts] = Kurchatov::Config[:riemann_responder]
 
+helpers do
+  def flush
+    @events_to_send ||= events.to_flush
+    unless @events_to_send.empty?
+      @riemanns.each { |riemann| riemann << @events_to_send }
+      Log.debug("Sended events: #{@events_to_send}")
     end
+    @events_to_send = nil
+  end
+end
+
+run do
+  @riemanns = []
+  plugin.hosts.each do |host|
+    riemann, port = host.split(':')
+    @riemanns << Kurchatov::Riemann::Client.new(:host => riemann, :port => port)
   end
+  loop { flush; sleep 0.5 }
 end

data/lib/kurchatov/responders/udp.rb

@@ -1,35 +1,26 @@
-module Kurchatov
-  module Responders
-    class Udp < Kurchatov::Plugin
+name 'udp'
+always_start true
 
-      include Kurchatov::Mixin::Event
+default[:host], default[:port] = Kurchatov::Config[:udp_responder].to_s.split(":")
 
-      def initialize(conn)
-        @host, @port = conn.split(':')
-        @name = "udp responder #{@host}:#{@port}"
-      end
-
-      def plugin_config
-        {:host => @host, :port => @port}
-      end
-
-      def run
-        super
-        Socket.udp_server_loop(@host, @port) do |data, src|
-          process(data, src)
-        end
-      end
-
-      def process(data, src)
-        begin
-          event(JSON.parse(data))
-          src.reply "sended\n\n"
-        rescue => e
-          src.reply "failed to send: #{data.inspect}\n"
-          Log.error("Failed parse #{data.inspect}, #{e.class}: #{e}\n #{e.backtrace.join("\n")}")
-        end
-      end
+run_if do
+  !!Kurchatov::Config[:udp_responder]
+end
 
+helpers do
+  def process(data, src)
+    begin
+      event(JSON.parse(data))
+      src.reply "sended\n\n"
+    rescue => e
+      src.reply "failed to send: #{data.inspect}\n"
+      Log.error("Failed parse #{data.inspect}, #{e.class}: #{e}\n #{e.backtrace.join("\n")}")
     end
   end
 end
+
+run do
+  Socket.udp_server_loop(plugin.host, plugin.port) do |data, src|
+    process(data, src)
+  end
+end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.0.6"
+  VERSION = "0.0.7.pre.1"
 end

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

@@ -0,0 +1,52 @@
+#
+# 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

@@ -0,0 +1,22 @@
+#
+# 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

@@ -0,0 +1,23 @@
+#
+# 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

@@ -0,0 +1,93 @@
+#
+# 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
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7.pre.1
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -166,7 +166,6 @@ files:
 - lib/kurchatov/plugin/riemann.rb
 - lib/kurchatov/queue.rb
 - lib/kurchatov/responders/http.rb
-- lib/kurchatov/responders/init.rb
 - lib/kurchatov/responders/riemann.rb
 - lib/kurchatov/responders/udp.rb
 - lib/kurchatov/riemann/client.rb
@@ -176,6 +175,10 @@ files:
 - 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
@@ -208,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3

data/lib/kurchatov/responders/init.rb

@@ -1,3 +0,0 @@
-require 'kurchatov/responders/http'
-require 'kurchatov/responders/riemann'
-require 'kurchatov/responders/udp'