sensu-plugins-dns 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a4f70c957d58fd9f463eac67941440890085d1d
-  data.tar.gz: 90e0d993d521ea0d095071d576c3c99396e61f2e
+  metadata.gz: 430dc3ea38b7b3450e2bcebebfc4e5b3c557d465
+  data.tar.gz: 96ce94335d5d153dd4a2a193a8d94b34bb1bbdbd
 SHA512:
-  metadata.gz: 3e17fe0db5ceb9b57ae1371762061b1c1f225f7940bafb82e1534257707a80ad2221d9e166297c6bd600e942e4f325d7008376f5f65c8aab6501006f11f93b0d
-  data.tar.gz: 081ad7275643bfbefa648703f475360f6daf4740e878dd599116c08e6a218272cb6ebbc3b43096802f2b52fb9b859ad4eb8994491daae1d38d2348f5135f7d2e
+  metadata.gz: d367eebc55c005193950dfdd129f7243685a9fd7ba18ec4bec7bff4b69189141f8cfdf808acf16460ba3572b074cb9eacf0425ec3a41e027a96a6c7c796cbbb3
+  data.tar.gz: 5ea3a911ae92b0a05acaed16568e985baba94da30e9cbcc9e52a328d2b8dc0873eb4660275d07cefc3e834fc7205fe9f708e9949d7542ab2893f7abb8e3198f0

data/CHANGELOG.md

@@ -4,7 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased][unreleased]
-- nothing
+* nothing
+
+## [0.0.6] - 2015-09-28
+### Changed
+- Migrated from ruby library resolv to dnsruby to support more dns related checks
 
 ## [0.0.5] - 2015-08-05
 ### Removed

data/bin/check-dns.rb

@@ -3,7 +3,7 @@
 #   check-dns
 #
 # DESCRIPTION:
-#   This plugin checks DNS resolution using ruby `resolv`.
+#   This plugin checks DNS resolution using dnsruby .
 #   Note: if testing reverse DNS with -t PTR option,
 #   results will not end with trailing '.' (dot)
 #
@@ -15,6 +15,7 @@
 #
 # DEPENDENCIES:
 #   gem: sensu-plugin
+#   gem: dnsruby
 #
 # USAGE:
 #   example commands
@@ -29,8 +30,7 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'resolv'
-
+require 'dnsruby'
 #
 # DNS
 #
@@ -68,12 +68,10 @@ class DNS < Sensu::Plugin::Check::CLI
          boolean: true
 
   def resolve_domain
-    resolv = config[:server].nil? ? Resolv::DNS.new : Resolv::DNS.new(nameserver: [config[:server]])
-    if config[:type] == 'PTR'
-      entries = resolv.getnames(config[:domain]).map(&:to_s)
-    else
-      entries = resolv.getaddresses(config[:domain]).map(&:to_s)
-    end
+    resolv = config[:server].nil? ? Dnsruby::Resolver.new : Dnsruby::Resolver.new(nameserver: [config[:server]])
+
+    entries = resolv.query(config[:domain], config[:type])
+
     puts "Entries: #{entries}" if config[:debug]
 
     entries
@@ -82,18 +80,34 @@ class DNS < Sensu::Plugin::Check::CLI
   def run
     unknown 'No domain specified' if config[:domain].nil?
 
-    entries = resolve_domain
-    if entries.length.zero?
-      output = "Could not resolve #{config[:domain]}"
+    begin
+      entries = resolve_domain
+      rescue  Dnsruby::NXDomain
+        output = "Could not resolve #{config[:domain]} #{config[:type]} record"
+        critical(output)
+        return
+      rescue  => e
+        output =  "Couldn 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]
-      if entries.include?(config[:result])
-        ok "Resolved #{config[:domain]} including #{config[:result]}"
+      if entries.answer.count > 1
+        b = entries.answer.rrsets("#{config[:type]}").to_s
+      else
+        b = entries.answer.first.to_s
+      end
+      if  b.include?(config[:result])
+        ok "Resolved #{config[:domain]} #{config[:type]} included #{config[:result]}"
       else
-        critical "Resolved #{config[:domain]} did not include #{config[:result]}"
+        critical "Resolved #{config[:domain]} #{config[:type]} did not include #{config[:result]}"
       end
     else
-      ok "Resolved #{config[:domain]} #{config[:type]} records"
+      ok "Resolved #{config[:domain]} #{config[:type]}"
     end
   end
 end

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

@@ -2,7 +2,7 @@ module SensuPluginsDNS
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-dns
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sensu Plugins and contributors
@@ -30,7 +30,7 @@ cert_chain:
   8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
   HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
   -----END CERTIFICATE-----
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -46,6 +46,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: dnsruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.58.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement