sensu-plugins-network-checks 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edab660709634d98ae04bed1fb56a3cd591a9411
-  data.tar.gz: f2a95aae97c17f26bf0011227643cf5f42c51cef
+  metadata.gz: 46421c6d0dc7862d251f2700a9a4487b9f144f7a
+  data.tar.gz: 7131967b4d010104830c77fb483b3cbfa295ac4a
 SHA512:
-  metadata.gz: f3e9d9e983c27373ae5962282a0a58d728edbd552cd697bcfadc279dd4e34ec5cedb9a2ad6e5f307416e60341000c3c031ca8bbb7ede720a06bb3be8f48c0736
-  data.tar.gz: b9346418cd3eaa831990bbedcb5d6fbccf6e9c8d51226c8a5f54433cc7c7cfe4110a7cda0d8b51d3f268f543f85444ddaba58a29b06ce32053dce12a16dda20f
+  metadata.gz: f84d7725673e378612e026fac3a2f027a2d73d2b04457947be44170fd632035b1535f08e29dc1daf9f858e9d81bb5e4b54f32ebb34b8b5a2ed54e8f7edd15a77
+  data.tar.gz: 92b82831b5022e73ff521be0fdb22048822ed13d643f6b80c3759994909626aed8d65b266db5d815e2859c1202c2d16b1d731f15d0cfe7a094bdbb68fddbd5be

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.0] - 2016-08-07
+### Added
+- metrics-netstat-tcp.rb: Add IPv6 state counts (@mlf4aiur)
+
+### Fixed
+- check-ping.rb: Fix false positives (#34 via @kai101)
+
 ## [1.0.0] - 2016-06-14
 ### Fixed
 - check-whois-domain-expiration-multi.rb: Handle whois errors better by retrying failed lookups
@@ -144,7 +151,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.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/1.1.0...HEAD
+[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
 [0.1.4]: https://github.com/sensu-plugins/sensu-plugins-network-checks/compare/0.1.3...0.1.4

data/bin/check-ping.rb

@@ -81,10 +81,10 @@ class CheckPING < Sensu::Plugin::Check::CLI
   def run
     result = []
     pt = Net::Ping::External.new(config[:host], nil, config[:timeout])
-    config[:ipv6] ? (ping = pt.ping6) : (ping = pt.ping)
+
     config[:count].times do |i|
       sleep(config[:interval]) unless i == 0
-      result[i] = ping
+      result[i] = config[:ipv6] ? pt.ping6 : pt.ping
     end
 
     successful_count = result.count(true)

data/bin/metrics-netstat-tcp.rb

@@ -76,13 +76,10 @@ class NetstatTCPMetrics < Sensu::Plugin::Metric::CLI::Graphite
          long: '--port PORT',
          proc: proc(&:to_i)
 
-  def netstat(protocol = 'tcp')
-    state_counts = Hash.new(0)
-    TCP_STATES.each_pair { |_hex, name| state_counts[name] = 0 }
-
+  def netstat(protocol, pattern, state_counts)
     File.open('/proc/net/' + protocol).each do |line|
       line.strip!
-      if m = line.match(/^\s*\d+:\s+(.{8}):(.{4})\s+(.{8}):(.{4})\s+(.{2})/) # rubocop:disable AssignmentInCondition
+      if m = line.match(pattern) # rubocop:disable AssignmentInCondition
         connection_state = m[5]
         connection_port = m[2].to_i(16)
         connection_state = TCP_STATES[connection_state]
@@ -98,7 +95,16 @@ class NetstatTCPMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def run
     timestamp = Time.now.to_i
-    netstat('tcp').each do |state, count|
+    state_counts = Hash.new(0)
+    TCP_STATES.each_pair { |_hex, name| state_counts[name] = 0 }
+
+    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)
+
+    state_counts.each do |state, count|
       graphite_name = config[:port] ? "#{config[:scheme]}.#{config[:port]}.#{state}" :
         "#{config[:scheme]}.#{state}"
       output graphite_name.to_s, count, timestamp

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

@@ -1,7 +1,7 @@
 module SensuPluginsNetworkChecks
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnsbl-client
@@ -304,4 +304,3 @@ signing_key:
 specification_version: 4
 summary: Sensu plugins for checking network hardware, connections, and data
 test_files: []
-has_rdoc: