riemann-cassandra 0.1.3-java → 0.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911ac0cc7a790092c918a1c9bad343efa5de859d
-  data.tar.gz: 24f93e4ea6097e95d06ae1a54b01b3353fd60216
+  metadata.gz: 97112bfb0c6266531f411fd2cadb57d062037f38
+  data.tar.gz: e5d823d25ee7e47d23032a580bb9e9c2d5a523b2
 SHA512:
-  metadata.gz: f6f64620815d8fb0b586fd5c8a501076d1b0786757d5fa7c3420ba8a20671b5fed5e582c7fe7b8a982e101ce34da3d2f17da5131ff32b22bf36a9aabcab16a33
-  data.tar.gz: 1d38903b296027c9bf6b865a402f83c5df160611e8199baaa5fc19995d1d46fc5c56017e3d50ba3b48d5641133cfc22700890c44ca9982f95ae79c8ed880b598
+  metadata.gz: 79dfaa6fe946e8156a9d634b34c2f0f732a7c016869e9d8bd7221fe0661ad41d7b27bd771ef25803f7bca277468415f6dbf0e5db13d581f878fac3063a003539
+  data.tar.gz: 5e1354b6b273449fede82400f7474ad555b04ac510e3f1ac1973ace0c1b49c512f403890ac54f9388a01e992b905542f05eb3786bfeb72c062bfb5fafc06d4c8

data/bin/riemann-cassandra

@@ -1,75 +1,32 @@
 #!/usr/bin/env ruby
-require 'trollop'
-require 'socket'
-require 'riemann/client'
+require 'riemann/tools'
 require 'riemann/cassandra'
 
-opts_parser = Trollop::Parser.new do
-  opt :host, "Riemann host", default: '127.0.0.1'
-  opt :port, "Riemann port", default: 5555
-  opt :event_host, "Event hostname", type: String, default: Socket.gethostname
-  opt :interval, "Seconds between updates", type: :int, default: 5
-  opt :tag, "Tag to add to events", type: String, multi: true
-  opt :ttl, "TTL for events", type: Integer, default: 10
-  opt :attribute, "Attribute to add to the event", type: String, multi: true
-  opt :timeout, "Timeout (in seconds) when waiting for acknowledgements", default: 30
-  opt :tcp, "Use TCP transport instead of UDP (improves reliability, slight overhead.", default: true
 
-  opt :cassandra_jmx_host, 'Cassandra JMX host', type: :string, default: "localhost"
-  opt :cassandra_jmx_port, 'Cassandra JMX port', type: :int, default: 7199
-end
-
-opts = Trollop::with_standard_exception_handling opts_parser do
-  opts_parser.parse ARGV
-end
-
-# Initialise Riemann client
-riemann = Riemann::Client.new(host: opts[:host], port: opts[:port], timeout: opts[:timeout])
-
-if opts[:tcp]
-  riemann = riemann.tcp
-else
-  riemann = riemann.udp
-end
+class Riemann::Tools::Cassandra
+  include Riemann::Tools
 
-# Initialise Cassandra JMX client
-cassandra = Riemann::Cassandra::Client.new opts[:cassandra_jmx_host], opts[:cassandra_jmx_port]
+  opt :cassandra_jmx_host, 'Cassandra JMX host', type: String,  default: "localhost"
+  opt :cassandra_jmx_port, 'Cassandra JMX port', type: Integer, default: 7199
 
-loop do
-  begin
-    # Send metric events
+  def tick
     Riemann::Cassandra::METRIC_PARAMS.each do |mp|
-      metric_event = {
-        service:     "cassandra #{mp[:event][:service]}",
-        host:        opts[:event_host],
-        metric:      cassandra.metric(mp[:attribute], mp[:jmx_path]),
-        description: mp[:event][:description],
-        time:        Time.now.utc.to_i,
-        tags:        opts[:tags],
-        ttl:         opts[:ttl]
-      }
-
-      riemann << metric_event
-      puts metric_event
+      report service:     "cassandra #{mp[:event][:service]}",
+             host:        options[:event_host],
+             metric:      cassandra.metric(mp[:attribute], mp[:jmx_path]),
+             description: mp[:event][:description],
+             time:        Time.now.utc.to_i,
+             tags:        options[:tags],
+             ttl:         options[:ttl]
     end
+  end
 
-    # Send health event
-    # health_event = {
-    #   service:     'cassandra health',
-    #   host:        opts[:event_host],
-    #   state:       'ok',
-    #   description: 'Cassandra status connection ok',
-    #   time:        Time.now.utc.to_i,
-    #   tags:        opts[:tags],
-    #   ttl:         opts[:ttl]
-    # }
+  private
 
-    # riemann << health_event
-    # puts health_event
-    puts "\n"
-  rescue => e
-    $stderr.puts "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+  def cassandra
+    @_cassandra ||= Riemann::Cassandra::Client.new options[:cassandra_jmx_host],
+                                                   options[:cassandra_jmx_port]
   end
-
-  sleep(opts[:interval])
 end
+
+Riemann::Tools::Cassandra.run

data/lib/riemann/cassandra/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Cassandra
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/riemann/tools.rb

@@ -0,0 +1,112 @@
+# I copied this one herar because the origil gem depends on other gems which
+# cannot be built with JRuby. When the clients with those dependecies are
+# extracted out of the riemann-tools gem I will switch to it.
+
+module Riemann
+  module Tools
+    require 'trollop'
+    require 'socket'
+    require 'riemann/client'
+
+    def self.included(base)
+      base.instance_eval do
+        def run
+          new.run
+        end
+
+        def opt(*a)
+          a.unshift :opt
+          @opts ||= []
+          @opts << a
+        end
+
+        def options
+          p = Trollop::Parser.new
+          @opts.each do |o|
+            p.send *o
+          end
+          Trollop::with_standard_exception_handling(p) do
+            p.parse ARGV
+          end
+        end
+
+        opt :host, "Riemann host", :default => '127.0.0.1'
+        opt :port, "Riemann port", :default => 5555
+        opt :event_host, "Event hostname", :type => String, default: Socket.gethostname
+        opt :interval, "Seconds between updates", :default => 5
+        opt :tag, "Tag to add to events", :type => String, :multi => true
+        opt :ttl, "TTL for events", :type => Integer
+        opt :attribute, "Attribute to add to the event", :type => String, :multi => true
+        opt :timeout, "Timeout (in seconds) when waiting for acknowledgements", :default => 30
+        opt :tcp, "Use TCP transport instead of UDP (improves reliability, slight overhead.", :default => true
+      end
+    end
+
+    # Returns parsed options (cached) from command line.
+    def options
+      @options ||= self.class.options
+    end
+    alias :opts :options
+
+    def attributes
+      @attributes ||= Hash[options[:attribute].map do |attr|
+        k,v = attr.split(/=/)
+        if k and v
+          [k,v]
+        end
+      end]
+    end
+
+    def report(event)
+      if options[:tag]
+        # Work around a bug with beefcake which can't take frozen strings.
+        event[:tags] = options[:tag].map(&:dup)
+      end
+
+      event[:ttl] ||= (options[:ttl] || (options[:interval] * 2))
+
+      if options[:event_host]
+        event[:host] = options[:event_host].dup
+      end
+
+      event = event.merge(attributes)
+
+      riemann << event
+    end
+
+    def new_riemann_client
+      r = Riemann::Client.new(
+        :host    => options[:host],
+        :port    => options[:port],
+        :timeout => options[:timeout]
+      )
+      if options[:tcp]
+        r.tcp
+      else
+        r
+      end
+    end
+
+    def riemann
+      @riemann ||= new_riemann_client
+    end
+    alias :r :riemann
+
+    def run
+      t0 = Time.now
+      loop do
+        begin
+          tick
+        rescue => e
+          $stderr.puts "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+        end
+
+        # Sleep.
+        sleep(options[:interval] - ((Time.now - t0) % options[:interval]))
+      end
+    end
+
+    def tick
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-cassandra
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: java
 authors:
 - Deyan Dobrinov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ files:
 - lib/riemann/cassandra/client.rb
 - lib/riemann/cassandra/metric_params.rb
 - lib/riemann/cassandra/version.rb
+- lib/riemann/tools.rb
 - riemann-cassandra.gemspec
 homepage: https://github.com/dobrinov/riemann-cassandra
 licenses: