eznemo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3efce5df3e500b3170a41590e844315147277f9
-  data.tar.gz: fddcc93d34f4c32d015b257f33447bbbb555ad67
+  metadata.gz: 4a63d6de019cde7d7b7f154e16534524759075ad
+  data.tar.gz: 930d98134aeb498f387fb8bcd69866948cb82dc0
 SHA512:
-  metadata.gz: 211605c26eae2da41969b4be18e2d3d4d02f57604ff9ae06af6799b02eb3fc061b682d52bf8fad7638700acc2a5e3e580a9aaa63e0141ee774196aa08832f5d4
-  data.tar.gz: eaf38d99f061d70917681a41e1f02cb327d2499cdaaaf1eff50d8e6246d349a67d250ecbc3133babd53651d70904c83b6ada2429f35c93981e7c6a3a38afa16f
+  metadata.gz: e32c9ed5244114be6ea97713322558566fd1d4d2982b71046223700224d4092e4ede0f1b27d32529fc021f94eebed7be1ac02aca6537867a463763b15b721db9
+  data.tar.gz: 47945030a40c8e762568ec593e819309b42a93ee5347ec9ce25fd0f75604b9d45889bae290eac96ce3667b48d870dbcd3dc70a598fcc5ea643a77fa81bad2d5f

data/README.md

@@ -40,7 +40,8 @@ Config file.
 :probe:
   :name: Probe01
 :datastore:
-  :type: :mysql
+  :type: :mysql   # currently the only option
+  :queue_size: 20
   :options:
     :host: 127.0.0.1
     :username: user
@@ -70,7 +71,6 @@ Config file.
   interval: 60,   # frequecy this check is run in seconds
   type: 'ping',   # or other monitor plugin name
   state: true,   # true means active
-  tags: '["tag1", "tag2"]',
   options: '-S 192.168.0.11'
 }
 ```
@@ -88,8 +88,20 @@ Config file.
 }
 ```
 
+### Tags
+
+```ruby
+{
+  check_id: 123,   # from checks
+  text: 'prod'   # tag text
+}
+```
+
+
 ### MySQL
 
+Example using TokuDB.
+
 ```sql
 CREATE TABLE `checks` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
@@ -98,10 +110,10 @@ CREATE TABLE `checks` (
   `interval` int(11) NOT NULL,
   `type` varchar(255) NOT NULL DEFAULT '',
   `state` tinyint(1) NOT NULL,
-  `tags` text,
   `options` text,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`id`),
+  CLUSTERING KEY `state` (`state`)
+) ENGINE=TokuDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `results` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -112,9 +124,18 @@ CREATE TABLE `results` (
   `response_ms` float NOT NULL DEFAULT '0',
   `status_desc` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
-  KEY `check_id` (`check_id`),
+  CLUSTERING KEY `check_id` (`check_id`),
   KEY `probe` (`probe`),
   KEY `timestamp` (`timestamp`),
   KEY `status` (`status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=TokuDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tags` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `check_id` int(11) NOT NULL,
+  `text` varchar(63) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  KEY `check_id` (`check_id`),
+  CLUSTERING KEY `text` (`text`)
+) ENGINE=TokuDB DEFAULT CHARSET=utf8;
 ```

data/eznemo.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'kajiki', '~> 1.1'
   s.add_runtime_dependency 'eventmachine', '~> 1.0'
+  s.add_runtime_dependency 'sequel', '~> 4.0'
 end

data/lib/eznemo/datastore.rb

@@ -5,6 +5,19 @@ module EzNemo
     @datastore ||= DataStore.new
   end
 
+  # Sequel models
+  class Check < Sequel::Model
+    one_to_many :tags
+  end
+
+  class Tag < Sequel::Model
+    many_to_one :check
+  end
+
+  class Result < Sequel::Model
+    many_to_one :check
+  end
+
   # Storage for checks and results
   class DataStore
 

data/lib/eznemo/monitor/ping.rb

@@ -37,7 +37,7 @@ module EzNemo
     end
 
     # Add a check using this plugin
-    # @param check [Hash]
+    # @param check [EzNemo::Check]
     def add_check(check)
       min = config[:min_interval]
       check[:interval] = min if check[:interval] < min
@@ -47,67 +47,84 @@ module EzNemo
     end
 
     def linux_ping(check)
-      result = {
-        timestamp: Time.now,
-        check_id: check[:id]
-      }
-      path = config[:path]
-      timeout = config[:timeout]
-      options = "#{config[:cmd_opts]} #{check[:options]}"
-      hostname = check[:hostname]
-      cmd = "#{path} -c 1 -nqW #{timeout} #{options} #{hostname}"
-      EM.system(cmd) do |output, status|
+      result = create_result_for_check(check)
+      EM.system(build_cmd(check)) do |output, status|
         case status.exitstatus
         when 0
           expr = /=\s*([0-9\.]+)/
           expr =~ output
-          result[:status] = 1
-          result[:response_ms] = $1.to_f
-          result[:status_desc] = 'OK'
+          set_ok_result(result, $1.to_f)
         when 1
-          result[:status] = 0
-          result[:response_ms] = 0
-          result[:status_desc] = 'NG'
+          set_ng_result(result)
         else
-          output = 'see log' if output.nil? || output.size == 0
-          result[:status] = 0
-          result[:response_ms] = 0
-          result[:status_desc] = "ERROR: #{output}".chomp
+          set_error_result(result, output)
         end
         monitor.report(result)
       end
     end
 
     def bsd_ping(check)
-      result = {
-        timestamp: Time.now,
-        check_id: check[:id]
-      }
-      timeout = config[:timeout] * 1000
-      options = "#{config[:cmd_opts]} #{check[:option]}"
-      hostname = check[:hostname]
-      cmd = "#{path} -c 1 -nqW #{timeout} #{options} #{hostname}"
-      EM.system(cmd) do |output, status|
+      result = create_result_for_check(check)
+      args = {timeout: config[:timeout] * 1000}
+      EM.system(build_cmd(check, args)) do |output, status|
         case status.exitstatus
         when 0
           expr = /=\s*([0-9\.]+)/
           expr =~ output
-          result[:status] = 1
-          result[:response_ms] = $1.to_f
-          result[:status_desc] = 'OK'
+          set_ok_result(result, $1.to_f)
         when 2
-          result[:status] = 0
-          result[:response_ms] = 0
-          result[:status_desc] = 'NG'
+          set_ng_result(result)
         else
-          result[:status] = 0
-          result[:response_ms] = 0
-          result[:status_desc] = "ERROR: #{output}".chomp
+          set_error_result(result, output)
         end
         monitor.report(result)
       end
     end
 
+    private
+
+    # @param check [EzNemo::Check]
+    # @return [EzNemo::Result]
+    def create_result_for_check(check)
+      Result::new do |r|
+        r.timestamp = Time.now
+        r.check = check
+        r.probe = EzNemo.config[:probe][:name]
+      end
+    end
+
+    # @param check [EzNemo::Check]
+    # @param args [Hash] overriding arguments
+    def build_cmd(check, args = {})
+      h = {
+        path: config[:path],
+        timeout: config[:timeout],
+        options: "#{config[:cmd_opts]} #{check[:options]}",
+        hostname: check[:hostname]
+      }
+      h.merge!(args)
+      "#{h[:path]} -c 1 -nqW #{h[:timeout]} #{h[:options]} #{h[:hostname]}"
+    end
+
+    def set_ok_result(result, ms)
+      result.status = true
+      result.response_ms = ms
+      result.status_desc = 'OK'
+    end
+
+    def set_ng_result(result)
+      result.status = false
+      result.response_ms = 0
+      result.status_desc = 'NG'
+    end
+
+    def set_err_result(result, msg)
+      msg = 'see log' if msg.nil? || msg.size == 0
+      result.status = false
+      result.response_ms = 0
+      result.status_desc = "ERROR: #{msg}".chomp
+    end
+
   end
 
   monitor.register(Ping.new)

data/lib/eznemo/monitor.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module EzNemo
 
   # The shared Monitor instance
@@ -25,13 +23,8 @@ module EzNemo
     # Starts check loops in the reactor
     # @param checks [Array<Hash, ...>]
     def start_checks(checks)
-      cfg_tags = EzNemo.config[:checks][:tags]
       i = 0
       checks.each do |c|
-        if cfg_tags
-          c[:tags] ? tags = JSON.parse(c[:tags]) : tags = []
-          next if (cfg_tags & tags).empty?
-        end
         p = @plugins[c[:type].to_sym]
         p.add_check(c)
         i += 1
@@ -40,7 +33,7 @@ module EzNemo
     end
 
     # Report result; usually called by the plugin
-    # @param result [Hash] :check_id, :timestamp, :status, :response_ms, :status_desc
+    # @param result [EzNemo::Result]
     def report(result)
       EzNemo.datastore.store_result(result)
     end

data/lib/eznemo/mysql.rb

@@ -1,27 +1,27 @@
 require 'mysql2/em'
+require 'sequel'
+require 'thread'
 
 
 module EzNemo
 
+  # Sequel connection setup
+  Sequel::Model.db = Sequel.connect({adapter: 'mysql2'}.merge(config[:datastore][:options]))
+
   # Defines DataStorage class for MySQL
   module StorageAdapter
 
     # Number of records it queues up before writing
-    QUEUE_SIZE = 20
+    DEFAULT_QUEUE_SIZE = 20
 
     def initialize
       @results = []
-      @probe = EzNemo.config[:probe][:name]
+      @queue_size = EzNemo.config[:datastore][:queue_size]
+      @queue_size ||= DEFAULT_QUEUE_SIZE
       @opts = EzNemo.config[:datastore][:options]
       @opts[:flags] = Mysql2::Client::MULTI_STATEMENTS
     end
 
-    # Creates and returns new instance of {Mysql2::Client}
-    # @return [Mysql2::Client]
-    def database
-      Mysql2::Client.new(@opts)
-    end
-
     # Creates and returns new instance of {Mysql2::EM::Client}
     # @return [Mysql2::EM::Client]
     def emdatabase
@@ -29,17 +29,36 @@ module EzNemo
     end
 
     # Returns all active checks
-    # @return [Array<Hash, ...>]
+    # @return [Array<EzNemo::Check, ...>]
     def checks
-      q = 'SELECT * FROM checks WHERE state = true'
-      database.query(q, {symbolize_keys: true, cast_booleans: true})
+      checks_with_tags(EzNemo.config[:checks][:tags])
+    end
+
+    # Returns all active checks matching all tags
+    # @param tags [Array<String, ...>] list of tag text
+    # @return [Array<EzNemo::Checks, ...>]
+    def checks_with_tags(tags = nil)
+      cids = check_ids_with_tags(tags)
+      return Check.where(state: true).all if cids.nil?
+      Check.where(state: true, id: cids).all
+    end
+
+    # @param tags [Array<String, ...>] list of tag text
+    # @return [Array] check_id mathing all tags; nil when no tags supplied
+    def check_ids_with_tags(tags = nil)
+      return nil if tags.nil? || tags.empty?
+      candi_ids = []
+      tags.each { |t| candi_ids << Tag.where(text: t).map(:check_id) }
+      final_ids = candi_ids[0]
+      candi_ids.each { |ids| final_ids = final_ids & ids }
+      final_ids
     end
 
     # Stores a result; into queue first
     # @param result [Hash] (see {EzNemo::Monitor#report})
     def store_result(result)
       @results << result
-      if @results.count >= QUEUE_SIZE
+      if @results.count >= @queue_size
         write_results
       end
     end
@@ -49,19 +68,28 @@ module EzNemo
     # @return [Object] Mysql2 client instance
     def write_results(sync = false)
       return nil if @results.empty?
-      sync ? db = database : db = emdatabase
-      stmt = ''
-      @results.each do |r|
-        r[:probe] = @probe
-        r[:status_desc] = db.escape(r[:status_desc])
-        cols = r.keys.join(',')
-        vals = r.values.join("','")
-        stmt << "INSERT INTO results (#{cols}) VALUES ('#{vals}');"
-      end
-      @results.clear
       if sync
-        db.query(stmt)
+        # 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
+        end
+        thr.join
+        return true
       else
+        db = emdatabase
+        stmt = ''
+        @results.each do |r|
+          # r[:probe] = @probe
+          r[:status_desc] = db.escape(r[:status_desc])
+          cols = r.values.keys.join(',')
+          # find and convert boolean values to integer
+          vals = r.values.values.map { |v| !!v == v ? (v ? 1 : 0) : v }
+          vals = vals.join("','")
+          stmt << "INSERT INTO results (#{cols}) VALUES ('#{vals}');"
+        end
         defer = db.query(stmt)
         defer.callback do
         end
@@ -70,6 +98,7 @@ module EzNemo
           db.close if db.ping
         end
       end
+      @results.clear
       db
     end
 

data/lib/eznemo/version.rb

@@ -1,5 +1,5 @@
 module EzNemo
 
-  Version = '0.1.0'
+  Version = '0.2.0'
 
 end

data/lib/eznemo.rb

@@ -32,7 +32,7 @@ module EzNemo
       ds = EzNemo.datastore
 
       Signal.trap('INT') do
-        puts 'Interrupted. Flushing...'
+        puts 'Interrupted.'
         ds.flush
         exit
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eznemo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ken J.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kajiki
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Simple network monitoring
 email:
 - kenjij@gmail.com