sensu-plugins-openldap 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0d4e9fac7ade558f069d99c7e43e60d4e3ca26
-  data.tar.gz: 0db64eb580d7f9729e55e848405030b2bd4c61df
+  metadata.gz: 2824d3133377be5e002896c57aa529d737b1bc4c
+  data.tar.gz: 2ca395f99861144f655751b87cdc6d73f0eda2a9
 SHA512:
-  metadata.gz: c115bf8886cffaaf560214f7673e1794c7e9efabc394eedabe9742b31a1adf05ffa9ac04f2cdc85d7922b54a838c3422c302deeecaa0cef87ed5d10251fbbc57
-  data.tar.gz: 2e10dbf829a55b90b8341a9fcb095a356647b1bbf4acc49edbfb562e58ad7daa28a513022bec5f0ea7eef7ba345f323000259956ca9f59bda222f15b93f14847
+  metadata.gz: 359c5718912d0eb01ef744fe285931ea674d82830cf8b434629e09101687b403deae7620917db7f9aee527a5c630409f4349edc1fe83c00b5911ebab720e8c7d
+  data.tar.gz: af5f26d0f57c10dd57acdf79cf174cffc4fbebda06927162d018b2018e9569e66e6da1479a8cbc6caaba13c4ec77f6eaed358f9d311876ffb61e8cde02a8797a

data/CHANGELOG.md

@@ -3,14 +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]
+## [Unreleased]
+
+## [1.0.0] - 2017-01-17
+### Added
+- check-syncrepl.rb: Add `--ca-certificate`, `--certificate` and `--encryption` options (@moriyoshi)
+- Ruby 2.3.0 support (@eheydrick)
+
+### Removed
+- Ruby < 2.1 support (@eheydrick)
 
 ## [0.0.3] - 2015-07-14
 ### Changed
 - updated sensu-plugin gem to 1.2.0
 
 ## [0.0.2] - 2015-06-03
-
 ### Fixed
 - added binstubs
 
@@ -18,7 +25,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - removed cruft from /lib
 
 ## 0.0.1 - 2015-05-21
-
 ### Added
 - initial release
 
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/0.0.3...1.0.0
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-openldap/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-openldap)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-openldap/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-openldap)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-openldap.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-openldap)
-[ ![Codeship Status for sensu-plugins/sensu-plugins-openldap](https://codeship.com/projects/7cc16ea0-db3b-0132-9eb0-0eed4ec53b27/status?branch=master)](https://codeship.com/projects/79575)
 
 ## Functionality
 
@@ -17,6 +16,6 @@
 
 ## Installation
 
-[Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md)
+[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes

data/bin/check-syncrepl.rb

@@ -3,7 +3,9 @@
 #   check-syncrepl
 #
 # DESCRIPTION:
-#   This plugin checks OpenLDAP nodes to veryfiy syncrepl is working.
+#   This plugin checks that OpenLDAP Sync replication is working by
+#   comparing the context change sequence number (contextCSN) of
+#   a list of servers.
 #   The plugin will attempt to use an unauthenticated connection if no
 #   user name (with the -u or --user option) and password (with the -p
 #   or --password option) are specified.
@@ -22,13 +24,13 @@
 #   bind to LDAP without authorisation
 #   ----------------------------------
 #   ./check-syncrepl.rb -h 'ldap1.domain,ldap2.domain'
-#   will compare the contextCSN of the ldap servers ldap1.domain and
+#   will compare the contextCSN of the LDAP servers ldap1.domain and
 #   ldap2.domain
 #
 #   bind to LDAP requiring authorisation
 #   ------------------------------------
 #   ./check-syncrepl.rb -h 'ldap1.domain,ldap2.domain' -u auser -p passwd
-#   will bind to the ldap servers ldap1.domain and ldap2.domain as user
+#   will bind to the LDAP servers ldap1.domain and ldap2.domain as user
 #   auser with password passwd and compare the contextCSN
 #
 # NOTES:
@@ -46,7 +48,7 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
   option :hosts,
          short: '-h HOSTS',
          long: '--hosts HOSTS',
-         description: 'Comma seperated list of hosts to compare',
+         description: 'Comma separated list of hosts to compare',
          required: true,
          proc: proc { |hosts| hosts.split(',') }
 
@@ -78,6 +80,23 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
          long: '--insecure',
          description: 'Do not use encryption'
 
+  option :encryption,
+         short: '-e ENCRYPTION',
+         long: '--encryption ENCRYPTION',
+         description: 'Encryption method to use. Either simple_tls or start_tls',
+         default: nil,
+         proc: proc(&:to_sym)
+
+  option :cacert,
+         long: '--ca-certificate ENCRYPTION',
+         description: 'Trusted CA certificate for checking the endpoint validity',
+         default: nil
+
+  option :cert,
+         long: '--certificate ENCRYPTION',
+         description: 'Client certificate',
+         default: nil
+
   option :retries,
          short: '-r RETRIES',
          long: '--retries RETRIES',
@@ -99,8 +118,18 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
                            port: config[:port]
     end
 
-    unless config[:insecure]
-      ldap.encryption(method: :simple_tls)
+    unless (config[:insecure] && config[:encryption].nil?) || config[:encryption] == :none
+      config[:encryption] ||= :simple_tls
+      tls_options = {
+        verify_mode: (config[:insecure] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER)
+      }
+      if config[:cacert]
+        tls_options[:ca_file] = config[:cacert]
+      end
+      if config[:cert]
+        tls_options[:cert] = open(config[:cert]) { |i| OpenSSL::X509::Certificate.new(i) }
+      end
+      ldap.encryption(method: config[:encryption], tls_options: tls_options)
     end
 
     begin
@@ -116,11 +145,12 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
         critical message
       end
     end
-  rescue
+  rescue => e
     message = "Cannot connect to #{host}:#{config[:port]}"
     if config[:user]
       message += " as #{config[:user]}"
     end
+    message += e.inspect
     critical message
   end
 
@@ -138,15 +168,15 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
       @differences = []
       combinations = csns.keys.combination(2).to_a
       combinations.each do |hosts|
-        @differences << hosts if (csns[hosts[0]] - csns[hosts[1]]).length > 0
+        @differences << hosts if (csns[hosts[0]] - csns[hosts[1]]).length > 0 # rubocop:disable Style/ZeroLengthPredicate
       end
 
       # If everything is OK, no need to retry
-      ok 'All nodes are in sync' if @differences.length == 0
+      ok 'All nodes are in sync' if @differences.length == 0 # rubocop:disable Style/ZeroLengthPredicate
     end
 
     # Hit max retries, report latest differences
-    message = 'ContextCSNs differe between: '
+    message = 'ContextCSNs differ between: '
 
     joined = []
     @differences.each do |different|

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

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

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-openldap
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  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-07-14 00:00:00.000000000 Z
+cert_chain: []
+date: 2017-01-18 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: net-ldap
   requirement: !ruby/object:Gem::Requirement
@@ -61,136 +39,136 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-description: Sensu plugins for openldap
+        version: '0.8'
+description: Sensu plugins for OpenLDAP
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-ldap.rb
 - check-syncrepl.rb
+- metrics-ldap.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -205,7 +183,7 @@ homepage: https://github.com/sensu-plugins/sensu-plugins-openldap
 licenses:
 - MIT
 metadata:
-  maintainer: "@tas50"
+  maintainer: sensu-plugin
   development_status: active
   production_status: unstable - testing recommended
   release_draft: 'false'
@@ -219,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -227,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Sensu plugins for openldap
+summary: Sensu plugins for OpenLDAP
 test_files: []