watchmonkey_cli 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bb6a637e71a9a3483a2b7b7a7b6dab90469b786c313f742e174743560afaa1b
-  data.tar.gz: 94c468d5e0fe0d8344c321584e78828ecf4b3a43872885b80eb30028eab5e15f
+  metadata.gz: eca45a77465ff32cc6166c9c97ae857e411a00020d274154278006d0a3c06cbc
+  data.tar.gz: 5468bb0a67d96d3533bdd643ba81555304b9951bee3aa0ef3a63815ad1b1dda2
 SHA512:
-  metadata.gz: dce28700596ca2267765017a3ed23f862cd5cb36951e2d1371ed714cabb9c6d36a0550ad4835ffa1b24ed749a78f775a5c0123ab8d9f9799c1438f988d5f76b8
-  data.tar.gz: dc9afb99c806398ab45cb89dbdb38f6ac30db97b58a63e2012fbe940f33e29009c52af90515ed3267d021532f2edfb997f3957a1af7360b44b26bca4663527cc
+  metadata.gz: ad691ffdc29b81ca2c07f5a483aea72bc4414932e558b41f0d97ac1be7a5f4664eff6f3c4d8b7d224c45f663c3bafe20c7c05699264c44a49a3585830276e2dd
+  data.tar.gz: ec9598dd812eb9da77bc53b9a12e3838b9f161e56a2f93af24188bab336532c0b4b61842aaa350eca27ec9b2461c3a6172dccdaeaba0473274df2449c264f46c

data/VERSION

@@ -1 +1 @@
-1.13.0
+1.14.0

data/checksums/watchmonkey_cli-1.13.0.gem.sha512

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

data/lib/watchmonkey_cli/checker.rb

@@ -33,6 +33,14 @@ module WatchmonkeyCli
       @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 = {}

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.13.0"
+  VERSION = "1.14.0"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/watchmonkey_cli/master/VERSION"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  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.6
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc.
 test_files: []