watchmonkey_cli 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f837c69b183c6b2f6f1670358d1bd4eb6745afd4db2335e2f1c95749c17022
-  data.tar.gz: bdc02ab27bbb69a4c15eb67c4bc310fbfc25493abb124684353ccddcf7a320e8
+  metadata.gz: 9c990a60379408431ec45840429e9ea183cf6723569c6f457384c6564a95e559
+  data.tar.gz: b788e5f5e2da8999ca9bf7c66b68bf9f86d3efe496da09d2c08a6121b6b49de6
 SHA512:
-  metadata.gz: def716ff43830383dd7f095b5c502172ce9ac71f008a9cbee00cd18448aa8d893fdf306e717181e569e70a36facac814433b520674fc0957b27430e48857c6cf
-  data.tar.gz: 1fc92b89105fd547344474405c276661f1383486c5cf0443bc8ee989c991b0fe1a46c003bc88bede5ca3d7e3c91cd0e651e97d82e51d6f984291a5015fe7a63d
+  metadata.gz: b135b4d3f834975825617a61333a8aef949f730ecfa06b605ccca2830799fd5943559e4e4db65730d108929e966ed0cc9fa5162ffffb95461e081260ccb50b82
+  data.tar.gz: 43b5b2cdcd087eb4cf6e06352ed124423136e1b818b7543e1a953ad6b92d3a653744da80ca5d9e2e0fcd32ea2e0a462cf487c5c81ac7569dda84d91b08bd8f78

data/Gemfile

@@ -3,5 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in dle.gemspec
 gemspec
 
+gem "pry"
+gem "bundler"
+gem "rake"
+
+# net-ssh co-deps
+gem "ed25519"
+gem "bcrypt_pbkdf"
+
 # optional dependencies
-gem 'telegram-bot-ruby'
+gem "telegram-bot-ruby"
+gem "net-ftp"

data/VERSION

@@ -1 +1 @@
-1.11.0
+1.12.1

data/checksums/watchmonkey_cli-1.12.1.gem.sha512

@@ -0,0 +1 @@
+4be25f6a1529ae4b0015f42448afe751eaf3f8c10a7402d93c84a454b4496c7768b70267d014352a94b08e9d38de75d31bd758e9c8e811b07730900a4b31b175

data/lib/watchmonkey_cli/application/configuration.rb

@@ -59,10 +59,11 @@ module WatchmonkeyCli
         end
       end
 
-      def initialize app, file
+      def initialize app, file = nil, tags = []
         @app = app
         @file = file
-        @tags = []
+        @tags = tags
+        return unless file
         begin
           eval File.read(file, encoding: "utf-8"), binding, file
         rescue
@@ -84,7 +85,21 @@ module WatchmonkeyCli
           opts = args.extract_options!
           only = @app.opts[:tag_only]
           except = @app.opts[:tag_except]
-          tags = (@tags + (opts[:tags] || []).map(&:to_sym)).uniq
+
+          # build tags
+          tags = (@tags + (opts[:tags] || []).map(&:to_sym))
+          if @app.opts[:autotag]
+            tags << :"WMC-#{c.class.checker_name}" # checker name
+            if args[0].is_a?(Symbol)
+              tags << :"WMS-#{args[0]}" # ssh/local connection
+            elsif args[0].is_a?(String) && args[0].match(/\Ahttp(s)?:\/\//i)
+              uri = URI.parse(args[0]) rescue false
+              tags << :"WMH-#{uri.hostname.gsub(".", "_")}" if uri # hostname from URL
+            end
+          end
+          tags = tags.uniq
+          @app.tag_list.merge(tags)
+
           if only.any?
             if tags.any?{|t| only.include?(t) }
               if tags.any?{|t| except.include?(t) }

data/lib/watchmonkey_cli/application/configuration.tpl

@@ -57,7 +57,7 @@ ssh_connection :my_server, host: "wheel@example.com", port: 23 # additional opti
 #
 #    timeout    Maximum time to wait for request (default: 20 seconds)
 #     verify    If enabled the peer will be verified (default: true)
-#  threshold    Minimum certificate lifetime before showing warnings (default: 1.month)
+#  threshold    Minimum certificate lifetime before showing warnings (default: 28.days)
 #
 ssl_expiration "https://example.com", threshold: 3.months
 

data/lib/watchmonkey_cli/application/core.rb

@@ -3,7 +3,7 @@ module WatchmonkeyCli
     module Core
       def filtered_threads
         Thread.list.reject do |thr|
-          thr.backtrace[0]["gems/concurrent-ruby"] rescue false
+          @opts[:filtered_threads].any?{ thr.backtrace[0][_1] }
         end
       end
 

data/lib/watchmonkey_cli/application.rb

@@ -1,6 +1,6 @@
 module WatchmonkeyCli
   class Application
-    attr_reader :opts, :checkers, :connections, :threads, :queue, :hooks, :processed
+    attr_reader :opts, :checkers, :connections, :threads, :queue, :hooks, :processed, :tag_list
     include Helper
     include OutputHelper
     include Colorize
@@ -49,6 +49,7 @@ module WatchmonkeyCli
       @monitor = Monitor.new
       @threads = []
       @queue = Queue.new
+      @tag_list = Set.new
       @processed = 0
       @running = false
       @opts = {
@@ -62,11 +63,16 @@ module WatchmonkeyCli
         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
+        autotag: true,           # (internal) if true checkers will get auto tags for checker name and hostname/connection
         silent: false,           # -s flag
         quiet: false,            # -q flag
         stdout: STDOUT,          # (internal) STDOUT redirect
         tag_only: [],            # -o flag
         tag_except: [],          # -e flag
+        filtered_threads: [      # (internal) stray-thread-detection exclusion list
+          "gems/concurrent-ruby",
+          "gems/timeout",
+        ],
       }
       init_params
       yield(self)

data/lib/watchmonkey_cli/checker.rb

@@ -163,6 +163,10 @@ module WatchmonkeyCli
       end
     end
 
+    def blank_config tags = []
+      Application::Configuration.new(app, nil, tags)
+    end
+
     # def to_s
     #   string = "#<#{self.class.name}:#{self.object_id} "
     #   fields = self.class.inspector_fields.map{|field| "#{field}: #{self.send(field)}"}

data/lib/watchmonkey_cli/checkers/ftp_availability.rb

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

data/lib/watchmonkey_cli/checkers/ssl_expiration.rb

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

data/lib/watchmonkey_cli/checkers/unix_defaults.rb

@@ -35,7 +35,9 @@ module WatchmonkeyCli
           #   sec.check!(result, host, opts[which])
           # end
           # app.enqueue_sub(self, which, host, opts[which]) if opts[which]
-          spawn_sub(which, host, opts[which].is_a?(Hash) ? opts[which] : {}) unless opts[which] == false
+          #spawn_sub(which, host, (opts[which].is_a?(Hash) ? opts[which] : {}).merge(tags: result.tags)) unless opts[which] == false
+          stags = (opts[:tags] || []).reject{|t| t.to_s.start_with?("WMC-") }
+          blank_config(stags).send(which, host, (opts[which].is_a?(Hash) ? opts[which] : {})) unless opts[which] == false
         end
       end
     end

data/lib/watchmonkey_cli/checkers/www_availability.rb

@@ -9,7 +9,8 @@ module WatchmonkeyCli
         # if available enable ssl_expiration support
         if page.start_with?("https://") && opts[:ssl_expiration] != false && !app.running?
           sopts = { timeout: opts[:timeout] }.merge(opts[:ssl_expiration].is_a?(Hash) ? opts[:ssl_expiration] : {})
-          spawn_sub("ssl_expiration", page, sopts)
+          stags = (opts[:tags] || []).reject{|t| t.to_s.start_with?("WMC-") }
+          blank_config(stags).ssl_expiration(page, sopts)
         end
       end
 

data/lib/watchmonkey_cli/hooks/telegram_bot.rb

@@ -418,7 +418,7 @@ module WatchmonkeyCli
                 when "/start"
                   if event.user_data
                     event.reply [].tap{|m|
-                      m << "<b>Welcome!</b> I will tell you if something is wrong with bmonkeys infrastructure."
+                      m << "<b>Welcome!</b> I will tell you if something is wrong with your infrastructure."
                       m << "Your current tags are: #{event.user_data[1].join(", ")}"
                       m << "<b>You have admin permissions!</b>" if event.user_admin?
                       m << "\nInstead of muting me in Telegram you can silence me for a while with <code>/mute 6h 30m</code>."

data/lib/watchmonkey_cli/version.rb

@@ -1,4 +1,4 @@
 module WatchmonkeyCli
-  VERSION = "1.11.0"
+  VERSION = "1.12.1"
   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"
@@ -21,7 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "httparty"
   spec.add_dependency "net-ssh"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Sven Pachnit
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,48 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 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.
 email:
@@ -112,6 +69,7 @@ files:
 - VERSION
 - bin/watchmonkey
 - bin/watchmonkey.sh
+- checksums/watchmonkey_cli-1.12.1.gem.sha512
 - doc/checker_example.rb
 - doc/config_example.rb
 - lib/watchmonkey_cli.rb
@@ -150,7 +108,6 @@ homepage: https://github.com/2called-chaos/watchmonkey_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 4.0.5
 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: []