rubix 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/rubix/monitors/chef_monitor.rb

@@ -21,16 +21,12 @@ module Rubix
   #       webserver = chef_node_from_node_name('webserver')
   #       begin
   #         if Net::HTTP.get_response(URI.parse("http://#{webserver['ec2']['public_hostname']}")).code.to_i == 200
-  #           write do |data|
-  #             data << ['webserver.available', 1]
-  #           end
+  #           write ['webserver.available', 1]
   #           return
   #         end
   #       rescue => e
   #       end
-  #       write do |data|
-  #         data << ([['webserver.available', 0]])
-  #       end
+  #       write ['webserver.available', 0]
   #     end
   #   end
   #   

data/lib/rubix/monitors/monitor.rb

@@ -1,5 +1,4 @@
 require 'configliere'
-require 'json'
 
 module Rubix
 
@@ -18,9 +17,20 @@ module Rubix
   #   class UptimeMonitor < Rubix::Monitor
   #
   #     def measure
-  #       return unless `uptime`.chomp =~ /(\d+) days/
+  #       return unless `uptime`.chomp =~ /(\d+) days.*(\d+) users.*load average: ([\d\.]+), ([\d\.]+), ([\d\.]+)/
+  #
+  #       # can write one value at a time
+  #       write ['uptime', $1.to_i]
+  #
+  #       # or can use a block
   #       write do |data|
-  #         data << ([['uptime', $1.to_i]])
+  #         # values can be arrays
+  #         data << ['users', $2.to_i]
+  #         # or hashes
+  #         data << { :key => 'load15', :value => $3.to_i }
+  #         data << { :key => 'load5',  :value => $4.to_i }
+  #         # can even pass a different host
+  #         data << { :key => 'load1',  :value => $5.to_i, :host => 'foobar-host' }
   #       end
   #     end
   #   end
@@ -106,16 +116,14 @@ module Rubix
     # Methods for writing data to Zabbix.
     #
     
-    def write options={}, &block
+    def write measurement=nil &block
       return unless output
-      data = []
+      return unless measurement || block_given?
+      
+      data = [measurement]
       block.call(data) if block_given?
-      text = {
-        :data => data.map do |measurement|
-          key, value = measurement
-          { :key => key, :value => value }
-        end
-      }.merge(options).to_json
+
+      text = data.compact.map { |measurement| format_measurement(measurement) }.compact.join("\n")
 
       begin
         output.puts(text)
@@ -124,8 +132,36 @@ module Rubix
       end
     end
 
+    def format_measurement measurement
+      # <hostname> key <timestamp> value
+      [].tap do |vals|
+        case measurement
+        when Hash
+          vals << (measurement[:host].nil? ? '-' : measurement[:host])
+          vals << measurement[:key]
+          vals << measurement[:timestamp] if measurement[:timestamp]
+          
+          value = measurement[:value] || ''
+          if value.include?(' ')
+            value.insert(0,  "'")
+            value.insert(-1, "'")
+          end
+          vals << value
+        when Array
+          if measurement.length == 2
+            vals << '-'
+            vals.concat(measurement)
+          else
+            vals.concat(measurement)
+          end
+        else
+          return
+        end
+      end.map(&:to_s).join(' ')
+    end
+
     def output_path
-      settings.rest.first
+      settings.rest && settings.rest.first
     end
 
     def stdout?
@@ -149,6 +185,7 @@ module Rubix
         begin
           @output = open(output_path, (File::WRONLY | File::NONBLOCK))
         rescue Errno::ENXIO
+          nil
           # FIFO's reader isn't alive...
         end
       else

data/spec/rubix/monitors/monitor_spec.rb

@@ -3,29 +3,93 @@ require 'tempfile'
 
 describe Rubix::Monitor do
 
+  def monitor_wrapper(&block)
+    Class.new(Rubix::Monitor).tap do |wrapper|
+      wrapper.class_eval do
+        define_method(:measure, &block)
+      end
+    end
+  end
+
   before do
