bipbip 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27e9aa7d8a9f00d2940ec3dde1918556f32b5453
-  data.tar.gz: e73717090f198d321f70deab0dd4540d08addc33
+  metadata.gz: a8c565ef72aa8710b7d485185227db02f8f1f916
+  data.tar.gz: c3dc8e55ee5adfe49ca1214ee1f4f0d26e9eb102
 SHA512:
-  metadata.gz: b47fdeb97354d69730a3a3cf72cd8bcaa32f05622031e4a152dec618228ebb2027ebb6da37c2182afe87b84f2ee27df1e3fa7f993ca297dc5ee531ce7a589f04
-  data.tar.gz: ebe253a1196b617650450c467d3e4ff4194c3c7bfdd6dc9579967895eab62549420ead96d308b9568dbe461e8e5806e1cc32ee9da67b5ef7c1ee52cc7a6235f9
+  metadata.gz: 9be1a3363765235384983bebb7f36959698ad3cbad7e315aa19f33281c1c8c851dcaadeaca4c5714780e301e820126d4a11240158f0cd8e2db2f5f354350e0fb
+  data.tar.gz: c5ac6e22536847ca6ab813bae641ff143cbaf28812c96e8a843ce22823ac0a53a928bd753a026b6d36c2c7bffe8840db4cb3d2fe42bce4c20390ba525c096275

data/README.md

@@ -96,7 +96,6 @@ services:
   -
     plugin: log-parser
     path: /var/log/syslog
-    regexp_timestamp: '^\w+ \d{1,2} \d{2}\:\d{2}\:\d{2}'
     matchers:
      -
       name: oom_killer
@@ -154,15 +153,6 @@ Alias /apc-status /usr/local/bin/apc-status.php
 
 Then set the `url`-configuration for the plugin to where the script is being served, e.g. `http//localhost:80/apc-status`.
 
-#### log-parser
-The log file is being read backwards from the end.
-Each line should contain a timestamp which matches `regexp_timestamp` and can be parsed by `DateTime.parse`.
-Multiple `matchers` can be specified, each creates a metrics with the number of matched lines as a value.
- 
-Example values for `regexp_timestamp`:
-* *default*: `^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}`
-* syslog traditional: `^\w+ \d{1,2} \d{2}\:\d{2}\:\d{2}` (not recommended because year is missing)
-
 Custom external plugins
 -----------------------
 Additional plugins can be created as independent gems.

data/lib/bipbip/plugin.rb

@@ -34,7 +34,7 @@ module Bipbip
             if data.empty?
               raise "#{name} #{source_identifier}: Empty data"
             end
-            Bipbip.logger.debug "#{name} #{source_identifier}: Data: #{data}"
+            log(Logger::DEBUG, "Data: #{data}")
             storages.each do |storage|
               storage.store_sample(self, time, data)
             end
@@ -42,19 +42,19 @@ module Bipbip
             interruptible_sleep (frequency - (Time.now - time))
           end
         rescue => e
-          Bipbip.logger.error "#{name} #{source_identifier}: Error: #{e.message}"
+          log(Logger::ERROR, e.message)
           interruptible_sleep retry_delay
           retry_delay += frequency if retry_delay < frequency * 10
           retry
         rescue Exception => e
-          Bipbip.logger.error "#{name} #{source_identifier}: Fatal error: #{e.message}"
+          log(Logger::FATAL, e.message)
           raise e
         end
       end
     end
 
     def interrupt
-      Bipbip.logger.info "Interrupting plugin process #{Process.pid}"
+      log(Logger::INFO, "Interrupting plugin process #{Process.pid}")
       @interrupted = true
       interrupt_sleep
     end
@@ -76,7 +76,7 @@ module Bipbip
     end
 
     def metrics_names
-      metrics_schema.map {|metric| metric[:name] }
+      metrics_schema.map { |metric| metric[:name] }
     end
 
     def metrics_schema
@@ -86,5 +86,11 @@ module Bipbip
     def monitor
       raise 'Missing method monitor'
     end
+
+    private
+
+    def log(severity, message)
+      Bipbip.logger.add(severity, message, "#{name} #{source_identifier}")
+    end
   end
 end

data/lib/bipbip/plugin/log_parser.rb

@@ -1,10 +1,7 @@
-require 'date'
+require 'rb-inotify'
 
 module Bipbip
 
-  TIMESTAMP_REGEXP = '^\d{4}-\d{2}-\d{2}T\d{2}\:\d{2}\:\d{2}'
-  REGEXP_IGNORE_LINE = '^\s*$'
-
   class Plugin::LogParser < Plugin
 
     def metrics_schema
@@ -14,21 +11,18 @@ module Bipbip
     end
 
     def monitor
-      time_first = nil
-
-      lines = lines_backwards.take_while do |line|
-        if line.match(REGEXP_IGNORE_LINE)
-          true
-        elsif timestamp_match = line.match(regexp_timestamp)
-          time = DateTime.parse(timestamp_match[0]).to_time
-          time_first ||= time
-          (time > log_time_min)
-        else
-          Bipbip::logger.warn("Log parser: Unparseable line `#{line.chomp}` in `#{config['path']}`")
+      unless IO.select([notifier.to_io], [], [], 0).nil?
+        n = notifier
+        begin
+          n.process
+        rescue NoMethodError => e
+          # Ignore errors from closed notifier - see https://github.com/nex3/rb-inotify/issues/41
+          raise e unless n.watchers.empty?
         end
       end
 
-      self.log_time_min = time_first unless time_first.nil?
+      lines = @lines.entries
+      @lines.clear
 
       Hash[config['matchers'].map do |matcher|
         name = matcher['name']
@@ -40,48 +34,46 @@ module Bipbip
 
     private
 
-    def log_time_min
-      @log_time_min ||= Time.now - @frequency.to_i
+    def notifier
+      if @notifier.nil?
+        @notifier = create_notifier
+        @lines = []
+        @size = File.stat(config['path']).size
+      end
+      @notifier
     end
 
-    def log_time_min=(time)
-      @log_time_min = time
+    def create_notifier
+      # Including the "attrib" event, because on some systems "unlink" triggers "attrib", but then the inode's deletion doesn't trigger "delete_self"
+      events = [:modify, :delete_self, :move_self, :unmount, :attrib]
+      notifier = INotify::Notifier.new
+      notifier.watch(config['path'], *events) do |event|
+        if event.flags.include?(:modify)
+          roll_file
+        else
+          log(Logger::WARN, "File event `#{event.flags.join(',')}` detected, resetting notifier")
+          reset_notifier
+        end
+      end
+      notifier
     end
 
-    def regexp_timestamp
-      @regexp_timestamp ||= Regexp.new(config.fetch('regexp_timestamp', TIMESTAMP_REGEXP))
+    def reset_notifier
+      unless @notifier.nil?
+        @notifier.stop
+        @notifier.close
+        @notifier = nil
+      end
     end
 
-    def lines_backwards
-      buffer_size = 65536
-
-      Enumerator.new do |yielder|
-        File.open(config['path']) do |file|
-          file.seek(0, File::SEEK_END)
-
-          while file.pos > 0
-            buffer_size = file.pos if file.pos < buffer_size
-
-            file.seek(-buffer_size, File::SEEK_CUR)
-            buffer = file.read(buffer_size)
-            file.seek(-buffer_size, File::SEEK_CUR)
-
-            line_list = buffer.each_line.entries
-
-            if file.pos != 0
-              # Remove first line as can be incomplete
-              # due to seeking backward with buffer_size steps
-              first_line = line_list.shift
-              raise "Line length exceeds buffer size `#{buffer_size}`" if first_line.length == buffer_size
-              file.seek(first_line.length, File::SEEK_CUR)
-            end
-
-            line_list.reverse.each do |line|
-              yielder.yield(line)
-            end
-          end
-        end
+    def roll_file
+      file = File.new(config['path'], 'r')
+      if file.size != @size
+        file.seek(@size)
+        @lines.push(*file.readlines)
+        @size = file.size
       end
+      file.close
     end
 
   end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.4.5'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg
@@ -152,6 +152,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement