]> cat aescling's git repositories - mastodon.git/commitdiff
Add admin dashboard checks for Elasticsearch version (#17863)
authorClaire <claire.github-309c@sitedethib.com>
Fri, 25 Mar 2022 20:00:59 +0000 (21:00 +0100)
committerGitHub <noreply@github.com>
Fri, 25 Mar 2022 20:00:59 +0000 (21:00 +0100)
app/lib/admin/system_check.rb
app/lib/admin/system_check/elasticsearch_check.rb [new file with mode: 0644]
config/locales/en.yml

index afb20cb477d56755f6da3453490a0eb618a6c4ea..877a42ef6391004f748710fe8aa3ae65c6834670 100644 (file)
@@ -5,6 +5,7 @@ class Admin::SystemCheck
     Admin::SystemCheck::DatabaseSchemaCheck,
     Admin::SystemCheck::SidekiqProcessCheck,
     Admin::SystemCheck::RulesCheck,
+    Admin::SystemCheck::ElasticsearchCheck,
   ].freeze
 
   def self.perform
diff --git a/app/lib/admin/system_check/elasticsearch_check.rb b/app/lib/admin/system_check/elasticsearch_check.rb
new file mode 100644 (file)
index 0000000..1b48a54
--- /dev/null
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
+  def pass?
+    return true unless Chewy.enabled?
+
+    running_version.present? && compatible_version?
+  end
+
+  def message
+    if running_version.present?
+      Admin::SystemCheck::Message.new(:elasticsearch_version_check, I18n.t('admin.system_checks.elasticsearch_version_check.version_comparison', running_version: running_version, required_version: required_version))
+    else
+      Admin::SystemCheck::Message.new(:elasticsearch_running_check)
+    end
+  end
+
+  private
+
+  def running_version
+    @running_version ||= begin
+      Chewy.client.info['version']['number']
+    rescue Faraday::ConnectionFailed
+      nil
+    end
+  end
+
+  def required_version
+    '7.x'
+  end
+
+  def compatible_version?
+    Gem::Version.new(running_version) >= Gem::Version.new(required_version)
+  end
+
+  def missing_queues
+    @missing_queues ||= Sidekiq::ProcessSet.new.reduce(SIDEKIQ_QUEUES) { |queues, process| queues - process['queues'] }
+  end
+end
index a6ded38f7200b6107dd9629bbf2b7f279768710d..db29922fa96c1b1a9f57451c827b6bf59196437f 100644 (file)
@@ -780,6 +780,11 @@ en:
         message_html: You haven't defined any server rules.
       sidekiq_process_check:
         message_html: No Sidekiq process running for the %{value} queue(s). Please review your Sidekiq configuration
+      elasticsearch_running_check:
+        message_html: Could not connect to Elasticsearch. Please check that it is running, or disable full-text search
+      elasticsearch_version_check:
+        message_html: "Incompatible Elasticsearch version: %{value}"
+        version_comparison: "Elasticsearch %{running_version} is running while %{required_version} is required"
     tags:
       review: Review status
       updated_msg: Hashtag settings updated successfully