watchmonkey_cli 1.12.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c990a60379408431ec45840429e9ea183cf6723569c6f457384c6564a95e559
-  data.tar.gz: b788e5f5e2da8999ca9bf7c66b68bf9f86d3efe496da09d2c08a6121b6b49de6
+  metadata.gz: eca45a77465ff32cc6166c9c97ae857e411a00020d274154278006d0a3c06cbc
+  data.tar.gz: 5468bb0a67d96d3533bdd643ba81555304b9951bee3aa0ef3a63815ad1b1dda2
 SHA512:
-  metadata.gz: b135b4d3f834975825617a61333a8aef949f730ecfa06b605ccca2830799fd5943559e4e4db65730d108929e966ed0cc9fa5162ffffb95461e081260ccb50b82
-  data.tar.gz: 43b5b2cdcd087eb4cf6e06352ed124423136e1b818b7543e1a953ad6b92d3a653744da80ca5d9e2e0fcd32ea2e0a462cf487c5c81ac7569dda84d91b08bd8f78
+  metadata.gz: ad691ffdc29b81ca2c07f5a483aea72bc4414932e558b41f0d97ac1be7a5f4664eff6f3c4d8b7d224c45f663c3bafe20c7c05699264c44a49a3585830276e2dd
+  data.tar.gz: ec9598dd812eb9da77bc53b9a12e3838b9f161e56a2f93af24188bab336532c0b4b61842aaa350eca27ec9b2461c3a6172dccdaeaba0473274df2449c264f46c

data/VERSION

@@ -1 +1 @@
-1.12.1
+1.14.0

data/checksums/watchmonkey_cli-1.12.1.gem.sha512

@@ -1 +1 @@
-4be25f6a1529ae4b0015f42448afe751eaf3f8c10a7402d93c84a454b4496c7768b70267d014352a94b08e9d38de75d31bd758e9c8e811b07730900a4b31b175
+55896784ac9e3bc3bfe0998cb907cd13721d773860429de292208dffb19bc34f44d9783cb68814842ceabf982531ee8e650560d882e6b0e90dbd52b59b4d18db

data/checksums/watchmonkey_cli-1.13.0.gem.sha512

@@ -0,0 +1 @@
+7cf1f0f16532184d11682df569b8c78da903166820e5355275bda41b76519e3bf021d8713cbe916b55f6d8c739b2a9af21136fb3aa0e14126ab7533b74a37de2

data/doc/checker_example.rb

@@ -20,6 +20,12 @@ module MyWatchmonkeyCheckers
     #self.maxrt = 5.minutes
     #self.maxrt = ->(app, checker, args){ app.opts[:maxrt] && app.opts[:maxrt] * 2 }
 
+    # Maximum amount of time this task may retry on error.
+    # Set to proc to evaluate at runtime
+    # Defaults to app.opts[:max_retry] if nil/unset
+    #self.max_retry = 1
+    #self.max_retry = ->(app, checker, args){ app.opts[:max_retry] && app.opts[:max_retry] * 2 }
+
     # Called by configuration defining a check with all the arguments.
     #   e.g. my_checker "http://google.com", some_option: true
     # Should invoke `app.enqueue` which will by default call `#check!` method with given arguments.

data/lib/watchmonkey_cli/application/core.rb

@@ -3,7 +3,7 @@ module WatchmonkeyCli
     module Core
       def filtered_threads
         Thread.list.reject do |thr|
-          @opts[:filtered_threads].any?{ thr.backtrace[0][_1] }
+          @opts[:filtered_threads].any?{ thr.backtrace.first&.include?(_1) }
         end
       end
 
@@ -136,7 +136,9 @@ module WatchmonkeyCli
               a << taskopts
 
               checker.debug(result.str_running)
-              checker.rsafe(result) {
+              max_retry = checker.class.max_retry.nil? ? @opts[:max_retry] : checker.class.max_retry
+              max_retry = max_retry.call(self, checker, a) if max_retry.respond_to?(:call)
+              checker.rsafe(result, max_retry: max_retry) {
                 timeout = checker.class.maxrt.nil? ? @opts[:maxrt] : checker.class.maxrt
                 timeout = timeout.call(self, checker, a) if timeout.respond_to?(:call)
                 begin

data/lib/watchmonkey_cli/application.rb

@@ -60,6 +60,7 @@ module WatchmonkeyCli
         debug: false,            # -d flag
         threads: 10,             # -t flag
         maxrt: 120.seconds,      # max runtime of a single task after which it will be terminated (may break SSH connection), 0/false to not limit runtime
+        max_retry: 3,            # max retry on error for a single task
         conclosewait: 10,        # max seconds to wait for connections to be closed (may never if they got killed by maxrt)
         loop_forever: false,     # (internal) loop forever (app mode)
         loop_wait_empty: 1,      # (internal) time to wait in thread if queue is empty

data/lib/watchmonkey_cli/checker.rb

@@ -25,6 +25,22 @@ module WatchmonkeyCli
       @maxrt = seconds
     end
 
+    def self.max_retry
+      @max_retry
+    end
+
+    def self.max_retry= num
+      @max_retry = num
+    end
+
+    def self.default_options
+      @default_options ||= {}
+    end
+
+    def self.default_options= val
+      @default_options = val
+    end
+
     module AppHelper
       def init_checkers!
         @checkers = {}
@@ -118,6 +134,14 @@ module WatchmonkeyCli
           sync { @type == meth }
         end
       end
+
+      def fatal! msg = nil
+        sync do
+          @spool[:error] << msg if msg
+          @type = :error
+          throw(:checker, :fatal)
+        end
+      end
     end
 
     # -------------------
@@ -177,13 +201,13 @@ module WatchmonkeyCli
       @app.fetch_connection(:loopback, :local)
     end
 
-    def safe descriptor = nil, &block
+    def safe descriptor = nil, max_retry: 3, &block
       tries = 0
       begin
         tries += 1
         block.call
       rescue StandardError => e
-        unless tries > 3
+        unless tries > max_retry
           app.sync do
             error "#{descriptor}retry #{tries} reason is `#{e.class}: #{e.message}'"
             e.backtrace.each{|l| debug "\t\t#{l}" }
@@ -197,13 +221,21 @@ module WatchmonkeyCli
       end
     end
 
-    def rsafe resultobj, &block
+    def rsafe resultobj, max_retry: 3, &block
       tries = 0
+      checker_ctrl = false
+
       begin
         tries += 1
-        block.call
+        checker_ctrl = catch(:checker, &block)
       rescue StandardError => e
-        unless tries > 3
+        if checker_ctrl == :fatal
+          resultobj.sync do
+            resultobj.error! "fatal reason is `#{e.class}: #{e.message}'"
+            e.backtrace.each{|l| resultobj.debug "\t\t#{l}" }
+            resultobj.dump!
+          end
+        elsif tries <= max_retry
           resultobj.sync do
             resultobj.error! "retry #{tries} reason is `#{e.class}: #{e.message}'"
             e.backtrace.each{|l| resultobj.debug "\t\t#{l}" }
@@ -213,9 +245,10 @@ module WatchmonkeyCli
             sleep 1
             retry
           end
+        else
+          resultobj.error! "retries exceeded"
+          resultobj.dump!
         end
-        resultobj.error! "retries exceeded"
-        resultobj.dump!
       end
     end
 

data/lib/watchmonkey_cli/checkers/dev_pry.rb

@@ -5,6 +5,7 @@ module WatchmonkeyCli
       self.maxrt = false
 
       def enqueue host, opts = {}
+        opts = {}.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)

data/lib/watchmonkey_cli/checkers/ftp_availability.rb

@@ -4,7 +4,7 @@ module WatchmonkeyCli
       self.checker_name = "ftp_availability"
 
       def enqueue host, opts = {}
-        opts = {}.merge(opts)
+        opts = {}.merge(self.class.default_options, opts)
         app.enqueue(self, host, opts)
       end
 

data/lib/watchmonkey_cli/checkers/mysql_replication.rb

@@ -4,7 +4,11 @@ module WatchmonkeyCli
       self.checker_name = "mysql_replication"
 
       def enqueue host, opts = {}
-        opts = { host: "127.0.0.1", user: "root", sbm_threshold: 60 }.merge(opts)
+        opts = {
+          host: "127.0.0.1",
+          user: "root",
+          sbm_threshold: 60,
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)

data/lib/watchmonkey_cli/checkers/ssl_expiration.rb

@@ -4,7 +4,11 @@ module WatchmonkeyCli
       self.checker_name = "ssl_expiration"
 
       def enqueue page, opts = {}
-        opts = { threshold: 28.days, verify: true, timeout: 20 }.merge(opts)
+        opts = {
+          threshold: 28.days,
+          verify: true,
+          timeout: 20,
+        }.merge(self.class.default_options, opts)
         app.enqueue(self, page, opts)
       end
 

data/lib/watchmonkey_cli/checkers/tcp_port.rb

@@ -4,7 +4,10 @@ module WatchmonkeyCli
       self.checker_name = "tcp_port"
 
       def enqueue host, port, opts = {}
-        opts = { message: "Port #{port} (TCP) is not reachable!", timeout: 2 }.merge(opts)
+        opts = {
+          message: "Port #{port} (TCP) is not reachable!",
+          timeout: 2
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, port, opts)

data/lib/watchmonkey_cli/checkers/ts3_license.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "ts3_license"
 
       def enqueue host, file, opts = {}
-        opts = { threshold: 1.months }.merge(opts)
+        opts = {
+          threshold: 1.month,
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, file, opts)

data/lib/watchmonkey_cli/checkers/udp_port.rb

@@ -4,7 +4,10 @@ module WatchmonkeyCli
       self.checker_name = "udp_port"
 
       def enqueue host, port, opts = {}
-        opts = { message: "Port #{port} (UDP) is not reachable!", timeout: 2 }.merge(opts)
+        opts = {
+          message: "Port #{port} (UDP) is not reachable!",
+          timeout: 2,
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, port, opts)

data/lib/watchmonkey_cli/checkers/unix_cpu_governor.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "unix_cpu_governor"
 
       def enqueue host, opts = {}
-        opts = { expect: "performance" }.merge(opts)
+        opts = {
+          expect: "performance",
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)

data/lib/watchmonkey_cli/checkers/unix_defaults.rb

@@ -5,7 +5,13 @@ module WatchmonkeyCli
 
       def enqueue host, opts = {}
         return if app.running? # we only ever want to run this once to spawn sub checkers
-        opts = { unix_load: {}, unix_memory: {}, unix_df: {}, unix_mdadm: {}, unix_cpu_governor: {} }.merge(opts)
+        opts = {
+          unix_load: {},
+          unix_memory: {},
+          unix_df: {},
+          unix_mdadm: {},
+          unix_cpu_governor: {},
+        }.merge(self.class.default_options, opts)
 
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)

data/lib/watchmonkey_cli/checkers/unix_df.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "unix_df"
 
       def enqueue host, opts = {}
-        opts = { min_percent: 25 }.merge(opts)
+        opts = {
+          min_percent: 25,
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)

data/lib/watchmonkey_cli/checkers/unix_file_exists.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "unix_file_exists"
 
       def enqueue host, file, opts = {}
-        opts = { message: "File #{file} does not exist!" }.merge(opts)
+        opts = {
+          message: "File #{file} does not exist!",
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, file, opts)

data/lib/watchmonkey_cli/checkers/unix_load.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "unix_load"
 
       def enqueue host, opts = {}
-        opts = { limits: [4, 2, 1.5] }.merge(opts)
+        opts = {
+          limits: [4, 2, 1.5],
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)

data/lib/watchmonkey_cli/checkers/unix_mdadm.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "unix_mdadm"
 
       def enqueue host, opts = {}
-        opts = { log_checking: true }.merge(opts)
+        opts = {
+          log_checking: true,
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)

data/lib/watchmonkey_cli/checkers/unix_memory.rb

@@ -4,7 +4,9 @@ module WatchmonkeyCli
       self.checker_name = "unix_memory"
 
       def enqueue host, opts = {}
-        opts = { min_percent: 25 }.merge(opts)
+        opts = {
+          min_percent: 25,
+        }.merge(self.class.default_options, opts)
         host = app.fetch_connection(:loopback, :local) if !host || host == :local
         host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
         app.enqueue(self, host, opts)
@@ -29,7 +31,7 @@ module WatchmonkeyCli
             chunks = line.split(":").map(&:strip)
             r[chunks[0]] = chunks[1].to_i
           end
-          r["free"] = ((r["MemFree"].to_i + r["Buffers"].to_i + r["Cached"].to_i) / r["MemTotal"].to_f * 100).round(2)
+          r["free"] = (r["MemAvailable"].to_i / r["MemTotal"].to_f * 100).round(2)
         end
       end
     end

data/lib/watchmonkey_cli/version.rb

@@ -1,4 +1,4 @@
 module WatchmonkeyCli
-  VERSION = "1.12.1"
+  VERSION = "1.14.0"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/watchmonkey_cli/master/VERSION"
 end

data/watchmonkey_cli.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = WatchmonkeyCli::VERSION
   spec.authors       = ["Sven Pachnit"]
   spec.email         = ["sven@bmonkeys.net"]
-  spec.summary       = %q{Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc}
+  spec.summary       = %q{Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc.}
   spec.description   = %q{If you want an easy way to monitor services without the need of installing agents let a monkey do the job by polling status information via transport protocols.}
   spec.homepage      = "https://github.com/2called-chaos/watchmonkey_cli"
   spec.license       = "MIT"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Sven Pachnit
@@ -70,6 +70,7 @@ files:
 - bin/watchmonkey
 - bin/watchmonkey.sh
 - checksums/watchmonkey_cli-1.12.1.gem.sha512
+- checksums/watchmonkey_cli-1.13.0.gem.sha512
 - doc/checker_example.rb
 - doc/config_example.rb
 - lib/watchmonkey_cli.rb
@@ -122,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.22
 specification_version: 4
-summary: Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc
+summary: Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc.
 test_files: []