Merge branch 'sh-remove-local-sidekiq-admin-check' into 'master'

Remove display of local Sidekiq process in /admin/sidekiq

Closes #46133

See merge request gitlab-org/gitlab-ce!23118

3 files changed, 5 insertions, 43 deletions

diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb
index 7701f2e645b..fc877142418 100644
--- a/app/controllers/admin/background_jobs_controller.rb
+++ b/app/controllers/admin/background_jobs_controller.rb
@@ -1,9 +1,4 @@
 # frozen_string_literal: true
 
 class Admin::BackgroundJobsController < Admin::ApplicationController
-  def show
-    ps_output, _ = Gitlab::Popen.popen(%W(ps ww -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command))
-    @sidekiq_processes = ps_output.split("\n").grep(/sidekiq \d+\.\d+\.\d+/)
-    @concurrency = Sidekiq.options[:concurrency]
-  end
 end
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index 9aa705d9fa6..a0a00ac5d96 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -6,43 +6,5 @@
   %p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing
 
   %hr
-
-  .card
-    .card-header Sidekiq running processes
-    .card-body
-      - if @sidekiq_processes.empty?
-        %h4.cred
-          %i.fa.fa-exclamation-triangle
-          There are no running sidekiq processes. Please restart GitLab
-      - else
-        .table-holder
-          %table.table
-            %thead
-              %th USER
-              %th PID
-              %th CPU
-              %th MEM
-              %th STATE
-              %th START
-              %th COMMAND
-            %tbody
-              - @sidekiq_processes.each do |process|
-                %tr
-                  %td= gitlab_config.user
-                  - parse_sidekiq_ps(process).each do |value|
-                    %td= value
-        .clearfix
-          %p
-            %i.fa.fa-exclamation-circle
-            If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab.
-            = link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab')
-
-          %p
-            %i.fa.fa-exclamation-circle
-            If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{gitlab_config.user} -f sidekiq) and restart GitLab.
-            = link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab')
-
-
-
   .card
     %iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" }
diff --git a/changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml b/changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml
new file mode 100644
index 00000000000..3ec15908fc7
--- /dev/null
+++ b/changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml
@@ -0,0 +1,5 @@
+---
+title: Remove display of local Sidekiq process in /admin/sidekiq
+merge_request: 23118
+author:
+type: fixed