sensu-plugins-dns 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c4a1a4584123303d29aa528f66076f41cf91b9ea1158e4dcb1ccb2cb83692c6
-  data.tar.gz: bdef1db7617e2bef6e563118c5dde7fdd35a9491f36b48a2012e85d4cbcd4be0
+  metadata.gz: 53a429e24b6cdf656b6e77bf0029e665d140c74efef5cf62dd9cbd36745c5dfb
+  data.tar.gz: a84326254d63f448522ea399c1f1ea511424db4b20ba3fc237a760aeeead905c
 SHA512:
-  metadata.gz: 5a2f3339c209eb1980f2261cc7674f40160b3d54cf72e83e3edd03d5c19f1d15ecfa7ad3e924d28613149baba83b3f1323ebd64a944ad65b66b6474c6f8a4ff9
-  data.tar.gz: f8088ee883af1e38e7d89c6fedc4fa0c89ee87b2931d14e96a2a156f542e46d856f947a4220d1f3816af1e195ac1f588578a1e28788515d534817fcf9e2c665a
+  metadata.gz: 8bab8fa874b28fab41648b1ab3c19fd0f7876e944abbc9a1d50840f57ba91fdaf07bb27497d3fccbca185b06ac4e50d97c25f465135f1fb7f60a222061f6e20a
+  data.tar.gz: 156d4f4a21c48cb9fa08add6b340f8162ff654fe8fcf8d981d10267dbbecc24d048893a6617a52dfa43df7ec209ff6137630478d2d95b238efa34a73ff346dd0

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.4.0] - 2018-03-21
+### Added
+- check-dns.rb: Added ability to use many name servers (@yuri-zubov)
+
 ## [1.3.0] - 2017-11-04
 ### Added
 - Support for multiple resolvable ips (comma separated). (@adamdecaf)
@@ -76,7 +80,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Changed
 - removed cruft from /lib
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.2.1...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.4.0...HEAD
+[1.4.0]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.3.0...1.4.0
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.2.1...1.3.0
 [1.2.1]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.2.0...1/1.2.1
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.1.0...1/1.2

data/bin/check-dns.rb

@@ -54,7 +54,7 @@ class DNS < Sensu::Plugin::Check::CLI
          default: 'IN'
 
   option :server,
-         description: 'Server to use for resolution',
+         description: 'A comma-separated list of servers to use for resolution',
          short: '-s SERVER',
          long: '--server SERVER'
 
@@ -118,9 +118,10 @@ class DNS < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          default: 5
 
-  def resolve_domain
+  def resolve_domain(server)
     dnsruby_config = {}
-    dnsruby_config[:nameserver] = [config[:server]] unless config[:server].nil?
+
+    dnsruby_config[:nameserver] = server unless server.nil?
     dnsruby_config[:port] = config[:port] unless config[:port].nil?
     dnsruby_config[:use_tcp] = config[:use_tcp] unless config[:use_tcp].nil?
     resolv = Dnsruby::Resolver.new(dnsruby_config)
@@ -229,10 +230,19 @@ class DNS < Sensu::Plugin::Check::CLI
     unknown 'No domain specified' if config[:domain].nil?
     unknown 'Count must be 1 or more' if config[:request_count] < 1
 
-    entries = resolve_domain
-    errors, success = check_results(entries)
+    success = []
+    errors = []
+
+    ns = config[:server].nil? ? [nil] : config[:server].split(',')
+    ns.each do |server|
+      entries = resolve_domain(server)
+      e, s = check_results(entries)
+
+      success += s
+      errors += e
+    end
 
-    percent = success.count.to_f / config[:request_count] * 100
+    percent = success.count.to_f / (config[:request_count] * ns.count) * 100
     if percent < config[:threshold]
       output = "#{percent.to_i}% of tests succeeded: #{errors.uniq.join(', ')}"
       config[:warn_only] ? warning(output) : critical(output)

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

@@ -1,7 +1,7 @@
 module SensuPluginsDNS
   module Version
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -237,8 +237,8 @@ description: |-
                                 for monitoring, including: record resolution
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-dns.rb
 - metrics-dns.rb
+- check-dns.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for dns