health-monitor-rails 12.2.0 → 12.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b598be966486e38fe823322c1f067e033543ad2df2eb3175c4f48464fd486c0
-  data.tar.gz: c75ceeeffb9d18b5427d2791359a74616b91e830fce1cafd7f737e78b7b87c23
+  metadata.gz: 952a62b089d3b56df2b8ab11b329dae2512d285db4027bde6705892e171ff755
+  data.tar.gz: 36a7996a83a871a82814caef5d31d2cc880b1f40bd12e2f191290e72a9d1537f
 SHA512:
-  metadata.gz: 54c82d499f5230ffb29d25d1f2ae07a82df5b2c31babfae8759c213488c88024beaa286f64adeaa63a932064e8f5d7496dc263136422b694ee130481c2a1fde4
-  data.tar.gz: 446c5607d7eb1f96803318cfca0c460147e45fce68ba0b243f52c91913211f3c1df98a5d0a8a087269ccecd45bf67f882955d46b658e954e9cd240bc0e16f284
+  metadata.gz: a9878debcd730c9848ec50af8ed0b1ed912adffc240c1aab657c82a40e0113ac32a335f53ef32c9c7a3487eee68483235b767009e900c376eb1df55dd28cf2cd
+  data.tar.gz: d361fd7cf5fe894de0d2bce196b06c23f9c3015d1dfa545ba0158c441e2c4f1caed1d6053975a9ff545082025ec1a1c387644a7aaa4dbede0e020c8869289cac

data/README.md

@@ -316,6 +316,7 @@ Please note that `url` or `connection` can't be used at the same time.
 ### Solr
 
 * `url`: the URL used to connect to your Solr instance - must be a string. You can also use `url` to explicitly configure authentication (e.g., `'https://user:pass@example.solr.com:8983/'`)
+* `collection`: An optional parameter used to connect to your specific Solr collection - must be a string. By setting this parameter the code will check the status of this individual collection in your Solr instance instead of just the status of the overall Solr instance
 
 ### Adding a Custom Provider
 

data/lib/health_monitor/providers/solr.rb

@@ -9,12 +9,14 @@ module HealthMonitor
     class Solr < Base
       class Configuration < Base::Configuration
         DEFAULT_URL = nil
-        attr_accessor :url
+        DEFAULT_COLLECTION = nil
+        attr_accessor :url, :collection
 
         def initialize(provider)
           super(provider)
 
           @url = DEFAULT_URL
+          @collection = DEFAULT_COLLECTION
         end
       end
 
@@ -31,6 +33,22 @@ module HealthMonitor
       end
 
       def check_solr_connection!
+        if configuration.collection
+          check_solr_collection!
+        else
+          check_solr_uri!
+        end
+      end
+
+      def check_solr_collection!
+        response = solr_response(uri: collection_uri)
+        json = JSON.parse(response.body) if response.code == '200'
+        return if response.is_a?(Net::HTTPSuccess) && json['status'].casecmp?('OK')
+
+        raise "The Solr collection has an invalid status #{collection_uri}"
+      end
+
+      def check_solr_uri!
         json = JSON.parse(solr_response.body)
         raise "The solr has an invalid status #{status_uri}" if json['responseHeader']['status'] != 0
       end
@@ -44,16 +62,24 @@ module HealthMonitor
         end
       end
 
-      def solr_request
+      def collection_uri
+        @collection_uri ||= begin
+          uri = URI(configuration.url)
+          uri.path = "/solr/#{configuration.collection}/admin/ping"
+          uri
+        end
+      end
+
+      def solr_request(uri: status_uri)
         @solr_request ||= begin
-          req = Net::HTTP::Get.new(status_uri)
-          req.basic_auth(status_uri.user, status_uri.password) if status_uri.user && status_uri.password
+          req = Net::HTTP::Get.new(uri)
+          req.basic_auth(uri.user, uri.password) if uri.user && uri.password
           req
         end
       end
 
-      def solr_response
-        Net::HTTP.start(status_uri.hostname, status_uri.port) { |http| http.request(solr_request) }
+      def solr_response(uri: status_uri)
+        Net::HTTP.start(status_uri.hostname, status_uri.port) { |http| http.request(solr_request(uri: uri)) }
       end
     end
   end

data/lib/health_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HealthMonitor
-  VERSION = '12.2.0'
+  VERSION = '12.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: health-monitor-rails
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.3.0
 platform: ruby
 authors:
 - Leonid Beder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties