gitlab-monitor 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79da741bdcf83d7f3426383e1aca2bcff38dd0202655773009612c5b5aec3966
-  data.tar.gz: 1b9d0b3dc70b94faa36a8107511d6a5f6b79631beaf0b32671fc1219c3944bd6
+  metadata.gz: 9199f368bd88c06bef846fd0a8b9b4b6394f147386e9f25997940aa0d50e58cf
+  data.tar.gz: 823b5a40f17cde2e279cb4626cf685cc495099d1555b0e408d12e7a5c2a9bfca
 SHA512:
-  metadata.gz: 34395edd323c27073a4c362d2d80d36d6091f7082dd8f1ca0334b8a772fbaf4cbebf486887458d9692f578c9a1707a6ef0575f9a9e0278c1b85678122c656e2d
-  data.tar.gz: e3c8ea0c957488c478c4d9fdba65448b805bc0a1bf549527660f6167a22655c5cf73c04c25c7a24db92eaf0acec9d03abb707b1e289e9baee6900103bb99df7e
+  metadata.gz: 01c5da7205425bd24c6f2c8855be1ae685cbd50b04bf891875ca1d4d8a613df33679a817e17572506207aac62f4c0095a416d8d30ff0260d078dea570e081851
+  data.tar.gz: cb8e628f1f530c034741b17ebeee1987fc3f19f6b2393b914340a8802aa989326085281addec3fd2b71a14375d732bd60bcc579e4672952506bcb0b3691bc145

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-monitor (4.0.1)
+    gitlab-monitor (4.1.0)
       connection_pool (~> 2.2.1)
       pg (~> 1.1)
       quantile (~> 0.2.0)
@@ -26,7 +26,6 @@ GEM
     rack-protection (2.0.5)
       rack
     rainbow (2.1.0)
-    rake (12.3.2)
     redis (3.3.5)
     redis-namespace (1.6.0)
       redis (>= 3.0.4)
@@ -68,7 +67,6 @@ PLATFORMS
 
 DEPENDENCIES
   gitlab-monitor!
-  rake
   rspec (~> 3.5)
   rspec-expectations (~> 3.7.0)
   rubocop (~> 0.42)

data/README.md

@@ -50,9 +50,25 @@ metrics.
         * `process_smaps_private_dirty_bytes`
         * `process_smaps_swap_bytes`
         * `process_smaps_pss_bytes`
-1. [Sidekiq](lib/gitlab_monitor/sidekiq.rb) -- `sidekiq_queue_size`, `sidekiq_queue_paused`,
-   `sidekiq_queue_latency_seconds`, `sidekiq_enqueued_jobs`, `sidekiq_dead_jobs`,
-   `sidekiq_running_jobs`, `sidekiq_to_be_retried_jobs`
+1. [Sidekiq](lib/gitlab_monitor/sidekiq.rb)
+	* Stats
+	  * `sidekiq_jobs_processed_total`
+	  * `sidekiq_jobs_failed_total`
+	  * `sidekiq_jobs_enqueued_size`
+	  * `sidekiq_jobs_scheduled_size`
+	  * `sidekiq_jobs_retry_size`
+	  * `sidekiq_jobs_dead_size`
+	  * `sidekiq_default_queue_latency_seconds`
+	  * `sidekiq_processes_size`
+	  * `sidekiq_workers_size`
+	* Queues
+	  * `sidekiq_queue_size`
+	  * `sidekiq_queue_paused`
+	  * `sidekiq_queue_latency_seconds`
+	* Jobs
+	  * `sidekiq_enqueued_jobs`
+	  * `sidekiq_running_jobs`
+	  * `sidekiq_to_be_retried_jobs`
 
 ### Setup with GitLab Development Kit
 

data/config/gitlab-monitor.yml.example

@@ -83,11 +83,11 @@ probes:
 
   sidekiq: &sidekiq
     methods:
+      - probe_stats
       - probe_queues
       - probe_jobs
       - probe_workers
       - probe_retries
-      - probe_dead
     opts:
       redis_url: "redis://localhost:6379"
       redis_enable_client: true

data/gitlab-monitor.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "redis-namespace", "~> 1.6.0"
   s.add_runtime_dependency "connection_pool", "~> 2.2.1"
 
-  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.7.0"
   s.add_development_dependency "rspec-expectations", "~> 3.7.0"
 end

data/lib/gitlab_monitor/cli.rb

@@ -274,6 +274,7 @@ module GitLab
           validate!
 
           ::GitLab::Monitor::SidekiqProber.new(redis_url: @redis_url)
+                                          .probe_stats
                                           .probe_queues
                                           .probe_jobs
                                           .probe_workers

data/lib/gitlab_monitor/sidekiq.rb

@@ -21,6 +21,25 @@ module GitLab
         ensure_queue_job_stats_script_loaded
       end
 
+      def probe_stats
+        return self unless connected?
+
+        stats = Sidekiq::Stats.new
+
+        @metrics.add("sidekiq_jobs_processed_total", stats.processed)
+        @metrics.add("sidekiq_jobs_failed_total", stats.failed)
+        @metrics.add("sidekiq_jobs_enqueued_size", stats.enqueued)
+        @metrics.add("sidekiq_jobs_scheduled_size", stats.scheduled_size)
+        @metrics.add("sidekiq_jobs_retry_size", stats.retry_size)
+        @metrics.add("sidekiq_jobs_dead_size", stats.dead_size)
+
+        @metrics.add("sidekiq_default_queue_latency_seconds", stats.default_queue_latency)
+        @metrics.add("sidekiq_processes_size", stats.processes_size)
+        @metrics.add("sidekiq_workers_size", stats.workers_size)
+
+        self
+      end
+
       def probe_queues
         return self unless connected?
 
@@ -92,6 +111,9 @@ module GitLab
       end
 
       def probe_dead
+        puts "[DEPRECATED] probe_dead is now considered obsolete and will be removed in future major versions,"\
+             " please use probe_stats instead"
+
         return self unless connected?
 
         @metrics.add("sidekiq_dead_jobs", Sidekiq::Stats.new.dead_size)

data/lib/gitlab_monitor/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Monitor
-    VERSION = "4.0.1".freeze
+    VERSION = "4.1.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-monitor
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement