sensu-plugins-network-checks 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46421c6d0dc7862d251f2700a9a4487b9f144f7a
-  data.tar.gz: 7131967b4d010104830c77fb483b3cbfa295ac4a
+  metadata.gz: 651fd18722857deccf8b625724d9af60f6fa6f11
+  data.tar.gz: fac9caaa1715e6dce254c730f7292c1b229a5efc
 SHA512:
-  metadata.gz: f84d7725673e378612e026fac3a2f027a2d73d2b04457947be44170fd632035b1535f08e29dc1daf9f858e9d81bb5e4b54f32ebb34b8b5a2ed54e8f7edd15a77
-  data.tar.gz: 92b82831b5022e73ff521be0fdb22048822ed13d643f6b80c3759994909626aed8d65b266db5d815e2859c1202c2d16b1d731f15d0cfe7a094bdbb68fddbd5be
+  metadata.gz: 786041c0783aed55f063262ed705438e40af3b662406527a3d9d308190f1597c6c8e539eb08fa82519bb38797208a7e0c6174205b4cc38db4dbfbfe94531ce67
+  data.tar.gz: fd47db814330cc687da22208cc4b642cbd3cdb0c9b1d271529b5a7994f1d58c7d75978dcbf217d062542edc4aee1faa7d49adb1e659b8c613759d72f649deb6d

data/CHANGELOG.md

