Merge branch 'expired-ssh-key-notification-cron' into 'master'

Expired SSH key notification cron settings

See merge request gitlab-org/omnibus-gitlab!5119

files/gitlab-config-template/gitlab.rb.template

@@ -176,6 +176,8 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['member_invitation_reminder_emails_worker_cron'] = "0 0 * * *"
 # gitlab_rails['user_status_cleanup_batch_worker_cron'] = "* * * * *"
 # gitlab_rails['namespaces_in_product_marketing_emails_worker_cron'] = "0 9 * * *"
+# gitlab_rails['ssh_keys_expired_notification_worker_cron'] = "0 2 * * *"
+# gitlab_rails['ssh_keys_expiring_soon_notification_worker_cron'] = "0 1 * * *"
 
 ### Webhook Settings
 ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -176,6 +176,8 @@ default['gitlab']['gitlab-rails']['service_desk_email_log_file'] = "/var/log/git
 default['gitlab']['gitlab-rails']['service_desk_email_inbox_method'] = "imap"
 default['gitlab']['gitlab-rails']['service_desk_email_inbox_inbox_options'] = nil
 default['gitlab']['gitlab-rails']['namespaces_in_product_marketing_emails_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['ssh_keys_expired_notification_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['ssh_keys_expiring_soon_notification_worker_cron'] = nil
 
 # Consolidated object storage config
 default['gitlab']['gitlab-rails']['object_store']['enabled'] = false

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -487,6 +487,18 @@ production: &base
       cron: "<%= @ci_platform_metrics_update_cron_worker %>"
     <% end %>
 
+    # Send emails about ssh keys that have expired
+    <% unless @ssh_keys_expired_notification_worker_cron.nil? %>
+    ssh_keys_expired_notification_worker:
+      cron: "<%= @ssh_keys_expired_notification_worker_cron %>"
+    <% end %>
+
+    # Send emails about ssh keys that are expiring soon
+    <% unless @ssh_keys_expiring_soon_notification_worker_cron.nil? %>
+    ssh_keys_expiring_soon_notification_worker:
+      cron: "<%= @ssh_keys_expiring_soon_notification_worker_cron %>"
+    <% end %>
+
     ##
     # GitLab EE only jobs:
 

spec/chef/recipes/gitlab-rails/gitlab_yml/cron_jobs_spec.rb

@@ -48,6 +48,8 @@ RSpec.describe 'gitlab::gitlab-rails' do
         'stuck_ci_jobs_worker'                                   | 'stuck_ci_jobs_worker_cron'
         'user_status_cleanup_batch_worker'                       | 'user_status_cleanup_batch_worker_cron'
         'namespaces_in_product_marketing_emails_worker'          | 'namespaces_in_product_marketing_emails_worker_cron'
+        'ssh_keys_expired_notification_worker'                   | 'ssh_keys_expired_notification_worker_cron'
+        'ssh_keys_expiring_soon_notification_worker'             | 'ssh_keys_expiring_soon_notification_worker_cron'
       end
 
       with_them do