riemann-babbler 1.0.8.1 → 1.0.8.2

data/Gemfile

@@ -6,8 +6,8 @@ gem 'logger'
 gem 'trollop'
 gem 'sys-filesystem'
 gem 'rest-client'
-gem 'sequel'
 gem 'net-ping'
+gem 'file-tail'
 
 gem 'rspec'
 gem 'rake'

data/Gemfile.lock

@@ -8,6 +8,8 @@ GEM
       yamler (>= 0.1.0)
     diff-lcs (1.2.2)
     ffi (1.4.0)
+    file-tail (1.0.12)
+      tins (~> 0.5)
     logger (1.2.8)
     method_source (0.8.1)
     mime-types (1.21)
@@ -33,10 +35,10 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
-    sequel (3.46.0)
     slop (3.4.3)
     sys-filesystem (1.1.0)
       ffi
+    tins (0.8.0)
     trollop (2.0)
     yamler (0.1.0)
 
@@ -46,6 +48,7 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   configatron
+  file-tail
   logger
   net-ping
   pry
@@ -53,6 +56,5 @@ DEPENDENCIES
   rest-client
   riemann-client
   rspec
-  sequel
   sys-filesystem
   trollop

data/lib/riemann/babbler.rb

@@ -7,7 +7,7 @@ require 'timeout'
 require 'rest_client'
 require 'socket'
 require 'net/ping'
-require 'sequel'
+require 'file/tail'
 require 'riemann/babbler/support/monkey_patches'
 
 

data/lib/riemann/babbler/plugins/status_file.rb

@@ -5,13 +5,14 @@ class Riemann::Babbler::StatusFile < Riemann::Babbler
     plugin.states.set_default(:critical, 1)
     plugin.set_default(:file, '/var/tmp/error.txt')
     plugin.set_default(:interval, 60)
-    plugin.set_default(:lines, 5)
+    plugin.set_default(:max_lines, 100)
+    plugin.set_default(:report_lines, 5)
   end
 
   def collect
     content = File.read(plugin.file).split("\n").delete_if {|x| x.strip.empty? }
     {
-        :service => plugin.service + " file #{plugin.file}",
+        :service => plugin.service + " #{plugin.file}",
         :description => content.last(plugin.lines).join("\n"),
         :metric => content.count
     }

data/lib/riemann/babbler/support/plugin_helpers.rb

@@ -43,6 +43,25 @@ module Riemann
       end
     end
 
+    def file_grep(filename, regexp, max_lines=100)
+      readed_lines = 0
+      lines = Array.new
+      begin
+        Timeout::timeout(plugin_timeout) do
+          File::Tail::Logfile.open(file, :backward => 0) do |log|
+            log.tail do |line|
+              readed_lines += 1
+              lines << line if line.match?(regexp)
+              return lines if readed_lines >= max_lines
+            end
+          end
+        end
+      rescue => e
+        helper_error("#{e.class} #{e}\n#{e.backtrace.join "\n"}")
+      end
+      return lines
+    end
+
     def tcp_port_aviable?(ip, port)
       begin
         Timeout::timeout(plugin_timeout) do

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.0.8.1'
+    VERSION = '1.0.8.2'
   end
 end

data/riemann-babbler.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency('sys-filesystem')
   s.add_dependency('rest-client')
   s.add_dependency('net-ping')
-  s.add_dependency('sequel')
+  s.add_dependency('file-tail')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.0.8.1
+  version: 1.0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: file-tail
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: