sensu-plugins-solr 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d62cfdf77fb555ccf841545ba26e20081dd34f2adfc85ebb9759c1f1a15f73
-  data.tar.gz: 60a31f9490e3128fc5de498a22ea9a027f5d8099114e363093e37805b7c827cd
+  metadata.gz: 1d3cf4785148bdb0512d8dc1dd0550761c83a2ff1ca77c55e0209ee123b2adf6
+  data.tar.gz: 95f1d470d18627eb0d4c762b3730a92ded58b229f64d1ffbb9a384ede4bdf506
 SHA512:
-  metadata.gz: a3c60bd81d3590ff5ee8ad504cab35c3a0c8687e1fd1084e1a67e47dccdcc98059fb531c4427678df6b3fff6cdee928fa00cd8d581cbd32650e6edcb2b8b2daa
-  data.tar.gz: 700e078b60ab9ac33a48c96367732f3301f494175377341ab88656b1211995ee8cbc7919f7ab82f64f77f02a0ecbe12c19d163e4925e833529ced684cd80b5a1
+  metadata.gz: 15c1206add47b19197ee9bc5625a54390d61827f30083f31d79645baf42b40c3cb9ca6e5ddbbc23b9c3c48a5ae7e46fdbb33c05f82e033f9772146e54908226e
+  data.tar.gz: 14db5d51c7f2670187774155fe86429ea127a4ddf59d96607984cb33ce22c5a9ce3cf4cfef5ba9aacfe560388871ad98afeb4555ae768c176563c8da22067da9

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.2.0] - 2023-10-16
+### Changed
+- Added backwards compatible support for solr 9.x in `check-solr-replication-lag` by checking both `(follower|slave)` terms in  API response (@danieltoader)
+- Added authentication in `check-solr-replication-lag` (@danieltoader)
+
 ## [1.1.0] - 2018-07-12
 ### Added
 - Added solr replication lag check (@alexbumbacea)
@@ -40,7 +45,8 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/1.1.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/1.1.0...1.2.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/0.0.3...1.0.0
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-solr/compare/0.0.2...0.0.3

data/README.md

@@ -18,6 +18,6 @@
 
 ## Installation
 
-[Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
+[Installation and Setup](https://docs.sensu.io/sensu-core/latest/installation/installing-plugins/)
 
 ## Notes

data/bin/check-solr-replication-lag.rb

@@ -56,11 +56,29 @@ class SolrCheckReplication < Sensu::Plugin::Check::CLI
          boolean: true,
          default: false
 
-  def get_url_json(url, notfoundok)
-    r = RestClient::Resource.new(url, timeout: 45)
+  option :username,
+         description: 'Username for HTTP Basic Authentication',
+         short: '-U USERNAME',
+         long: '--username USERNAME',
+         required: false
+
+  option :password,
+         description: 'Password for HTTP Basic Authentication',
+         short: '-P PASSWORD',
+         long: '--password PASSWORD',
+         required: false
+
+  def get_url_json(url, notfoundok, username = nil, password = nil)
+    resource_options = { timeout: 45 }
+    resource_options[:user] = username if username
+    resource_options[:password] = password if password
+
+    r = RestClient::Resource.new(url, resource_options)
     JSON.parse(r.get)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'
+  rescue RestClient::Unauthorized
+    warning 'Unauthorized: Invalid credentials'
   rescue RestClient::RequestTimeout
     warning 'Connection timed out'
   rescue RestClient::ResourceNotFound
@@ -76,11 +94,11 @@ class SolrCheckReplication < Sensu::Plugin::Check::CLI
   def run
     base_core_uri = "#{config[:protocol]}://#{config[:host]}:#{config[:port]}/solr/#{config[:core]}"
     uri =  "#{base_core_uri}/replication?command=details&wt=json"
-    data = get_url_json(uri, config[:core_missing_ok])
+    data = get_url_json(uri, config[:core_missing_ok], config[:username], config[:password])
     details = data['details']
-    if details['isSlave'] == 'true'
-      slave_details = details['slave']
-      lag = (DateTime.parse(slave_details['currentDate']).to_time - DateTime.parse(slave_details['indexReplicatedAt']).to_time).to_i
+    if details['isFollower'] == 'true' || details['isSlave'] == 'true'
+      follower_details = details['follower'] || details['slave']
+      lag = (DateTime.parse(follower_details['currentDate']).to_time - DateTime.parse(follower_details['indexReplicatedAt']).to_time).to_i
       if lag >= config[:critical]
         critical "Replication lag exceeds #{config[:critical]} seconds (#{lag})"
       elsif lag >= config[:warning]

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

@@ -1,7 +1,7 @@
 module SensuPluginsSolr
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-solr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2023-10-16 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'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +205,9 @@ description: |-
 email: "<sensu-users@googlegroups.com>"
 executables:
 - check-solr-replication-lag.rb
-- metrics-solr-graphite.rb
 - metrics-solr-v1.4graphite.rb
 - metrics-solr4-graphite.rb
+- metrics-solr-graphite.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -239,8 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for solr