kurchatov 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55eda896c8cdf5d70d2adbf87b0cfc1d1e90cba4
-  data.tar.gz: 22a52c6bb4245862a6a4c87d6a94ae6db0c79a91
+  metadata.gz: 9094918f08537775203d52e22d3669276a8e3cee
+  data.tar.gz: d775c33d9a51f5e5fa5e87a0fef7a874218e5657
 SHA512:
-  metadata.gz: ef05f87be7f7b55d13a2e4791b3e5ee618176bd11285fabd12ec79489f005ac8103cb7ffbc8d0ade1b360f9173eef8f80fa24603b89d89af035e729984bb7dc5
-  data.tar.gz: 17aaba1fa5c2d07099919793160e03e3c6ba8717e7cfddec3607e4eed637bd52ab7630b4f70ebbe4d5423f858c1955c6ef594dcac5da2ef25da54da067bb7b2b
+  metadata.gz: 7bdf806068549afe1a9f2519ef954effe5561b1ecda9acde8179c7aa210484168de07bb21a503690fc97b4eea2ad46f40ed6fda8c692585b29ff21ac6c7d0857
+  data.tar.gz: d6f752f13bc30d1c65707462e078566fe527f3661128551286b0c1ea2bec911c65e288f15dbb509bbd3317bc9329f39b3ed697df653a109433a26078b7b39a68

data/lib/kurchatov/mixin/event.rb

@@ -5,8 +5,8 @@ module Kurchatov
       include Kurchatov::Mixin::Queue
 
       EVENT_FIELDS = [
-          :time, :state, :service, :host,
-          :description, :tags, :ttl, :metric
+        :time, :state, :service, :host,
+        :description, :tags, :ttl, :metric
       ]
 
       def event(hash = {})
@@ -19,15 +19,22 @@ module Kurchatov
       protected
 
       def normalize_event(hash = {})
+
         hash[:description] = hash[:desc] if hash[:description].nil? && hash[:desc]
         hash[:metric] = hash[:metric].to_f if hash[:metric].kind_of?(String)
         if hash[:metric].kind_of?(Float)
           hash[:metric] = 0.0 if hash[:metric].nan?
           hash[:metric] = ((hash[:metric] * 100).round/100.to_f) # 1.8.7 round
         end
+
         set_diff_metric(hash)
+        set_bool_metric(hash)
+        set_bool_state(hash)
+        set_avg_metric(hash)
         set_event_state(hash)
+
         return false if hash[:miss]
+
         hash.each { |k, _| hash.delete(k) unless EVENT_FIELDS.include?(k) }
         hash[:service] ||= name
         hash[:tags] ||= Kurchatov::Config[:tags]
@@ -36,10 +43,6 @@ module Kurchatov
       end
 
       def set_event_state(hash = {})
-        if hash[:state] == true || hash[:state] == false
-          hash[:state] = hash[:state] ? 'ok' : 'critical'
-          return
-        end
         return if hash[:state]
         return if hash[:critical].nil? && hash[:warning].nil?
         return if hash[:metric].nil?
@@ -49,23 +52,57 @@ module Kurchatov
       end
 
       def set_diff_metric(hash ={})
+
         hash[:diff] ||= hash[:as_diff] if hash[:as_diff]
+
         return if hash[:diff].nil? && !hash[:diff]
         return if hash[:metric].nil?
         return if hash[:service].nil?
-        hash[:metric] = 0 if hash[:metric] == false
-        hash[:metric] = 1 if hash[:metric] == true
         @history ||= {}
+
         if @history[hash[:service]]
           old_metric = @history[hash[:service]]
           @history[hash[:service]] = hash[:metric]
           hash[:metric] = hash[:metric] - old_metric
         else
           @history[hash[:service]] = hash[:metric]
+          hash[:metric] = nil
           hash[:miss] = true
         end
       end
 
+      def set_bool_metric(hash ={})
+        hash[:metric] = 0 if hash[:metric] == false
+        hash[:metric] = 1 if hash[:metric] == true
+      end
+
+      def set_bool_state(hash ={})
+        if hash[:state] == true || hash[:state] == false
+          hash[:state] = hash[:state] ? 'ok' : 'critical'
+        end
+      end
+
+      def set_avg_metric(hash ={})
+
+        return if hash[:avg].nil? || hash[:avg].to_i != hash[:avg]
+        return if hash[:service].nil?
+        return if hash[:metric].nil?
+
+        @history_avg ||= {}
+        @history_avg[hash[:service]] ||= []
+        @history_avg[hash[:service]] << hash[:metric].to_f
+        @history_avg[hash[:service]] = @history_avg[hash[:service]].last(hash[:avg])
+
+        return if hash[:miss]
+
+        if @history_avg[hash[:service]].count >= (hash[:avg] / 2) + 1
+          hash[:metric] = @history_avg[hash[:service]].reduce(:+).to_f / @history_avg[hash[:service]].count
+        else
+          hash[:miss] = true
+        end
+
+      end
+
     end
   end
 end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/tests/data/event.yml

@@ -32,17 +32,17 @@ events:
     :result: critical
     :service: state FalseClass
 
-  - :eval: 'shell("ls /| wc -l | wc -l")'
+  - :eval_metric: 'shell("ls /| wc -l | wc -l")'
     :warning: 0
     :result: warning
     :service: Shell test
 
-  - :eval: 'rest_get("http://ya.ru").size'
+  - :eval_metric: 'rest_get("http://ya.ru").size'
     :critical: 10
     :result: critical
     :service: Http get test
 
-  - :eval: 'rest_get("http://127.0.0.1:55755").size'
+  - :eval_metric: 'rest_get("http://127.0.0.1:55755").size'
     :critical: 1
     :result: critical
     :service: Http responder
@@ -52,3 +52,54 @@ events:
     :warning: 1
     :result: ok
     :service: round float
+
+  - :metric: 1.5
+    :critical: 2
+    :warning: 1
+    :avg: 2
+    :service: avg
+    :time: 1
+    :miss_count: true # only for tests
+
+  - :metric: 0.6
+    :result: warning # avg == 2, (1.5 + 0.6)/2 >= 1
+    :critical: 2
+    :warning: 1
+    :avg: 2
+    :service: avg
+    :time: 2
+
+  - :metric: 10
+    :result: critical # avg == 2, (10 + 0.6)/2 >= critical
+    :critical: 2
+    :warning: 1
+    :avg: 2
+    :service: avg
+    :time: 3
+
+  - :metric: 10
+    :critical: 2
+    :warning: 1
+    :avg: 2
+    :diff: true
+    :service: avg with diff
+    :time: 4
+    :miss_count: true
+
+  - :metric: 12
+    :critical: 2
+    :warning: 1
+    :avg: 2
+    :diff: true
+    :service: avg with diff
+    :time: 5
+    :miss_count: true
+
+  - :metric: 14.5
+    :critical: 2
+    :warning: 1
+    :avg: 2
+    :diff: true
+    :service: avg with diff
+    :result: critical
+    :time: 6

data/tests/data/sample.rb

@@ -4,9 +4,9 @@ always_start true
 collect do
   data = YAML.load_file('./tests/data/event.yml')
   data["events"].each do |e| 
-    e[:metric] = eval(e[:eval]) if e.has_key? :eval
+    e[:metric] = eval(e[:eval_metric]) if e.has_key? :eval_metric
     event(e)
   end
-  sleep(plugin.sleep.to_f || 0)
-  exit 0 if plugin.sleep
+  sleep(plugin.sleep.to_f)
+  exit 0 if plugin.sleep # 1 plugin send exit 0
 end

data/tests/server.rb

@@ -2,6 +2,7 @@ require 'socket'
 require 'timeout'
 require 'kurchatov/riemann/client'
 require 'yaml'
+require_relative 'testreceived'
 
 PORT = 5555
 HOST = '127.0.0.1'
@@ -25,14 +26,5 @@ Timeout::timeout(RECEIVE_INTERVAL) {
   end
 }
 
-data = YAML.load_file('./tests/data/event.yml')
-events.each do |e|
-  data["events"].each do |d|
-    next unless d[:service] == e[:service]
-    next if d[:result] == e[:state]
-    raise "Recieved state: #{e[:state]}, data state: #{d[:result]}. \n Data: #{d.inspect} \n Event: #{e.inspect}"
-  end
-end
-
-raise "Not all events recieved" unless 3 * data["events"].count == events.count
-puts "All done!"
+t = TestReceived.new(events, './tests/data/event.yml')
+t.compare!

data/tests/testreceived.rb

@@ -0,0 +1,36 @@
+class TestReceived
+
+  def initialize(events, file)
+    @events = events
+    @file = file
+  end
+
+  def data
+    @data ||= YAML.load_file(@file)
+  end
+
+  def compare!
+
+    @events.each do |e|
+      data["events"].each do |d|
+        next unless d[:service] == e[:service]
+        next if d[:result] == e[:state]
+        next if d[:time] && d[:time] != e[:time]
+        raise "Recieved state: #{e[:state].inspect}, data state: #{d[:result].inspect}. \n Data: #{d.inspect} \n Event: #{e.inspect}"
+      end
+    end
+
+    from_data = data["events"].select {|x| x[:miss_count] != true }.count
+    from_events = @events.count
+
+    raise "Not all events recieved: from data: #{from_data} and from server: #{from_events}" unless 3 * from_data == from_events # see config.yml (3 copy of sample plugin run)
+
+    puts "Recieved events:"
+    puts "#{@events.inspect}"
+    puts "Sample data:"
+    puts "#{data.inspect}"
+
+    puts "All done!"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -197,6 +197,7 @@ files:
 - tests/data/sample.rb
 - tests/run.sh
 - tests/server.rb
+- tests/testreceived.rb
 homepage: https://github.com/vadv/kurchatov
 licenses:
 - MIT