sensu-plugins-dns 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664c93fc6c8a257e432477013bb4c30ca3e65dcc
-  data.tar.gz: 62dd7664dfedde6cabc6aa218347f35bf93997a5
+  metadata.gz: 4ea5d5beab135be6075b0d6852baed6faee580ff
+  data.tar.gz: 9a96a200a5b29a3b825d854511b0c07d7e0a8fe3
 SHA512:
-  metadata.gz: ffa2592d77b836dd07b2a8ebdbd9cea08f6b4f84700a64a4867908303b083a571df07c8d2766f1d15122ccfcaa73be8e8691e46a379ad8b68f43e3e35387501f
-  data.tar.gz: f9834ffedaf0c1fee9d0eaa287896eb547625d4c38ee2532c4d2a9d4fc2e9e9fd39379fb9bb957c27f12f7aaa2e59061513a53404b13b13c8a17eb9f7334d125
+  metadata.gz: 08a0d341fdae3693ad67acb449ed7774ac82684686a59b468001c7757429e176d3a063ecca927bac9982996146bce8fb9cb0428ab1dd07a75c20a516a977d419
+  data.tar.gz: ecc6d2fb556c02325f110727f27f4407b98ff2612989a7075d5154c8be3640c16e015ae2745df25cf1aea85c84da38b7cf7f948fb52374a914d7088b1a521e95

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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-05-16
+### Added
+- Add support for making multiple requests, with a threshold for success
+
 ## [1.1.0]
 ### Added
 - Added option for DNS server port (@apriljo)
@@ -49,7 +53,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Changed
 - removed cruft from /lib
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.1.0...1/1.2
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.0.0...1/1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/0.0.6...1.0.0
 [0.0.6]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/0.0.5...0.0.6

data/bin/check-dns.rb

@@ -97,6 +97,20 @@ class DNS < Sensu::Plugin::Check::CLI
          long: '--use-tcp',
          boolean: true
 
+  option :request_count,
+         description: 'Number of DNS requests to send',
+         short: '-c COUNT',
+         long: '--request_count COUNT',
+         proc: proc(&:to_i),
+         default: 1
+
+  option :threshold,
+         description: 'Percentage of DNS queries that must succeed',
+         short: '-l PERCENT',
+         long: '--threshold PERCENT',
+         proc: proc(&:to_i),
+         default: 100
+
   option :timeout,
          description: 'Set timeout for query',
          short: '-T TIMEOUT',
@@ -111,9 +125,20 @@ class DNS < Sensu::Plugin::Check::CLI
     dnsruby_config[:use_tcp] = config[:use_tcp] unless config[:use_tcp].nil?
     resolv = Dnsruby::Resolver.new(dnsruby_config)
     resolv.do_validation = true if config[:validate]
-    entries = resolv.query(config[:domain], config[:type], config[:class])
-    resolv.query_timeout = config[:timeout]
-    puts "Entries: #{entries}" if config[:debug]
+
+    entries = []
+    count = 0
+    while count < config[:request_count]
+      begin
+        entry = resolv.query(config[:domain], config[:type], config[:class])
+        resolv.query_timeout = config[:timeout]
+      rescue => e
+        entry = e
+      end
+      entries << entry
+      puts "Entry #{count}: #{entry}" if config[:debug]
+      count += 1
+    end
 
     entries
   end
@@ -133,6 +158,59 @@ class DNS < Sensu::Plugin::Check::CLI
     critical "Resolved #{config[:domain]} #{config[:type]} did not match #{regex}"
   end
 
