eznemo 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e5d349829718d26ca4db2923e6729c16372e2e6
-  data.tar.gz: 0754641f251dd3220f90e650f62a7c28ec47aa9d
+  metadata.gz: 167ab32ba8c4cf65e9714b41289729a61942df54
+  data.tar.gz: b4f8ab53fff1342c65d339fc96c22474ede30f26
 SHA512:
-  metadata.gz: eaa3255851876e776e773feab656201edfeb026e824ea32408702affbcd8ba46d0d792cface8b6d725366f6f29ea8bafffcb5e6e1385ebd8851c597dccdcd4c1
-  data.tar.gz: 518f2523ee34c20e60ba53e96878502d53e9a2328f10db2c2a932f5879e966ac28e70f0f55890da2bbdaf950ed75c91d6f8153f34de217564a48b547aef749e0
+  metadata.gz: de094143e701ab83c769aa811e811db3b099748abb3d523bed7979818e1a45b1a3488e8a890501a79969cd8a77f7c4b295d18458f2de6a4e6af371d9ab4e89d2
+  data.tar.gz: 2ac35029e455ddfb589320ee12ea595130c8e35bfb2504cb08c7290f4861083cc02dcdba58f07306fd16b487cb00995a26659cd2d4bdd071811aa4664e940660

data/README.md

@@ -39,20 +39,23 @@ Config file.
 ---
 :probe:
   :name: Probe01
+  :logger: 'Logger.new(STDOUT)'
+  :log_level: 'Logger::WARN'
 :datastore:
   :type: :mysql   # currently the only option
   :queue_size: 20
+  :queue_interval: 60   # if present, queue_size will be ignored
   :options:
     :host: 127.0.0.1
     :username: user
     :password: paSsw0rd
     :database: eznemo
 :checks:
-  :tags:
+  :tags:   # multiple tags are AND
     - tag1
     - tag2
 :monitor:
-  :ping:   # all optional
+  :ping:   # below are all optional
     :path: '/bin/ping'
     :min_interval: 10
     :timeout: 5
@@ -75,25 +78,25 @@ Config file.
 }
 ```
 
-### Results
+### Tags
 
 ```ruby
 {
   check_id: 123,   # from checks
-  probe: 'Probe01',
-  timestamp: '2016-04-01 10:00:00 -0700',
-  status: true,   # true means OK
-  response_ms: 0.012,   # in milliseconds
-  status_desc: 'OK'   # short description of the result
+  text: 'prod'   # tag text
 }
 ```
 
-### Tags
+### Results
 
 ```ruby
 {
+  timestamp: '2016-04-01 10:00:00 UTC',
   check_id: 123,   # from checks
-  text: 'prod'   # tag text
+  probe: 'Probe01',
+  status: true,   # true means OK
+  response_ms: 0.012,   # in milliseconds
+  status_desc: 'OK'   # short description of the result
 }
 ```
 
@@ -110,26 +113,11 @@ CREATE TABLE `checks` (
   `interval` int(11) NOT NULL COMMENT 'in seconds',
   `type` varchar(255) NOT NULL DEFAULT '',
   `state` tinyint(1) NOT NULL,
-  `options` varchar(255) DEFAULT '',
+  `options` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   CLUSTERING KEY `state` (`state`)
 ) ENGINE=TokuDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `results` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `check_id` int(11) NOT NULL,
-  `probe` varchar(255) NOT NULL DEFAULT '',
-  `timestamp` datetime NOT NULL COMMENT 'in utc',
-  `status` tinyint(1) NOT NULL,
-  `response_ms` float NOT NULL DEFAULT '0',
-  `status_desc` varchar(255) NOT NULL DEFAULT '',
-  PRIMARY KEY (`id`),
-  CLUSTERING KEY `check_id` (`check_id`),
-  KEY `probe` (`probe`),
-  KEY `timestamp` (`timestamp`),
-  KEY `status` (`status`)
-) ENGINE=TokuDB DEFAULT CHARSET=utf8;
-
 CREATE TABLE `tags` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `check_id` int(11) NOT NULL,
@@ -138,4 +126,15 @@ CREATE TABLE `tags` (
   KEY `check_id` (`check_id`),
   CLUSTERING KEY `text` (`text`)
 ) ENGINE=TokuDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `results` (
+  `timestamp` datetime NOT NULL COMMENT 'in utc',
+  `check_id` int(11) NOT NULL,
+  `probe` varchar(255) NOT NULL DEFAULT '',
+  `status` tinyint(1) NOT NULL,
+  `response_ms` float NOT NULL DEFAULT '0',
+  `status_desc` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`timestamp`, `check_id`, `probe`),
+  CLUSTERING KEY `check_id` (`check_id`)
+) ENGINE=TokuDB DEFAULT CHARSET=utf8;
 ```

data/eznemo.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.version       = EzNemo::Version
   s.authors       = ['Ken J.']
   s.email         = ['kenjij@gmail.com']
-  s.description   = %q{Simple network monitoring}
-  s.summary       = %q{Simple network monitoring implemented with Ruby.}
+  s.summary       = %q{Simple network monitoring}
+  s.description   = %q{Simple network monitoring implemented with Ruby.}
   s.homepage      = 'https://github.com/kenjij/eznemo'
   s.license       = 'MIT'
 

data/lib/eznemo.rb

@@ -1,3 +1,4 @@
+require 'eznemo/logger'
 require 'eznemo/config'
 require 'eznemo/version'
 require 'eventmachine'
@@ -19,16 +20,21 @@ module EzNemo
     # Usually called by #self.run!
     def initialize(opts)
       c = EzNemo.load_config(opts[:config])
-
+      p = c[:probe]
+      EzNemo.logger = eval(p[:logger]) if p[:logger].class == String
+      logger = EzNemo.logger
+      logger.level = eval(p[:log_level]) if p[:log_level].class == String
+      logger.debug 'Loading datastore adapter...'
       require "eznemo/#{c[:datastore][:type]}"
       require 'eznemo/datastore'
-
+      logger.debug 'Loading monitoring plugins...'
       require 'eznemo/monitor'
       require 'eznemo/monitor/ping'
     end
 
     # Usually called by #self.run!
     def run
+      logger = EzNemo.logger
       ds = EzNemo.datastore
 
       Signal.trap('INT') do
@@ -44,7 +50,9 @@ module EzNemo
       end
       
       EM.run do
+        logger.debug 'Loading checks...'
         EzNemo.monitor.start_checks(ds.checks)
+        ds.start_loop
       end
     end
 

data/lib/eznemo/logger.rb

@@ -0,0 +1,24 @@
+require 'logger'
+
+
+module EzNemo
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    @logger ||= NullLogger.new()
+  end
+
+  class NullLogger < Logger
+
+    def initialize(*args)
+    end
+
+    def add(*args, &block)
+    end
+
+  end
+
+end

data/lib/eznemo/monitor.rb

@@ -29,7 +29,7 @@ module EzNemo
         p.add_check(c)
         i += 1
       end
-      puts "#{i} checks activated."
+      EzNemo.logger.info "#{i} checks activated."
     end
 
     # Report result; usually called by the plugin

data/lib/eznemo/monitor/ping.rb

@@ -34,6 +34,7 @@ module EzNemo
       @config[:path] ||= 'ping'
       @config[:min_interval] ||= DEFAULT_MIN_INTERVAL
       @config[:timeout] ||= DEFAULT_TIMEOUT
+      EzNemo.logger.info 'Ping plugin registered.'
     end
 
     # Add a check using this plugin

data/lib/eznemo/mysql.rb

@@ -20,6 +20,7 @@ module EzNemo
       @results = []
       @queue_size = EzNemo.config[:datastore][:queue_size]
       @queue_size ||= DEFAULT_QUEUE_SIZE
+      @queue_interval = EzNemo.config[:datastore][:queue_interval]
       @opts = EzNemo.config[:datastore][:options]
       @opts[:flags] = Mysql2::Client::MULTI_STATEMENTS
     end
@@ -56,11 +57,24 @@ module EzNemo
       final_ids
     end
 
+    # Register EventMachine blocks
+    def start_loop
+      return unless @queue_interval
+      logger = EzNemo.logger
+      logger.info 'Registering MySQL EM block...'
+      EM.add_periodic_timer(@queue_interval) do
+        EzNemo.logger.debug 'Queue interval time arrived.'
+        write_results
+      end
+    end
+
     # Stores a result; into queue first
     # @param result [Hash] (see {EzNemo::Monitor#report})
     def store_result(result)
       @results << result
+      return if @queue_interval
       if @results.count >= @queue_size
+        EzNemo.logger.debug 'Queue is full.'
         write_results
       end
     end
@@ -69,16 +83,13 @@ module EzNemo
     # @param sync [Boolean] use EM (async) if false
     # @return [Object] Mysql2 client instance
     def write_results(sync = false)
+      logger = EzNemo.logger
       return nil if @results.empty?
       if sync
-        # Sequel won't run after trap; run in another thread
-        thr = Thread.new do
-          puts 'Flushing in another thread...'
-          Result.db.transaction do
-            @results.each { |r| r.save}
-          end
+        logger.debug 'Writing to DB...'
+        Result.db.transaction do
+          @results.each { |r| r.save}
         end
-        thr.join
         return true
       else
         db = emdatabase
@@ -86,9 +97,10 @@ module EzNemo
         @results.each { |r| stmt << Result.dataset.insert_sql(r) + ';' }
         defer = db.query(stmt)
         defer.callback do
+          logger.debug 'Wrote to DB async.'
         end
         defer.errback do |r|
-          puts r.message
+          logger.error r.message
           db.close if db.ping
         end
       end
@@ -98,11 +110,17 @@ module EzNemo
 
     # Flush queue to storage
     def flush
-      if write_results(true)
-        puts "Flushed."
-      else
-        puts "Nothing to flush."
+      logger = EzNemo.logger
+      # Won't run after trap; run in another thread
+      thr = Thread.new do
+        logger.debug 'Spawned flushing thread.'
+        if write_results(true)
+          logger.info "Flushed."
+        else
+          logger.info "Nothing to flush."
+        end
       end
+      thr.join
     end
 
   end

data/lib/eznemo/version.rb

@@ -1,5 +1,5 @@
 module EzNemo
 
-  Version = '0.2.1'
+  Version = '0.3.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eznemo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ken J.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kajiki
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: Simple network monitoring
+description: Simple network monitoring implemented with Ruby.
 email:
 - kenjij@gmail.com
 executables:
@@ -67,6 +67,7 @@ files:
 - lib/eznemo.rb
 - lib/eznemo/config.rb
 - lib/eznemo/datastore.rb
+- lib/eznemo/logger.rb
 - lib/eznemo/monitor.rb
 - lib/eznemo/monitor/ping.rb
 - lib/eznemo/mysql.rb
@@ -94,5 +95,5 @@ rubyforge_project:
 rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: Simple network monitoring implemented with Ruby.
+summary: Simple network monitoring
 test_files: []