summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-23 15:06:29 +0000
committerRémy Coutable <remy@rymai.me>2016-11-23 15:06:29 +0000
commit2317eb5ec98705fd175c87f8f2f7d3b84d3f5912 (patch)
tree0e53255ae348d2b3f775cbd0250294c363644f7d
parent3e0c6142d120538476019c877cf265c9a7f08c74 (diff)
parentd2985eb57201a98b3bb9c1abebdabd2061eabd10 (diff)
downloadgitlab-ce-2317eb5ec98705fd175c87f8f2f7d3b84d3f5912.tar.gz
Merge branch 'grapify-sidekiq-metric-api' into 'master'
Grapify the sidekiq metrics API Related to #22928 See merge request !7699
-rw-r--r--lib/api/sidekiq_metrics.rb36
1 files changed, 4 insertions, 32 deletions
diff --git a/lib/api/sidekiq_metrics.rb b/lib/api/sidekiq_metrics.rb
index d3d6827dc54..11f2b40269a 100644
--- a/lib/api/sidekiq_metrics.rb
+++ b/lib/api/sidekiq_metrics.rb
@@ -39,50 +39,22 @@ module API
end
end
- # Get Sidekiq Queue metrics
- #
- # Parameters:
- # None
- #
- # Example:
- # GET /sidekiq/queue_metrics
- #
+ desc 'Get the Sidekiq queue metrics'
get 'sidekiq/queue_metrics' do
{ queues: queue_metrics }
end
- # Get Sidekiq Process metrics
- #
- # Parameters:
- # None
- #
- # Example:
- # GET /sidekiq/process_metrics
- #
+ desc 'Get the Sidekiq process metrics'
get 'sidekiq/process_metrics' do
{ processes: process_metrics }
end
- # Get Sidekiq Job statistics
- #
- # Parameters:
- # None
- #
- # Example:
- # GET /sidekiq/job_stats
- #
+ desc 'Get the Sidekiq job statistics'
get 'sidekiq/job_stats' do
{ jobs: job_stats }
end
- # Get Sidekiq Compound metrics. Includes all previous metrics
- #
- # Parameters:
- # None
- #
- # Example:
- # GET /sidekiq/compound_metrics
- #
+ desc 'Get the Sidekiq Compound metrics. Includes queue, process, and job statistics'
get 'sidekiq/compound_metrics' do
{ queues: queue_metrics, processes: process_metrics, jobs: job_stats }
end