+  def check_results(entries)
+    errors = []
+    success = []
+
+    entries.each do |entry|
+      if entry.class == Dnsruby::NXDomain
+        errors << "Could not resolve #{config[:domain]} #{config[:type]} record"
+        next
+      elsif entry.class == Dnsruby::ResolvTimeout
+        errors << "Could not resolve #{config[:domain]}: Query timed out"
+        next
+      elsif entry.is_a?(Exception)
+        errors << "Could not resolve #{config[:domain]}: #{entry}"
+        next
+      end
+
+      puts entry.answer if config[:debug]
+      if entry.answer.length.zero?
+        success << "Could not resolve #{config[:domain]} #{config[:type]} record"
+      elsif config[:result]
+        # special logic for checking ipaddresses with result
+        # mostly for ipv6 but decided to use the same logic for
+        # consistency reasons
+        if config[:type] == 'A' || config[:type] == 'AAAA'
+          check_ips(entries)
+        # non ip type
+        else
+          b = if entry.answer.count > 1
+                entry.answer.rrsets(config[:type].to_s).to_s
+              else
+                entry.answer.first.to_s
+              end
+          if b.include?(config[:result])
+            success << "Resolved #{entry.security_level} #{config[:domain]} #{config[:type]} included #{config[:result]}"
+          else
+            errors << "Resolved #{config[:domain]} #{config[:type]} did not include #{config[:result]}"
+          end
+        end
+      elsif config[:regex]
+        check_against_regex(entry, Regexp.new(config[:regex]))
+
+      elsif config[:validate]
+        if entry.security_level != 'SECURE'
+          error << "Resolved  #{entry.security_level} #{config[:domain]} #{config[:type]}"
+        end
+        success << "Resolved #{entry.security_level} #{config[:domain]} #{config[:type]}"
+      else
+        success << "Resolved #{config[:domain]} #{config[:type]}"
+      end
+    end
+    [errors, success]
+  end
+
   def check_ips(entries)
     ips = entries.answer.rrsets(config[:type]).flat_map(&:rrs).map(&:address).map(&:to_s)
     result = IPAddr.new config[:result]
@@ -145,52 +223,17 @@ class DNS < Sensu::Plugin::Check::CLI
 
   def run
     unknown 'No domain specified' if config[:domain].nil?
+    unknown 'Count must be 1 or more' if config[:request_count] < 1
 
-    begin
-      entries = resolve_domain
-    rescue Dnsruby::NXDomain
-      output = "Could not resolve #{config[:domain]} #{config[:type]} record"
-      critical(output)
-      return
-    rescue => e
-      output = "Could not resolve  #{config[:domain]}: #{e}"
-      config[:warn_only] ? warning(output) : critical(output)
-      return
-    end
-    puts entries.answer if config[:debug]
-    if entries.answer.length.zero?
-      output = "Could not resolve #{config[:domain]} #{config[:type]} record"
-      config[:warn_only] ? warning(output) : critical(output)
-    elsif config[:result]
-      # special logic for checking ipaddresses with result
-      # mostly for ipv6 but decided to use the same logic for
-      # consistency reasons
-      if config[:type] == 'A' || config[:type] == 'AAAA'
-        check_ips(entries)
-      # non ip type
-      else
-        b = if entries.answer.count > 1
-              entries.answer.rrsets(config[:type].to_s).to_s
-            else
-              entries.answer.first.to_s
-            end
-        if b.include?(config[:result])
-          ok "Resolved #{entries.security_level} #{config[:domain]} #{config[:type]} included #{config[:result]}"
-        else
-          critical "Resolved #{config[:domain]} #{config[:type]} did not include #{config[:result]}"
-        end
-      end
-
-    elsif config[:regex]
-      check_against_regex(entries, Regexp.new(config[:regex]))
+    entries = resolve_domain
+    errors, success = check_results(entries)
 
-    elsif config[:validate]
-      if entries.security_level != 'SECURE'
-        critical "Resolved  #{entries.security_level} #{config[:domain]} #{config[:type]}"
-      end
-      ok "Resolved #{entries.security_level} #{config[:domain]} #{config[:type]}"
+    percent = success.count.to_f / config[:request_count] * 100
+    if percent < config[:threshold]
+      output = "#{percent.to_i}% of tests succeeded: #{errors.uniq.join(', ')}"
+      config[:warn_only] ? warning(output) : critical(output)
     else
-      ok "Resolved #{config[:domain]} #{config[:type]}"
+      ok(success.uniq.join(', '))
     end
   end
 end

data/lib/sensu-plugins-dns/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsDNS
   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-dns
 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: 2017-05-07 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin