Add latest changes from gitlab-org/gitlab@master

3 files changed, 32 insertions, 64 deletions

diff --git a/scripts/internal_events/monitor.rb b/scripts/internal_events/monitor.rb
index 0f7e347ded7..e9ba1dbfbb7 100644
--- a/scripts/internal_events/monitor.rb
+++ b/scripts/internal_events/monitor.rb
@@ -135,6 +135,26 @@ def generate_metrics_table
   )
 end
 
+def render_screen(paused)
+  metrics_table = generate_metrics_table
+  events_table = generate_snowplow_table
+
+  print TTY::Cursor.clear_screen
+  print TTY::Cursor.move_to(0, 0)
+
+  puts "Updated at #{Time.current} #{'[PAUSED]' if paused}"
+  puts "Monitored events: #{ARGV.join(', ')}"
+  puts
+
+  puts metrics_table
+
+  puts events_table
+
+  puts
+  puts "Press \"p\" to toggle refresh. (It makes it easier to select and copy the tables)"
+  puts "Press \"q\" to quit"
+end
+
 begin
   snowplow_data
 rescue Errno::ECONNREFUSED
@@ -144,21 +164,20 @@ rescue Errno::ECONNREFUSED
   exit 1
 end
 
+reader = TTY::Reader.new
+paused = false
+
 begin
   loop do
-    metrics_table = generate_metrics_table
-    events_table = generate_snowplow_table
-
-    print TTY::Cursor.clear_screen
-    print TTY::Cursor.move_to(0, 0)
-
-    puts "Updated at #{Time.current}"
-    puts "Monitored events: #{ARGV.join(', ')}"
-    puts
-
-    puts metrics_table
-
-    puts events_table
+    case reader.read_keypress(nonblock: true)
+    when 'p'
+      paused = !paused
+      render_screen(paused)
+    when 'q'
+      break
+    end
+
+    render_screen(paused) unless paused
 
     sleep 1
   end
diff --git a/scripts/lint-rugged b/scripts/lint-rugged
deleted file mode 100755
index 73708b52772..00000000000
--- a/scripts/lint-rugged
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-ALLOWED = [
-  # https://gitlab.com/gitlab-org/gitaly/issues/760
-  'lib/elasticsearch/git/repository.rb',
-
-  # Needed to avoid using the git binary to validate a branch name
-  'lib/gitlab/git_ref_validator.rb',
-
-  # Reverted Rugged calls due to Gitaly atop NFS performance
-  # See https://docs.gitlab.com/ee/development/gitaly.html#legacy-rugged-code.
-  'lib/gitlab/git/rugged_impl/',
-  'lib/gitlab/gitaly_client/storage_settings.rb',
-
-  # Needed to detect Rugged enabled: https://gitlab.com/gitlab-org/gitlab/issues/35371
-  'lib/gitlab/config_checker/puma_rugged_checker.rb',
-
-  # Needed for GPG/X509 commit signature API
-  #
-  'app/models/commit.rb',
-  'lib/api/entities/commit_signature.rb',
-
-  # Needed for logging
-  'config/initializers/peek.rb',
-  'config/initializers/lograge.rb',
-  'lib/gitlab/grape_logging/loggers/perf_logger.rb',
-  'lib/gitlab/instrumentation_helper.rb',
-  'lib/gitlab/sidekiq_middleware/instrumentation_logger.rb',
-  'lib/gitlab/rugged_instrumentation.rb',
-  'lib/peek/views/rugged.rb'
-].freeze
-
-rugged_lines = IO.popen(%w[git grep -i -n rugged -- app config lib], &:read).lines
-rugged_lines = rugged_lines.select { |l| /^[^:]*\.rb:/ =~ l }
-rugged_lines = rugged_lines.reject { |l| l.start_with?(*ALLOWED) }
-rugged_lines = rugged_lines.reject { |l| /(include|prepend) Gitlab::Git::RuggedImpl/ =~ l }
-rugged_lines = rugged_lines.reject { |l| l.include?('Gitlab::ConfigChecker::PumaRuggedChecker.check') }
-rugged_lines = rugged_lines.reject do |line|
-  code, _comment = line.split('# ', 2)
-  code !~ /rugged/i
-end
-
-exit if rugged_lines.empty?
-
-puts "Using Rugged is only allowed in test and #{ALLOWED}\n\n"
-
-puts rugged_lines
-
-exit(false)
diff --git a/scripts/static-analysis b/scripts/static-analysis
index 41583166e04..fa394ac46c4 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -50,7 +50,6 @@ class StaticAnalysis
     Task.new(%w[scripts/lint-conflicts.sh], 1),
     Task.new(%w[yarn run block-dependencies], 1),
     Task.new(%w[yarn run check-dependencies], 1),
-    Task.new(%w[scripts/lint-rugged], 1),
     Task.new(%w[scripts/gemfile_lock_changed.sh], 1)
   ].compact.freeze