@@ -4,6 +4,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.2.0] - 2017-06-07
+### Added
+- Added check-ports-bind.rb (@hanynowsky)
+- Added interval option to metrics-netif.rb (@Evesy)
+- metrics-netif.rb: expose average-key option that is used to `grep` to more easily handle locale issues (@majormoses)
+- metrics-netif.rb: unknown if it can not find `sar` in its `$PATH` (@majormoses)
+- check-ping.rb: unknown if using `--reports` and do not have `mtr` installed and in "$PATH" (@majormoses)
+
+### Fixed
+- metrics-netstat-tcp.rb: Option to disable IPv6 check (#44 via @MattMencel)
+- check-multicast-groups.rb: Fix undefined method deep_merge for []:Array (@maoe)
+- check-whois-domain-expiration-multi.rb does not fail as timeout is cast to integer (@majormoses)
+
+### Changed
+- check-banner.rb: Option to enable SSL socket for secure connection
 
 ## [1.1.0] - 2016-08-07
 ### Added
@@ -29,7 +44,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [0.2.4] - 2016-04-02
 ### Fixed
-- metrics-ping.rb: Fix error when a host can't be pinged. Convert to a proper metrics check.
+- metrics-ping.rb: Fix error when a host cannot be pinged. Convert to a proper metrics check.
 
 ### Added
 - basic check for netfilter conntrack
@@ -151,7 +166,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 * initial release, same as community repo
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/0.2.4...1.0.0
 [0.2.4]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/0.1.4...0.2.4

data/README.md

@@ -16,6 +16,7 @@
  * bin/check-ping.rb
  * bin/check-ports-nmap.rb
  * bin/check-ports.rb
+ * bin/check-ports-bind.rb
  * bin/check-rbl.rb
  * bin/check-socat.rb
  * bin/check-whois-domain-expiration-multi.rb

data/bin/check-banner.rb

@@ -34,6 +34,7 @@
 #   Released under the same terms as Sensu (the MIT license); see LICENSE
 #   for details.
 
+require 'openssl'
 require 'sensu-plugin/check/cli'
 require 'socket'
 require 'timeout'
@@ -101,9 +102,21 @@ class CheckBanner < Sensu::Plugin::Check::CLI
          long: '--critmessage MESSAGE',
          description: 'Custom critical message to send'
 
+  option :ssl,
+         short: '-S',
+         long: '--ssl',
+         description: 'Enable SSL socket for secure connection'
+
   def acquire_banner(host)
     Timeout.timeout(config[:timeout]) do
       sock = TCPSocket.new(host, config[:port])
+
+      if config[:ssl]
+        ssl_context = OpenSSL::SSL::SSLContext.new
+        sock = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
+        sock.connect
+      end
+
       if config[:write]
         sock.write config[:write]
         sock.write "\n" unless config[:exclude_newline]

data/bin/check-multicast-groups.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 #
-#   check-multicasr-groups
+#   check-multicast-groups
 #
 # DESCRIPTION:
 #   This plugin checks if specific multicast groups are configured
@@ -51,7 +51,7 @@ class CheckMulticastGroups < Sensu::Plugin::Check::CLI
   def run
     targets = settings['check-multicast-groups'] ||= []
     extras = load_config(config[:config])['check-multicast-groups'] || []
-    targets.deep_merge(extras)
+    targets = targets.concat(extras).uniq
 
     critical 'No target muticast groups are specified.' if targets.empty?
 
@@ -64,7 +64,7 @@ class CheckMulticastGroups < Sensu::Plugin::Check::CLI
     expected = Set.new(targets)
 
     diff = expected.difference(actual)
-    if diff.size > 0 # rubocop:disable Style/ZeroLengthPredicate
+    unless diff.empty?
       diff_output = diff.map { |iface, addr| "#{iface}\t#{addr}" }.join("\n")
       critical "#{diff.size} missing multicast group(s):\n#{diff_output}"
     end

data/bin/check-ping.rb

@@ -98,6 +98,10 @@ class CheckPING < Sensu::Plugin::Check::CLI
       failure_message = "ICMP ping unsuccessful for host: #{config[:host]} (successful: #{successful_count}/#{total_count})"
 
       if config[:report]
+        mtr = `mtr --help`
+        if mtr == 1
+          unknown 'mtr is not available in $PATH'
+        end
         report = `mtr --curses --report-cycles=1 --report --no-dns #{config[:host]}`
         failure_message = failure_message + "\n" + report
       end

data/bin/check-ports-bind.rb

@@ -0,0 +1,158 @@
+#! /usr/bin/env ruby
+#
+#  encoding: UTF-8
+#   check-ports-bind
+#
+# DESCRIPTION:
+# Connect to a TCP/UDP address:port, to check whether open or closed.
+# Don't use nmap since it's overkill.
+# Test UDP ports as well: Experimental
+#
+# OUTPUT:
+#   plain text
+#
+# PLATFORMS:
+#   Linux
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#
+# USAGE:
+#
+# Ports are comma separated and support ranges
+# ./check-ports.rb -p 127.0.0.1:22,46.20.205.10 --hard --warn
+# ./check-ports.rb -p 127.0.0.1:22,46.20.205.10:80
+# If you mention a port without the bind address then the default address is : 0.0.0.0
+#
+# NOTES:
+# By default, checks for openssh on localhost port 22
+#
+#
+# LICENSE:
+#   Adpated from check-ports.rb
+#   Magic Online - www.magic.fr - hanynowsky@gmail.com
+#   September 2016
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+
+require 'sensu-plugin/check/cli'
+require 'socket'
+require 'timeout'
+
+#
+# Check Ports by bound address
+#
+class CheckPort < Sensu::Plugin::Check::CLI
+  option(
+    :hard,
+    short: '-d',
+    long: '--hard',
+    description: 'Check given ports on both, TCP & UDP',
+    boolean: true,
+    default: false
+
+  )
+  option(
+    :host,
+    short: '-H HOSTNAME',
+    long: '--hostname HOSTNAME',
+    description: 'default Host address bound to port',
+    default: '0.0.0.0'
+  )
+
+  option(
+    :portbinds,
+    short: '-p PORTS',
+    long: '--portbinds PORTS',
+    description: 'different address:port to check, comma separated (0.0.0.0:22,localhost:25,127.0.0.0.1:8100-8131,192.168.0.12:3030)',
+    default: '0.0.0.0:22'
+  )
+
+  option(
+    :timeout,
+    short: '-t SECS',
+    long: '--timeout SECS',
+    description: 'Connection timeout',
+    proc: proc(&:to_i),
+    default: 10
+  )
+
+  option(
+    :warn,
+    description: 'Alert level. warn(warning) instead of critical',
+    short: '-w',
+    long: '--warn',
+    default: false,
+    boolean: true
+  )
+
+  option(
+    :debug,
+    description: 'Print debug info',
+    short: '-D',
+    long: '--debug',
+    default: false,
+    boolean: true
+  )
+
+  # Severity switcher
+  def severity(warn, text)
+    if warn
+      warning text.to_s
+    else
+      critical text.to_s
+    end
+  end
+
+  # Check address:port
+  def check_port(portbind, okays)
+    address = portbind.split(':')[0]
+    port = portbind.split(':')[1]
+    Timeout.timeout(config[:timeout]) do
+      connection = TCPSocket.new(address, port.to_i)
+      p connection if config[:debug]
+      okays.push("TCP-#{portbind}")
+    end
+    if config[:hard]
+      Timeout.timeout(config[:timeout]) do
+        s = UDPSocket.new
+        s.connect(address, port.to_i)
+        s.close
+        okays.push("UDP-#{portbind}")
+      end
+    end
+  rescue Errno::ECONNREFUSED
+    severity(config[:warn], "Connection refused by #{portbind}")
+  rescue Timeout::Error
+    severity(config[:warn], "Connection or read timed out (#{portbind})")
+  rescue Errno::EHOSTUNREACH
+    severity(config[:warn], "Check failed to run: No route to host (#{portbind})")
+  rescue EOFError
+    severity(config[:warn], "Connection closed unexpectedly (#{portbind})")
+  end
+
+  def run
+    portbinds = config[:portbinds].split(',').flat_map do |port_bind|
+      port_bind = "#{config[:host]}:#{port_bind}" unless port_bind.include? ':'
+      # Port range
+      if port_bind.split(',')[1] =~ /^[0-9]+(-[0-9]+)$/
+        first_port, last_port = port_bind.split('-')
+        (first_port.to_i..last_port.to_i).to_a
+        # Single port
+      else
+        port_bind
+      end
+    end
+    array = []
+    portbinds.each do |port|
+      check_port(port, array)
+    end
+    multiplier = 1
+    multiplier = 2 if config[:hard] == true
+    if array.size == portbinds.size * multiplier
+      ok "All ports (#{config[:portbinds]}) are reachable - HARD: #{config[:hard]} => SUCCESS: #{array}"
+    else
+      severity(config[:warn], 'port count or pattern does not match')
+    end
+  end
+end

data/bin/check-whois-domain-expiration-multi.rb

@@ -44,17 +44,20 @@ class WhoisDomainExpirationCheck < Sensu::Plugin::Check::CLI
          short: '-w DAYS',
          long: '--warn DAYS',
          default: 30,
+         proc: proc(&:to_i),
          description: 'Warn if fewer than DAYS away'
 
   option :critical,
          short: '-c DAYS',
          long: '--critical DAYS',
+         proc: proc(&:to_i),
          default: 7,
          description: 'Critical if fewer than DAYS away'
 
   option :timeout,
          short: '-t SECONDS',
          long: '--timeout SECONDS',
+         proc: proc(&:to_i),
          default: 10,
          description: 'Timeout for whois lookup'
 

data/bin/metrics-netif.rb

@@ -37,8 +37,22 @@ class NetIFMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: Socket.gethostname.to_s
 
+  option :interval,
+         description: 'Interval to collect metrics over',
+         long: '--interval INTERVAL',
+         default: 1
+
+  option :average_key,
+         description: 'This key is used to `grep` for a key that corresponds to average. useful for different locales',
+         long: '--average-key',
+         default: 'Average'
+
   def run
-    `sar -n DEV 1 1 | grep Average | grep -v IFACE`.each_line do |line|
+    sar = `sar -n DEV #{config[:interval]} 1 | grep #{config[:average_key]} | grep -v IFACE`
+    if sar.nil? || sar.empty?
+      unknown 'sar is not installed or in $PATH'
+    end
+    sar.each_line do |line|
       stats = line.split(/\s+/)
       unless stats.empty?
         stats.shift

data/bin/metrics-netstat-tcp.rb

@@ -76,6 +76,12 @@ class NetstatTCPMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--port PORT',
          proc: proc(&:to_i)
 
+  option :disabletcp6,
+         description: 'Disable tcp6 check',
+         short: '-d',
+         long: '--disabletcp6',
+         boolean: true
+
   def netstat(protocol, pattern, state_counts)
     File.open('/proc/net/' + protocol).each do |line|
       line.strip!
@@ -101,8 +107,10 @@ class NetstatTCPMetrics < Sensu::Plugin::Metric::CLI::Graphite
     tcp4_pattern = /^\s*\d+:\s+(.{8}):(.{4})\s+(.{8}):(.{4})\s+(.{2})/
     state_counts = netstat('tcp', tcp4_pattern, state_counts)
 
-    tcp6_pattern = /^\s*\d+:\s+(.{32}):(.{4})\s+(.{32}):(.{4})\s+(.{2})/
-    state_counts = netstat('tcp6', tcp6_pattern, state_counts)
+    unless config[:disabletcp6]
+      tcp6_pattern = /^\s*\d+:\s+(.{32}):(.{4})\s+(.{32}):(.{4})\s+(.{2})/
+      state_counts = netstat('tcp6', tcp6_pattern, state_counts)
+    end
 
     state_counts.each do |state, count|
       graphite_name = config[:port] ? "#{config[:scheme]}.#{config[:port]}.#{state}" :

data/lib/sensu-plugins-network-checks/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsNetworkChecks
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-network-checks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnsbl-client
@@ -70,16 +70,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +233,7 @@ executables:
 - check-netfilter-conntrack.rb
 - check-netstat-tcp.rb
 - check-ping.rb
+- check-ports-bind.rb
 - check-ports-nmap.rb
 - check-ports.rb
 - check-rbl.rb
@@ -259,6 +260,7 @@ files:
 - bin/check-netfilter-conntrack.sh
 - bin/check-netstat-tcp.rb
 - bin/check-ping.rb
+- bin/check-ports-bind.rb
 - bin/check-ports-nmap.rb
 - bin/check-ports.rb
 - bin/check-rbl.rb
@@ -299,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking network hardware, connections, and data