sensu-plugins-dns 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 430dc3ea38b7b3450e2bcebebfc4e5b3c557d465
-  data.tar.gz: 96ce94335d5d153dd4a2a193a8d94b34bb1bbdbd
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTY2MWMzY2RmNDNlNWY5YjYzZThmZmMyMzQ4ZjAyOWRhYTkzZjZkZg==
+  data.tar.gz: !binary |-
+    YWM3N2UxNDFhNmIxNzYwOWYxMDcxZDEyMDYxNDU5MGFjYjU1NWFlOA==
 SHA512:
-  metadata.gz: d367eebc55c005193950dfdd129f7243685a9fd7ba18ec4bec7bff4b69189141f8cfdf808acf16460ba3572b074cb9eacf0425ec3a41e027a96a6c7c796cbbb3
-  data.tar.gz: 5ea3a911ae92b0a05acaed16568e985baba94da30e9cbcc9e52a328d2b8dc0873eb4660275d07cefc3e834fc7205fe9f708e9949d7542ab2893f7abb8e3198f0
+  metadata.gz: !binary |-
+    NTdiNjlmNTlkMmI4ZTY1YTRkNTg3YzUyNmI1MGZlMGY4MWJlNTNkNTIzYjJh
+    NmQ2MTU0YmNhNzhmNDliMDAwMzM2ZGJiYWNmZDk0NjcxYjgwNTNmNWZlNWQ3
+    YjgzYTI5MTgzY2MxYWFiNDc4Y2JkNmIzNGI0OTU5MzMzMTE0MjY=
+  data.tar.gz: !binary |-
+    ZjQ2NTdmMDQ3NGJiOTNiOTlhZjRiMDkxMmNjMjhhNGM0NmU2NjMwNWMxMDNk
+    NGZlNDg5YzI5YWIxMGFhZmE4YWFjNmE1OWNkYWJjODgxMzU5NjM1MDRhMjVh
+    MzA3Y2I4MzE2OTIzM2Q3MWU2YTMyMjlkZWNjZTY0Yjg2NTJjZGM=

data/CHANGELOG.md

@@ -3,8 +3,21 @@ 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
+## [Unreleased]
+
+## [1.0.0] - 2016-05-11
+### Added
+- Added support for Regular Expression matching
+- Added simple response time metric
+- Added dnssec validation --validate
+- Unlocked the dnsruby dependency to allow upgrades
+- Support for Ruby 2.3
+
+### Removed
+- Support for Ruby 1.9.3
+
+### Changed
+- Upgrade to rubocop 0.40 and cleanup
 
 ## [0.0.6] - 2015-09-28
 ### Changed
@@ -23,9 +36,16 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - updated sensu-plugin gem to 1.2.0
 
 ## [0.0.3] - 2015-06-02
-
 ### Fixed
 - added binstubs
 
 ### Changed
 - removed cruft from /lib
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/1.0.0...HEAD
+[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
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/0.0.4...0.0.5
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-dns/compare/0.0.1...0.0.2

data/README.md

@@ -1,16 +1,16 @@
 ## Sensu-Plugins-dns
 
-[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-dns.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-dns)
+[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-dns.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-dns)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-dns.svg)](http://badge.fury.io/rb/sensu-plugins-dns)
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-dns/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-dns)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-dns/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-dns)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-dns.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-dns)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-dns](https://codeship.com/projects/2f39b7d0-d5af-0132-5eda-2a31c2fb7a04/status?branch=master)](https://codeship.com/projects/78143)
 
 ## Functionality
 
 ## Files
  * bin/check-dns.rb
+ * bin/metrics-dns.rb
 
 ## Usage
 
@@ -19,3 +19,4 @@
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+

data/bin/check-dns.rb

@@ -56,6 +56,11 @@ class DNS < Sensu::Plugin::Check::CLI
          short: '-r RESULT',
          long: '--result RESULT'
 
+  option :regex,
+         description: 'Compare results to a regular expression',
+         short: '-R REGEX',
+         long: '--regex-match REGEX'
+
   option :warn_only,
          description: 'Warn instead of critical on failure',
          short: '-w',
@@ -67,45 +72,73 @@ class DNS < Sensu::Plugin::Check::CLI
          long: '--debug',
          boolean: true
 
+  option :validate,
+         description: 'Validate dnssec responses',
+         short: '-v',
+         long: '--validate',
+         boolean: true
+
   def resolve_domain
     resolv = config[:server].nil? ? Dnsruby::Resolver.new : Dnsruby::Resolver.new(nameserver: [config[:server]])
-
+    resolv.do_validation = true if config[:validate]
     entries = resolv.query(config[:domain], config[:type])
-
     puts "Entries: #{entries}" if config[:debug]
 
     entries
   end
 
+  def check_against_regex(entries, regex)
+    # produce an Array of entry strings
+    b = if entries.answer.count > 1
+          entries.answer.rrsets(config[:type].to_s).map(&:to_s)
+        else
+          [entries.answer.first.to_s]
+        end
+    b.each do |answer|
+      if answer.match(regex)
+        ok "Resolved #{config[:domain]} #{config[:type]} matched #{regex}"
+      end
+    end # b.each()
+    critical "Resolved #{config[:domain]} #{config[:type]} did not match #{regex}"
+  end
+
   def run
     unknown 'No domain specified' if config[:domain].nil?
 
     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
+    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]
+    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.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]}"
+      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
+    elsif config[:regex]
+      check_against_regex(entries, Regexp.new(config[:regex]))
+
+    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]}"
     else
       ok "Resolved #{config[:domain]} #{config[:type]}"
     end

data/bin/metrics-dns.rb

@@ -0,0 +1,73 @@
+#! /usr/bin/env ruby
+#
+#   metrics-dns
+#
+# DESCRIPTION:
+#   This plugin gathers some simple DNS
+#   statistics, such as the amount of time taken
+#   to resolve a name (response time).
+#
+# OUTPUT:
+#   metric data
+#
+# PLATFORMS:
+#   Linux, BSD
+#
+# DEPENDENCIES:
+#   gem: sensu-plugin
+#   gem: dnsruby
+#
+# USAGE:
+#
+# LICENSE:
+#   Released under the same terms as Sensu (the MIT license); see LICENSE
+#   for details.
+#
+require 'sensu-plugin/metric/cli'
+require 'dnsruby'
+require 'benchmark'
+
+class DNSGraphite < Sensu::Plugin::Metric::CLI::Graphite
+  option :domain,
+         description: 'Domain to resolve (or ip if type PTR)',
+         short: '-d DOMAIN',
+         long: '--domain DOMAIN'
+
+  option :type,
+         description: 'Record type to resolve (A, AAAA, TXT, etc) use PTR for reverse lookup',
+         short: '-t RECORD',
+         long: '--type RECORD',
+         default: 'A'
+
+  option :server,
+         description: 'Server to use for resolution',
+         short: '-s SERVER',
+         long: '--server SERVER'
+
+  option :scheme,
+         description: 'Metric naming scheme, text to prepend to metric',
+         short: '-S SCHEME',
+         long: '--scheme SCHEME',
+         default: "#{Socket.gethostname}.dns"
+
+  def run
+    unknown 'No domain specified' if config[:domain].nil?
+
+    begin
+      resolver = config[:server].nil? ? Dnsruby::Resolver.new : Dnsruby::Resolver.new(nameserver: [config[:server]])
+      result = Benchmark.realtime { resolver.query(config[:domain], config[:type]) }
+
+      key_name = config[:domain].to_s.tr('.', '_')
+
+      # Response Time stat
+      output "#{config[:scheme]}.#{config[:type]}.#{key_name}.response_time", result.to_f.round(8)
+    rescue Dnsruby::NXDomain
+      critical "Could not resolve #{config[:domain]} #{config[:type]} record"
+    rescue => e
+      unknown e
+    end
+
+    # and exit 'ok'
+    ok
+  end
+end

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

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

metadata

@@ -1,197 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-dns
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-10-01 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: dnsruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.58.0
+        version: '1.59'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.59.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.59'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.58.0
+        version: 1.59.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-description: |-
-  This plugin provides native DNS instrumentation
-                                for monitoring, including: record resolution
-email: "<sensu-users@googlegroups.com>"
+description: ! "This plugin provides native DNS instrumentation\n                              for
+  monitoring, including: record resolution"
+email: <sensu-users@googlegroups.com>
 executables:
 - check-dns.rb
+- metrics-dns.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -199,13 +183,14 @@ files:
 - LICENSE
 - README.md
 - bin/check-dns.rb
+- bin/metrics-dns.rb
 - lib/sensu-plugins-dns.rb
 - lib/sensu-plugins-dns/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-dns
 licenses:
 - MIT
 metadata:
-  maintainer: "@mattyjones"
+  maintainer: sensu-plugin
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -217,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for dns

metadata.gz.sig

@@ -1,2 +0,0 @@
-VJ��9�y�Uq����@V��B�ӳ��A���f���<h3�W��$L����d
-