kurchatov 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d00f378bcedf66042d543be5fc56ad589d53cf91
-  data.tar.gz: a5b23e869340f0c9b7f115148642a91ab2859fc1
+  metadata.gz: 5bf9d4c9449771ea3dbdcdf8da52590ef6a237d2
+  data.tar.gz: e4a9d1e5ab830158ac8e4a5f8b89b75b823e6566
 SHA512:
-  metadata.gz: 97ec96766bc0358855f4e4f8ad9dda22cfc7b2b4a3b23bc0ec92fa038b28db04653780fcfd9d4854f08bc7407894b2fe724668e38aa41dab996bdf3a9538c50c
-  data.tar.gz: 83986822261d6256ccfa65e3bb3a8df9d36bf2157a39104cc7330eed1d5bea6c916586ec94cc8843710b8f8b2f40820d7fc96f837711ba043ee420df32235455
+  metadata.gz: d45bb97b8ae40e670bb135ae6f5ad766087e6cf149e4dc07a9046e01c3642dbfbbb03375a17adab0700ee1ef7a5b69b0843a4463948d76ea1748a410eef2954b
+  data.tar.gz: d624df333b80e086bfdec431f0b0854840d8922bb7803e0e494647ae6a58ef4cb973fcf3d91817650ffb66ad3f2f56c59e8a1a4e77079a1969b93490d493e7b5

data/CHANGELOG

@@ -7,3 +7,4 @@
 * Version 0.0.7: add FreeBSD support, responders as plugins
 * Version 0.2.1: count avg metric
 * Version 0.2.3: ignore_errors as count errors
+* Version 0.2.7: OpenTSDB support

data/app/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "kurchatov", "= 0.2.5"
+gem "kurchatov", "= 0.2.6"
 gem "sys-filesystem"
 gem "sys-proctable"
 gem "net-ping"

data/app/Gemfile.lock

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

data/debian/changelog

@@ -1,3 +1,15 @@
+riemann-client (1:0.2.7) stable; urgency=low
+
+  * TSDB support
+
+ -- Undev DevOps Team <devops@undev.ru>  Wed, 20 Aug 2014 10:08:20 +0000
+
+riemann-client (1:0.2.6) stable; urgency=low
+
+  * Timeout fixes
+
+ -- Undev DevOps Team <devops@undev.ru>  Fri, 14 Jul 2014 11:36:28 +0400
+
 riemann-client (1:0.2.5.2) stable; urgency=low
 
   * Add parallel gem

data/examples/la.rb

@@ -1,25 +1,17 @@
 always_start true
 interval 60
 
-default[:cpu] = ohai[:cpu][:real]
+default[:cpu] = 1
+default[:cpu] = ohai[:cpu][:total] unless ohai[:cpu][:total].to_i == 0
 
-collect :os => 'linux' do
+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',
-      :warning => plugin.cpu,
-      :critical => plugin.cpu * 2
-  )
-end
-
-collect :os => 'darwin' do
-  interval = 2
-  event(
-      :metric => shell('uptime | cut -d":" -f4- | sed s/,//g').to_f,
-      :desc => 'LA averaged over 1 minute',
-      :service => 'la la_1',
-      :warning => plugin.cpu,
-      :critical => plugin.cpu * 2
+    :metric       => File.read('/proc/loadavg').scan(/[\d\.]+/)[0].to_f,
+    :desc         => 'LA averaged over 1 minute',
+    :service      => 'la la_1',
+    :warning      => plugin.warning || plugin.cpu * 2,
+    :critical     => plugin.critical || plugin.cpu * 4,
+    :tsdb_service => "sys.la.one_min",
+    :tsdb_tags    => {"host" => ohai[:fqdn]}
   )
 end

data/lib/kurchatov/mixin/event.rb

@@ -6,7 +6,8 @@ module Kurchatov
 
       EVENT_FIELDS = [
         :time, :state, :service, :host,
-        :description, :tags, :ttl, :metric
+        :description, :tags, :ttl, :metric,
+        :tsdb_service, :tsdb_tags
       ]
 
       def event(hash = {})
@@ -32,6 +33,7 @@ module Kurchatov
         set_bool_state(hash)
         set_avg_metric(hash)
         set_event_state(hash)
+        set_tsdb_tags(hash)
 
         return false if hash[:miss]
 
@@ -103,6 +105,13 @@ module Kurchatov
 
       end
 
+      def set_tsdb_tags(hash = {})
+        hash[:tsdb_tags] ||= {}
+        hash[:tsdb_tags] = hash[:tsdb_tags].map {|k,v| "#{k}=#{v}" }
+        hash[:tsdb_tags] << "host=#{Kurchatov::Config[:host]}"
+        hash[:tsdb_tags].uniq!
+      end
+
     end
   end
 end

data/lib/kurchatov/riemann/event.rb

@@ -12,6 +12,8 @@ module Kurchatov
       optional :metric_sint64, :sint64, 13
       optional :metric_d, :double, 14
       optional :metric_f, :float, 15
+      optional :tsdb_service, :string, 16
+      repeated :tsdb_tags, :string, 17
 
       def initialize(hash = nil)
         if hash

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake