watchmonkey_cli 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e8b3281a2641174927f13de6f09d0bf2c35988
-  data.tar.gz: 1dbd8ec4d401dae1651fae131a874381242365f6
+  metadata.gz: 312311aaf04df5cc1d42249ec5202c0e01a35ef6
+  data.tar.gz: b1e0f912c416b626a876d16663fa466e75bb9b7d
 SHA512:
-  metadata.gz: 41cffe415bdb00af10d9ee99ce1a5a59db0f9fa989c2938eefb329c378f4b16687774713946a82b02e4b44c23f6a48187f942ed96ace18a992f235ea58935ba1
-  data.tar.gz: 6be8aa148f2a41b3a4766e34ed02f9192d6591aa7486c49250190adced0e3546b1dfb4b7b898a098741d82ff089622541743ab4ddb4d8104c4933741c3d552c1
+  metadata.gz: 1fb4acc683cbe5fc57b3bc37034f0c5f8e2b339aad8d21e226d2adefe07c1e560f7484d69073fb3e951ab09d61f58f502a3b0b37607a1ec0158ca7195df315d8
+  data.tar.gz: 3f9b86d3acb7956be9b9cef6dceddbf2d2aa63c730139f4d7e1b760e8a39837e54bbf009e45a19f04a3ac297983a816dc35a9519396993835cfe3f8d39cb3c14

data/README.md

@@ -18,7 +18,7 @@ If you need help or have problems [open an issue](https://github.com/2called-cha
 ## Features
   * Monitor external resources (Web, FTP, Server health via SSH)
   * Run once or loop forever with ReQueue (define intervals globally, per checker or per single test)
-  * Includes a selection of buildin checkers (basic *nix health, WWW availability & SSL expiration, FTP)
+  * Includes a selection of buildin checkers (see [list](https://github.com/2called-chaos/watchmonkey_cli/tree/master/lib/watchmonkey_cli/checkers) or [config template](https://github.com/2called-chaos/watchmonkey_cli/blob/master/lib/watchmonkey_cli/application/configuration.tpl))
 
 
 ## Requirements

data/VERSION

@@ -1 +1 @@
-1.6
+1.7

data/lib/watchmonkey_cli/application/configuration.rb

@@ -25,13 +25,13 @@ module WatchmonkeyCli
         def config_files
           Dir["#{config_directory}/**/*.rb"].reject do |file|
             file.gsub(config_directory, "").split("/").any?{|fp| fp.start_with?("__") }
-          end
+          end.sort
         end
 
         def checker_files
           Dir["#{checker_directory}/**/*.rb"].reject do |file|
             file.gsub(config_directory, "").split("/").any?{|fp| fp.start_with?("__") }
-          end
+          end.sort
         end
 
         def load_configs!

data/lib/watchmonkey_cli/application/configuration.tpl

@@ -67,6 +67,13 @@ www_availability "https://example.com", ssl_expiration: { threshold: 4.weeks }
 ftp_availability "ftp.example.com", user: "somebody", password: "thatiusedtoknow"
 
 
+# -----
+# TeamSpeak3 license expiration
+# -----
+# Checks ts3 license file for expiration. Default threshold is 1.month
+ts3_license :my_server, "/path/to/licensekey.dat", threshold: 1.month
+
+
 # -----
 # MySQL replication
 # -----

data/lib/watchmonkey_cli/application/core.rb

@@ -10,11 +10,16 @@ module WatchmonkeyCli
           $wm_runtime_exiting = true
           Kernel.puts "Interrupting..."
         end
+        Signal.trap("TERM") do
+          $wm_runtime_exiting = true
+          Kernel.puts "Terminating..."
+        end
       end
 
       def release_signals
         debug "Releasing INT signal..."
         Signal.trap("INT", "DEFAULT")
+        Signal.trap("TERM", "DEFAULT")
       end
 
       def haltpoint

data/lib/watchmonkey_cli/checker.rb

@@ -106,6 +106,7 @@ module WatchmonkeyCli
 
     # -------------------
 
+    include Helper
     attr_reader :app
 
     def initialize app

data/lib/watchmonkey_cli/checkers/ssl_expiration.rb

@@ -19,65 +19,22 @@ module WatchmonkeyCli
         end
 
         if cert.not_before > Time.current
-          result.error! "Certificate is not yet valid (will in #{fseconds(cert.not_before - Time.current)}, #{cert.not_before})!"
+          result.error! "Certificate is not yet valid (will in #{human_seconds(cert.not_before - Time.current)}, #{cert.not_before})!"
           return
         end
 
         if cert.not_after <= Time.current
-          result.error! "Certificate is EXPIRED (since #{fseconds(cert.not_after - Time.current)}, #{cert.not_after})!"
+          result.error! "Certificate is EXPIRED (since #{human_seconds(cert.not_after - Time.current)}, #{cert.not_after})!"
           return
         end
 
         if cert.not_after <= Time.current + opts[:threshold]
-          result.error! "Certificate is about to expire within threshold (in #{fseconds(cert.not_after - Time.current)}, #{cert.not_after})!"
+          result.error! "Certificate is about to expire within threshold (in #{human_seconds(cert.not_after - Time.current)}, #{cert.not_after})!"
           return
         else
-          result.info! "Certificate for `#{page}' expires in #{fseconds(cert.not_after - Time.current)} (#{cert.not_after})!"
+          result.info! "Certificate for `#{page}' expires in #{human_seconds(cert.not_after - Time.current)} (#{cert.not_after})!"
         end
       end
-
-      def fseconds secs
-        secs = secs.to_i
-        t_minute = 60
-        t_hour = t_minute * 60
-        t_day = t_hour * 24
-        t_week = t_day * 7
-        t_month = t_day * 30
-        t_year = t_month * 12
-        "".tap do |r|
-          if secs >= t_year
-            r << "#{secs / t_year}y "
-            secs = secs % t_year
-          end
-
-          if secs >= t_month
-            r << "#{secs / t_month}m "
-            secs = secs % t_month
-          end
-
-          if secs >= t_week
-            r << "#{secs / t_week}w "
-            secs = secs % t_week
-          end
-
-          if secs >= t_day || !r.blank?
-            r << "#{secs / t_day}d "
-            secs = secs % t_day
-          end
-
-          if secs >= t_hour || !r.blank?
-            r << "#{secs / t_hour}h "
-            secs = secs % t_hour
-          end
-
-          if secs >= t_minute || !r.blank?
-            r << "#{secs / t_minute}m "
-            secs = secs % t_minute
-          end
-
-          r << "#{secs}s" unless r.include?("d")
-        end.strip
-      end
     end
   end
 end

data/lib/watchmonkey_cli/checkers/ts3_license.rb

@@ -0,0 +1,69 @@
+module WatchmonkeyCliCustom
+  class Ts3License < WatchmonkeyCli::Checker
+    self.checker_name = "ts3_license"
+
+    def enqueue host, file, opts = {}
+      opts = { threshold: 1.months }.merge(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)
+    end
+
+    def check! result, host, file, opts = {}
+      result.command = "cat #{Shellwords.escape(file)}"
+      result.result = host.exec(result.command).force_encoding('UTF-8')
+
+      if result.result.downcase["no such file"]
+        result.error! "Failed to read file #{file} (#{result.result})"
+      else
+        result.data = _parse_response(result.result)
+        start_at = zone_parse "UTC", result.data["start date"]
+        end_at   = zone_parse "UTC", result.data["end date"]
+
+        if start_at > Time.current
+          result.error! "TS3 license is not yet valid (will in #{human_seconds(start_at - Time.current)}, #{start_at})!"
+          return
+        end
+
+        if end_at <= Time.current
+          result.error! "TS3 license is EXPIRED (since #{human_seconds(end_at - Time.current)}, #{end_at})!"
+          return
+        end
+
+        if end_at <= Time.current + opts[:threshold]
+          result.error! "TS3 license is about to expire within threshold (in #{human_seconds(end_at - Time.current)}, #{end_at})!"
+          return
+        else
+          result.info! "TS3 license for `#{page}' expires in #{human_seconds(end_at - Time.current)} (#{end_at})!"
+        end
+      end
+    end
+
+    def zone_parse tz, date
+      tz_was = Time.zone
+      Time.zone = "UTC"
+      Time.zone.parse(date)
+    ensure
+      Time.zone = tz_was
+    end
+
+    def _parse_response res
+      {}.tap do |r|
+        lines = res.split("\n")
+        reached_key = false
+        lines.each do |l|
+          next if l.blank?
+          if l[":"]
+            c = l.split(":", 2)
+            r[c[0].strip] = c[1].strip
+          elsif l["==key=="]
+            reached_key = true
+          elsif reached_key
+            r["key"] ||= ""
+            r["key"] += l
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watchmonkey_cli/checkers/unix_file_exists.rb

@@ -11,9 +11,8 @@ module WatchmonkeyCli
       end
 
       def check! result, host, file, opts = {}
-        descriptor = "[#{self.class.checker_name} | #{host} | #{file} | #{opts}]\n\t"
         if host.is_a?(WatchmonkeyCli::LoopbackConnection)
-          result.error! "#{descriptor}#{opts[:message]} (ENOENT)" if !File.exist?(file)
+          result.error! "#{opts[:message]} (ENOENT)" if !File.exist?(file)
         else
           result.command = "test -f #{Shellwords.escape(file)} && echo exists"
           result.result = host.exec(result.command)

data/lib/watchmonkey_cli/helper.rb

@@ -15,5 +15,48 @@ module WatchmonkeyCli
     def human_number(n)
       n.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse
     end
+
+    def human_seconds secs
+      secs = secs.to_i
+      t_minute = 60
+      t_hour = t_minute * 60
+      t_day = t_hour * 24
+      t_week = t_day * 7
+      t_month = t_day * 30
+      t_year = t_month * 12
+      "".tap do |r|
+        if secs >= t_year
+          r << "#{secs / t_year}y "
+          secs = secs % t_year
+        end
+
+        if secs >= t_month
+          r << "#{secs / t_month}m "
+          secs = secs % t_month
+        end
+
+        if secs >= t_week
+          r << "#{secs / t_week}w "
+          secs = secs % t_week
+        end
+
+        if secs >= t_day || !r.blank?
+          r << "#{secs / t_day}d "
+          secs = secs % t_day
+        end
+
+        if secs >= t_hour || !r.blank?
+          r << "#{secs / t_hour}h "
+          secs = secs % t_hour
+        end
+
+        if secs >= t_minute || !r.blank?
+          r << "#{secs / t_minute}m "
+          secs = secs % t_minute
+        end
+
+        r << "#{secs}s" unless r.include?("d")
+      end.strip
+    end
   end
 end

data/lib/watchmonkey_cli/hooks/platypus.rb

@@ -14,7 +14,6 @@ module WatchmonkeyCli
       opts = opts.reverse_merge(notifications: 1, progress: true, html: false, draw_delay: 1)
       opts[:progress] = false if opts[:html]
       app.instance_eval do
-        @opts[:stdout] = SilentOutput.new
         @platypus_status_cache = {
           errors: [],
         }
@@ -53,6 +52,8 @@ module WatchmonkeyCli
 
         # HTML output (fancy as fuck!)
         if opts[:html]
+          @opts[:stdout] = SilentOutput.new
+
           def escape_javascript str
             str.gsub(/(\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"'])/u) {|match| JS_ESCAPE_MAP[match] }
           end

data/lib/watchmonkey_cli/hooks/requeue.rb

@@ -16,6 +16,7 @@ module WatchmonkeyCli
         # @opts[:default_requeue_ftp_availability]  = 60
         @opts[:default_requeue_mysql_replication] = 30
         @opts[:default_requeue_ssl_expiration]    = 1.hour
+        @opts[:default_requeue_ts3_license]       = 1.hour
         @opts[:default_requeue_unix_defaults]     = false
         # @opts[:default_requeue_unix_df]           = 60
         # @opts[:default_requeue_unix_file_exists]  = 60

data/lib/watchmonkey_cli/version.rb

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

data/lib/watchmonkey_cli.rb

@@ -13,6 +13,7 @@ require 'net/https'
 # 3rd party
 require "active_support"
 require "active_support/core_ext"
+require "active_support/time_with_zone"
 begin ; require "pry" ; rescue LoadError ; end
 require "httparty"
 require 'net/ssh'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,7 @@ files:
 - lib/watchmonkey_cli/checkers/ftp_availability.rb
 - lib/watchmonkey_cli/checkers/mysql_replication.rb
 - lib/watchmonkey_cli/checkers/ssl_expiration.rb
+- lib/watchmonkey_cli/checkers/ts3_license.rb
 - lib/watchmonkey_cli/checkers/unix_defaults.rb
 - lib/watchmonkey_cli/checkers/unix_df.rb
 - lib/watchmonkey_cli/checkers/unix_file_exists.rb