Geo: Check for DB replication enabled and working

ee/lib/system_check/geo/database_replication_check.rb → ee/lib/system_check/geo/database_replication_enabled_check.rb

@@ -2,8 +2,8 @@
 
 module SystemCheck
   module Geo
-    class DatabaseReplicationCheck < SystemCheck::BaseCheck
-      set_name 'Using database streaming replication?'
+    class DatabaseReplicationEnabledCheck < SystemCheck::BaseCheck
+      set_name 'Database replication enabled?'
       set_skip_reason 'not a secondary node'
 
       def skip?
@@ -11,16 +11,22 @@ module SystemCheck
       end
 
       def check?
-        Gitlab::Database.db_read_only?
+        geo_health_check.replication_enabled?
       end
 
       def show_error
         try_fixing_it(
-          'Follow Geo setup instructions to configure primary and secondary nodes for streaming replication'
+          'Follow Geo setup instructions to configure primary and secondary nodes for replication'
         )
 
         for_more_information('doc/gitlab-geo/database.md')
       end
+
+      private
+
+      def geo_health_check
+        @geo_health_check ||= Gitlab::Geo::HealthCheck.new
+      end
     end
   end
 end

ee/lib/system_check/geo/database_replication_working_check.rb

+# frozen_string_literal: true
+
+module SystemCheck
+  module Geo
+    class DatabaseReplicationWorkingCheck < SystemCheck::BaseCheck
+      set_name 'Database replication working?'
+      set_skip_reason 'not a secondary node'
+
+      def skip?
+        !Gitlab::Geo.secondary?
+      end
+
+      def check?
+        geo_health_check.replication_enabled? && geo_health_check.replication_working?
+      end
+
+      def show_error
+        try_fixing_it(
+          'Follow Geo setup instructions to configure primary and secondary nodes for replication'
+        )
+
+        for_more_information('doc/gitlab-geo/database.md')
+      end
+
+      private
+
+      def geo_health_check
+        @geo_health_check ||= Gitlab::Geo::HealthCheck.new
+      end
+    end
+  end
+end

ee/lib/system_check/rake_task/geo_task.rb

@@ -15,7 +15,8 @@ module SystemCheck
           SystemCheck::Geo::LicenseCheck,
           SystemCheck::Geo::EnabledCheck,
           SystemCheck::Geo::GeoDatabaseConfiguredCheck,
-          SystemCheck::Geo::DatabaseReplicationCheck,
+          SystemCheck::Geo::DatabaseReplicationEnabledCheck,
+          SystemCheck::Geo::DatabaseReplicationWorkingCheck,
           SystemCheck::Geo::FdwEnabledCheck,
           SystemCheck::Geo::FdwSchemaUpToDateCheck,
           SystemCheck::Geo::HttpConnectionCheck,