sensu-plugins-openldap 0.0.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c5551a9f5875442f098f56c6b5dd8b5983a278d
-  data.tar.gz: 331957dfac92d9b7c8426da9677dfaed8a16becb
+SHA256:
+  metadata.gz: e48ff69139b8e64dec33bcd922d7f3b8e6390558f608fb4a91c7ca9e98cf8d56
+  data.tar.gz: 6c74aea7254187d3dae053124cfd9bb839fbe87b2ce5f97ca167adc2336c542e
 SHA512:
-  metadata.gz: 9082de98a6b167d090c5022c62c01f5c39410586c396ee1193750fd97b2829289f85a2c27ead73861ef239b3aed2e120bf1bb630e7baf95e92a26cbbce51fe8c
-  data.tar.gz: 8c007843e43322d6f7a024d10739d3333afbdb75e2904c48532e9149247a5564ffc122ef5dac62a642ddc82ffa94883dbb5168eacc4552d50de2a97ce89e5761
+  metadata.gz: 9636d5220067cdcb322f57f3d7abc19a3d57a170dfc62579556228e46a3bc3d0828056dd4c79523b745452cb5f8000925ddbe39040d2ed9c8cde4d68226c70ba
+  data.tar.gz: 5728b9dcda50da43f87237591e22d54c2b5cb675775695bca37bd0c1df8437f3b3421bd2160d1e33f4a7cd5b6b4869c82a1e22a8e83be8345aea7fe25bbfb999

data/CHANGELOG.md

@@ -1,12 +1,46 @@
-#Change Log
+# Change Log
 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]
 
-## [0.0.2] - 2015-06-03
+## [2.0.1] - 2020-09-26
+- `bin/check-syncrepl.rb`: properly capture exception (@nwea-seanmckinley)
+- bumped `net-ldap` dependency (@dependabot) (@majormoses)
+
+## [2.0.0] - 2020-06-22
+### Breaking Changes
+- Update minimum required ruby version to 2.3. Drop unsupported ruby versions.
+- Bump `sensu-plugin` dependency to `~> 4.0`
+
+### Added
+- Bonsai asset support
+- Ruby 2.4.1 testing
+
+### Changed
+- Updated bundler dependency to '~> 2.1'
+- Updated rubocop dependency to '0.81'  # last version to support Ruby 2.3
+- Updated net-ldap dependency to '0.16.2'
+- Remediated rubocop issues
+- Updated rake dependency to '~> 13.0'
+
+### [1.0.1]
+ - Fix #3 : metrics-ldap.rb Error Cannot connect to (@roumano)
 
+## [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
 
@@ -14,7 +48,13 @@ 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/2.0.1...HEAD
+[2.0.1]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/2.0.0...2.0.1
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/1.0.1...2.0.0
+[1.0.1]: https://github.com/sensu-plugins/sensu-plugins-openldap/compare/1.0.0...1.0.1
+[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

@@ -1,11 +1,10 @@
 ## Sensu-Plugins-openldap
 
-[![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-openldap.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-openldap)
+[ ![Build Status](https://travis-ci.org/sensu-plugins/sensu-plugins-openldap.svg?branch=master)](https://travis-ci.org/sensu-plugins/sensu-plugins-openldap)
 [![Gem Version](https://badge.fury.io/rb/sensu-plugins-openldap.svg)](http://badge.fury.io/rb/sensu-plugins-openldap)
 [![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

@@ -1,9 +1,13 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   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 +26,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 +50,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 +82,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',
@@ -86,7 +107,7 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i)
 
   def get_csns(host)
-    if config[:user]
+    if config[:user] # rubocop:disable Style/ConditionalAssignment
       ldap = Net::LDAP.new host: host,
                            port: config[:port],
                            auth: {
@@ -99,8 +120,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) } # rubocop:disable Security/Open
+      end
+      ldap.encryption(method: config[:encryption], tls_options: tls_options)
     end
 
     begin
@@ -116,11 +147,12 @@ class CheckSyncrepl < Sensu::Plugin::Check::CLI
         critical message
       end
     end
-  rescue
+  rescue StandardError => e
     message = "Cannot connect to #{host}:#{config[:port]}"
     if config[:user]
       message += " as #{config[:user]}"
     end
+    message += e.inspect
     critical message
   end
 
@@ -138,15 +170,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 all
       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 all
     end
 
     # Hit max retries, report latest differences
-    message = 'ContextCSNs differe between: '
+    message = 'ContextCSNs differ between: '
 
     joined = []
     @differences.each do |different|

data/bin/metrics-ldap.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: false
+
 #
 #   ldap-metrics.rb
 #
@@ -38,9 +40,9 @@ require 'sensu-plugin/utils'
 require 'socket'
 require 'net/ldap'
 
-include Sensu::Plugin::Utils
-
 class LDAPGraphite < Sensu::Plugin::Metric::CLI::Graphite
+  include Sensu::Plugin::Utils
+
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-s SCHEME',
@@ -98,7 +100,6 @@ class LDAPGraphite < Sensu::Plugin::Metric::CLI::Graphite
 
     begin
       if ldap.bind
-        message += 'So far'
         metrics = {
           conn_total: {
             title: 'connections.total',
@@ -131,8 +132,8 @@ class LDAPGraphite < Sensu::Plugin::Metric::CLI::Graphite
             attribute: 'monitorCounter'
           }
         }
-        monitor_ops = %w(add modify delete search compare bind unbind)
-        %w(initiated completed).each do |state|
+        monitor_ops = %w[add modify delete search compare bind unbind]
+        %w[initiated completed].each do |state|
           monitor_ops.each do |op|
             metrics["ops_#{op}_#{state}".to_sym] = {
               title: "operations.#{op}.#{state}",
@@ -149,7 +150,7 @@ class LDAPGraphite < Sensu::Plugin::Metric::CLI::Graphite
             metric[:value] = entry[metric[:attribute]]
           end
         end
-        return metrics
+        return metrics # rubocop:disable Style/RedundantReturn
       else
         message = "Cannot connect to #{host}:#{config[:port]}"
         if config[:user]
@@ -158,7 +159,7 @@ class LDAPGraphite < Sensu::Plugin::Metric::CLI::Graphite
         critical message
       end
     end
-  rescue
+  rescue StandardError
     message = "Cannot connect to #{host}:#{config[:port]}"
     message += " as #{config[:user]}"
     critical message

data/lib/sensu-plugins-openldap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'sensu-plugins-openldap/version'
 

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SensuPluginsOpenldap
   module Version
-    MAJOR = 0
+    MAJOR = 2
     MINOR = 0
-    PATCH = 2
+    PATCH = 1
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,196 +1,174 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-openldap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 2.0.1
 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-06-03 00:00:00.000000000 Z
+cert_chain: []
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sensu-plugin
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.16.3
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !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: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.81'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.81'
 - !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,16 +197,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: Sensu plugins for openldap
+summary: Sensu plugins for OpenLDAP
 test_files: []