kurchatov 0.0.2 → 0.0.3a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d8e19a3299c7b327e47c8ba767f43b37b216f6
-  data.tar.gz: 44dd8f2603f2198ee0ff37cd9d2d90f00d4c6ee8
+  metadata.gz: 924266d6a2e4a98b5ecf7e376073cdb998c51b43
+  data.tar.gz: 909b8479425281711493f555c18a4832bf6ee3d7
 SHA512:
-  metadata.gz: 5efe7fb43d65e52b4b1f1e71f3ed9414e5a3b5ea7920eb27e3ad4164a97c3a083d9f865868afae3c2051148897e9bf1ef127f9b46b7af28abbb2109b7df3e452
-  data.tar.gz: 9d8e90d51336a578e894a1ac6c49a187f0beaf434d786bff7b0ab28a553d0305bde729abdc1a436673fefcec0a10ebf95bfa6423ca93141ce624f12934302620
+  metadata.gz: 6f82070f5217b37fb8130d1e2feef4b0c42a3299c819deab885e99b7eb4faef57ef1a8de0920170ffdbeec16890e6e0669aa130e19cad7795e5dedc60a8c74d8
+  data.tar.gz: b0c0940c7c14ca3b972397cc11776c382643b0b8061b4a023abeca188470cf32ac521649e7fa6b7301cbb066d9aa7c20a38f89fd38eae3dc553205cd0577160a

data/examples/la.rb

@@ -1,11 +1,15 @@
 always_start true
 interval 60
 
+default[:cpu] = ohai[:cpu][:real]
+
 collect :os => "linux" do
   event(
     :metric      => File.read('/proc/loadavg').scan(/[\d\.]+/)[0].to_f,
     :desc => 'LA averaged over 1 minute',
-    :service     => 'la la_1'
+    :service     => 'la la_1',
+    :warning     => plugin.cpu,
+    :critical    => plugin.cpu * 2
   )
 end
 
@@ -13,6 +17,8 @@ collect :os => "darwin" do
   event(
     :metric      => shell('uptime | cut -d":" -f4- | sed s/,//g').to_f,
     :desc => 'LA averaged over 1 minute',
-    :service     => 'la la_1'
+    :service     => 'la la_1',
+    :warning     => plugin.cpu,
+    :critical    => plugin.cpu * 2
   )
 end

data/examples/uptime.rb

@@ -9,6 +9,6 @@ end
 
 collect :os => "darwin" do
   event(
-    :metric => shell('uptime | cut -d":" -f4- | sed s/,//g').to_f
+    :metric => shell("sysctl -n kern.boottime | awk '{print $4}'").to_f
   )
 end

data/lib/kurchatov/application.rb

@@ -1,13 +1,14 @@
 # encoding: utf-8
 
+require "ohai/system"
 require "mixlib/cli"
 require "kurchatov/version"
 require "kurchatov/config"
 require "kurchatov/log"
 require "kurchatov/mixin/init"
 require "kurchatov/plugin/config"
-require "kurchatov/monitor"
 require "kurchatov/responders/init"
+require "kurchatov/monitor"
 
 module Kurchatov
   class Aplication

data/lib/kurchatov/config.rb

@@ -1,5 +1,3 @@
-require "mixlib/config"
-
 module Kurchatov
   class Config
     extend Mixlib::Config

data/lib/kurchatov/log.rb

@@ -1,5 +1,3 @@
-require "mixlib/log"
-
 module Kurchatov
   class Log
     extend Mixlib::Log

data/lib/kurchatov/mixin/command.rb

@@ -1,5 +1,3 @@
-require "mixlib/shellout"
-
 module Kurchatov
   module Mixin
     module Command

data/lib/kurchatov/mixin/ohai.rb

@@ -1,5 +1,3 @@
-require "ohai"
-
 module Kurchatov
 
   module Ohai

data/lib/kurchatov/monitor.rb

@@ -1,5 +1,3 @@
-require "kurchatov/mixin/queue"
-
 module Kurchatov
   class Monitor
 

data/lib/kurchatov/plugin/config.rb

@@ -41,7 +41,7 @@ module Kurchatov
           #
           if val.is_a?(Hash) && val.has_key?('parent')
             parent = find_plugin(val['parent'], @all_plugins)
-            Log.error("Unable to find parent '#{parent_name}' for '#{name}'") and next if parent.nil?
+            Log.error("Unable to find parent '#{parent}' for '#{name}'") and next if parent.nil?
             child = parent.dup
             child.name = name
             child.plugin = parent.plugin.dup

data/lib/kurchatov/plugin/dsl.rb

@@ -2,6 +2,8 @@ module Kurchatov
   module Plugins
     class DSL
 
+      include Kurchatov::Mixin::Ohai
+
       attr_reader :plugins
       PLUGIN_EXT = '.rb'
 
@@ -19,7 +21,7 @@ module Kurchatov
       end
 
       def interval(val)
-        last.interval = val
+        last.interval = val.to_f
       end
 
       def name(val)

data/lib/kurchatov/plugin/riemann.rb

@@ -2,7 +2,6 @@
 
 require "kurchatov/plugin"
 require "kurchatov/mashie"
-require "kurchatov/mixin/init"
 
 module Kurchatov
   module Plugins
@@ -22,7 +21,7 @@ module Kurchatov
         @plugin = Mashie.new
         @always_start = false
         @collect = nil
-        @interval = 60
+        @interval = 60.0
       end
 
       def run

data/lib/kurchatov/responders/riemann.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require "kurchatov/riemann/client"
-require "kurchatov/mixin/queue"
 
 module Kurchatov
   module Responders

data/lib/kurchatov/riemann/client.rb

@@ -1,7 +1,5 @@
 require "timeout"
 require "socket"
-require "beefcake"
-require "kurchatov/riemann/event"
 require "kurchatov/riemann/message"
 
 module Kurchatov

data/lib/kurchatov/riemann/message.rb

@@ -1,3 +1,6 @@
+require "beefcake"
+require "Kurchatov/riemann/event"
+
 module Kurchatov
   module Riemann
     class Message

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.0.2"
+  VERSION = "0.0.3a"
 end

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

@@ -0,0 +1,23 @@
+#
+# 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/linux/cpu.rb

@@ -0,0 +1,60 @@
+#
+# 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/windows/cpu.rb

@@ -0,0 +1,64 @@
+#
+# 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/tests/run.sh

@@ -1,16 +1,18 @@
 #!/bin/sh -e
 
 
-nc -l 5555 &
+bundle exec ruby ./tests/server.rb &
 
 rm -rf ./tmp
 mkdir -p ./tmp
 cat > tmp/config.yml <<EOF
+not_exists:
+  - not error please
 test2:
   url: './tests/run.sh'
   cmd: 'ls'
   parent: 'test'
-  counter: 5
+  counter: 2
 test:
   - url: 'http://google.com'
     cmd: 'test -f ./tests/run.sh'
@@ -19,11 +21,11 @@ test:
 EOF
 
 cat > tmp/test1.rb <<EOF
-interval 10
+interval 3
 name "test"
 
-default[:host] = 'http://notexists'
-default[:cmd] = 'ls -1 && ls /notexists'
+default[:url] = 'http://notexists'
+default[:cmd] = 'ls /notexists'
 
 collect do
   @counter ||= 0
@@ -31,6 +33,10 @@ collect do
   Log.info "get size from #{plugin.url}: #{rest_get(plugin.url).size}"
   @counter += 1
   exit 0 if plugin.counter && @counter > plugin.counter.to_i
+  event(:metric => 3, :critical => 2, :warning => 1)
+  event(:metric => 2, :critical => 2, :warning => 1)
+  event(:metric => 1, :critical => 2, :warning => 1)
+  event(:metric => 0, :critical => 2, :warning => 1)
 end
 EOF
 
@@ -51,5 +57,3 @@ grep 'file command ls return: Gemfile' ./tmp/loadplugins.log
 grep 'get size from http://google.com:' ./tmp/loadplugins.log
 grep 'get size from https://www.kernel.org' ./tmp/loadplugins.log
 grep 'get size from ./tests/run.sh' ./tmp/loadplugins.log
-
-pkill -9 nc || exit 0

data/tests/server.rb

@@ -0,0 +1,11 @@
+require "socket"
+require "timeout"
+
+server = TCPServer.new('127.0.0.1', 5555)
+Timeout::timeout(20) {
+  loop {
+    client = server.accept
+    line = client.gets
+    puts line
+  }
+} rescue exit 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3a
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -170,18 +170,22 @@ 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/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/run.sh
+- tests/server.rb
 homepage: https://github.com/vadv/kurchatov
 licenses:
 - MIT
@@ -197,9 +201,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