-    @measurement = '{"data":[{"value":"bar","key":"foo"}]}'
-    
-    @wrapper = Class.new(Rubix::Monitor)
-    @wrapper.class_eval do
-      def measure
+    @wrapper = monitor_wrapper do
+      write ['key', 'value']
+    end
+    ::ARGV.replace([])
+  end
+
+  describe "making measurements" do
+
+    it "should accept a two-element Array of [key, value]" do
+      $stdout.should_receive(:puts).with('- key value')
+      @wrapper.run
+    end
+
+    it "should accept a three-element Array of [host, key, value]" do
+      @wrapper = monitor_wrapper do
+        write ['host', 'key', 'value']
+      end
+      $stdout.should_receive(:puts).with('host key value')
+      @wrapper.run
+    end
+
+    it "should accept a four-element Array of [host, key, timestamp, value]" do
+      @wrapper = monitor_wrapper do
+        write ['host', 'key', 1328875053, 'value']
+      end
+      $stdout.should_receive(:puts).with('host key 1328875053 value')
+      @wrapper.run
+    end
+
+    it "should accept a hash with just a key and a value" do
+      @wrapper = monitor_wrapper do
+        write({ :key => 'key', :value => 'value' })
+      end
+      $stdout.should_receive(:puts).with('- key value')
+      @wrapper.run
+    end
+
+    it "should accept a hash with a host, key, and a value" do
+      @wrapper = monitor_wrapper do
+        write({ :host => 'host', :key => 'key', :value => 'value' })
+      end
+      $stdout.should_receive(:puts).with('host key value')
+      @wrapper.run
+    end
+
+    it "should accept a hash with a host, key, timestamp, and a value" do
+      @wrapper = monitor_wrapper do
+        write({ :host => 'host', :key => 'key', :timestamp => 1328875053, :value => 'value' })
+      end
+      $stdout.should_receive(:puts).with('host key 1328875053 value')
+      @wrapper.run
+    end
+
+    it "should accept multiple values from a block" do
+      @wrapper = monitor_wrapper do
         write do |data|
-          data << ['foo', 'bar']
+          data << ['key', 'value']
+          data << { :key => 'key', :value => 'value' }
         end
+        $stdout.should_receive(:puts).with("key value\nkey value")
+        @wrapper.run
       end
+      
     end
   end
-
+  
   describe 'writing to STDOUT' do
 
-    it "should be the default behavior when run with no arguments" do
+    before do
       ::ARGV.replace([])
-      $stdout.should_receive(:puts).with(/data/)
+    end
+
+    it "should be the default behavior when run with no arguments" do
+      $stdout.should_receive(:puts).with('- key value')
       @wrapper.run
     end
 
     it "should flush after each write" do
-      ::ARGV.replace([])
       $stdout.stub!(:puts)
       $stdout.should_receive(:flush).twice()
       @wrapper.run
@@ -37,7 +101,7 @@ describe Rubix::Monitor do
     
     before do
       @file = Tempfile.new('monitor', '/tmp')
-      ::ARGV.replace([@file.path])      
+      ::ARGV.replace([@file.path])
     end
 
     after do
@@ -47,13 +111,13 @@ describe Rubix::Monitor do
     it "should create a new file if called with a path that doesn't exist" do
       FileUtils.rm(@file.path) if File.exist?(@file.path)
       @wrapper.run
-      File.read(@file.path).should match(/data/)
+      File.read(@file.path).should match('- key value')
     end
 
     it "should append to an existing file" do
       File.open(@file.path, 'w') { |f| f.puts('old content') }
       @wrapper.run
-      File.read(@file.path).should match(/data/)
+      File.read(@file.path).should include('- key value')
       File.read(@file.path).should include('old content')
     end
   end
@@ -78,4 +142,3 @@ describe Rubix::Monitor do
   end
   
 end
-  

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dhruv Bansal