watchmonkey_cli 1.7.1 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86ce6eed439d29ac6eef7d4d0813803b4d7b2beb
-  data.tar.gz: 9cd0a3af426a68459e11164b7df367f5f62264af
+  metadata.gz: de4bbb8f369c58b63f3e11248e811022710f14de
+  data.tar.gz: 39ce0c2031cb3d488860479aa38bff212dcce525
 SHA512:
-  metadata.gz: 32a1fa7651b825530353a9c2f4946dc0b8a5da0e79f1db0e605e54720143341c26cfecb51e2cb97905b570c4491866079b405c26f94b291c8ae9cd28b8111c24
-  data.tar.gz: 0c4a6c26666917532d37aca96b3f02b5d1b9211f1b75c619ed55ce3508e17389bb4a9dc01933cd7f14cd0abc4269553afeed63618258b2b61955d942aa66910c
+  metadata.gz: 43ad504c029ecd9418c2f8848d97b05727354ecc326316de649bf470b485e9f4e49c828f50218eccb5702f0e6df4dde90234d3b672bd29440c833f952630da94
+  data.tar.gz: dc61ff90fb7ffa71100c50876c157d208bc4019cdc0de3dd46e0822bd37657ecdef7bb5653f67b11060dc7900877812de7d607ee526871e9e6f91c5bf6a3ecee

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.8

data/lib/watchmonkey_cli/application/configuration.tpl

@@ -59,6 +59,38 @@ www_availability "https://example.com", ssl_expiration: false
 www_availability "https://example.com", ssl_expiration: { threshold: 4.weeks }
 
 
+# -----
+# TCP port
+# -----
+# Attempts to establish a TCP connection to a given port.
+# Host might be :local/SSH connection/String(IP/DNS)
+# Available options:
+#
+#   message    Error message when connection cannot be established
+#   timeout    Timeout in seconds to wait for a connection (default = 2 seconds - false/nil = 1 hour)
+#
+tcp_port "ftp.example.com", 21, message: "FTP offline"
+tcp_port :my_server, 21, message: "FTP offline"
+
+
+# -----
+# UDP port
+# -----
+# Attempts to establish a UDP connection to a given port.
+# NOTE: We send a message and attempt to receive a response.
+#       If the port is closed we get an IO exception and assume the port to be unreachable.
+#       If the port is open we most likely don't get ANY response and when the timeout
+#       is reached we assume the port to be reachable. This is not an exact check.
+# Host might be :local/SSH connection/String(IP/DNS)
+# Available options:
+#
+#   message    Error message when connection cannot be established
+#   timeout    Timeout in seconds to wait for a response (default = 2 seconds - false/nil = 1 hour)
+#
+udp_port "example.com", 9987, message: "Teamspeak offline"
+udp_port :my_server, 9987, message: "Teamspeak offline"
+
+
 # -----
 # FTP availability
 # -----

data/lib/watchmonkey_cli/checkers/tcp_port.rb

@@ -0,0 +1,29 @@
+module WatchmonkeyCli
+  module Checkers
+    class TcpPort < Checker
+      self.checker_name = "tcp_port"
+
+      def enqueue host, port, opts = {}
+        opts = { message: "Port #{port} (TCP) is not reachable!", timeout: 2 }.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, port, opts)
+      end
+
+      def check! result, host, port, opts = {}
+        result.result = port_open?(host.is_a?(String) ? host : host.is_a?(WatchmonkeyCli::LoopbackConnection) ? "127.0.0.1" : host.opts[:host_name] || host.opts[:host] || host.opts[:ip], port, opts)
+        result.error! "#{opts[:message]}" unless result.result
+      end
+
+      def port_open?(ip, port, opts = {})
+        Timeout::timeout(opts[:timeout] ? opts[:timeout] : 3600) do
+          s = TCPSocket.new(ip, port)
+          s.close
+        end
+        true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Timeout::Error
+        return false
+      end
+    end
+  end
+end

data/lib/watchmonkey_cli/checkers/udp_port.rb

@@ -0,0 +1,34 @@
+module WatchmonkeyCli
+  module Checkers
+    class UdpPort < Checker
+      self.checker_name = "udp_port"
+
+      def enqueue host, port, opts = {}
+        opts = { message: "Port #{port} (UDP) is not reachable!", timeout: 2 }.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, port, opts)
+      end
+
+      def check! result, host, port, opts = {}
+        result.result = port_open?(host.is_a?(String) ? host : host.is_a?(WatchmonkeyCli::LoopbackConnection) ? "127.0.0.1" : host.opts[:host_name] || host.opts[:host] || host.opts[:ip], port, opts)
+        result.error! "#{opts[:message]}" unless result.result
+      end
+
+      def port_open?(ip, port, opts = {})
+        Timeout::timeout(opts[:timeout] ? opts[:timeout] : 3600) do
+          s = UDPSocket.new
+          s.connect(ip, port)
+          s.send "aaa", 0
+          s.recv(1)
+          s.close
+        end
+        true
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+        return false
+      rescue Timeout::Error
+        return true
+      end
+    end
+  end
+end

data/lib/watchmonkey_cli/ssh_connection.rb

@@ -1,5 +1,7 @@
 module WatchmonkeyCli
   class SshConnection
+    attr_reader :opts
+
     def initialize(id, opts = {}, &initializer)
       @id = id
 

data/lib/watchmonkey_cli/version.rb

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

data/lib/watchmonkey_cli.rb

@@ -35,11 +35,13 @@ require "watchmonkey_cli/application"
 require "watchmonkey_cli/checkers/ftp_availability"
 require "watchmonkey_cli/checkers/mysql_replication"
 require "watchmonkey_cli/checkers/ssl_expiration"
+require "watchmonkey_cli/checkers/tcp_port"
+require "watchmonkey_cli/checkers/ts3_license"
+require "watchmonkey_cli/checkers/udp_port"
 require "watchmonkey_cli/checkers/unix_defaults"
 require "watchmonkey_cli/checkers/unix_df"
 require "watchmonkey_cli/checkers/unix_file_exists"
 require "watchmonkey_cli/checkers/unix_load"
 require "watchmonkey_cli/checkers/unix_mdadm"
 require "watchmonkey_cli/checkers/unix_memory"
-require "watchmonkey_cli/checkers/ts3_license"
 require "watchmonkey_cli/checkers/www_availability"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: '1.8'
 platform: ruby
 authors:
 - Sven Pachnit
@@ -126,7 +126,9 @@ 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/tcp_port.rb
 - lib/watchmonkey_cli/checkers/ts3_license.rb
+- lib/watchmonkey_cli/checkers/udp_port.rb
 - lib/watchmonkey_cli/checkers/unix_defaults.rb
 - lib/watchmonkey_cli/checkers/unix_df.rb
 - lib/watchmonkey_cli/checkers/unix_file_exists.rb