sidekiq-prometheus-exporter 0.1.9 → 0.1.14

data/lib/sidekiq/prometheus/exporter/exporters.rb

@@ -2,6 +2,7 @@
 
 require 'sidekiq/prometheus/exporter/standard'
 require 'sidekiq/prometheus/exporter/cron'
+require 'sidekiq/prometheus/exporter/scheduler'
 
 module Sidekiq
   module Prometheus
@@ -9,9 +10,12 @@ module Sidekiq
       class Exporters
         AVAILABLE_EXPORTERS = {
           standard: Sidekiq::Prometheus::Exporter::Standard,
-          cron: Sidekiq::Prometheus::Exporter::Cron
+          cron: Sidekiq::Prometheus::Exporter::Cron,
+          scheduler: Sidekiq::Prometheus::Exporter::Scheduler
         }.freeze
 
+        attr_reader :enabled
+
         def initialize
           @enabled = AVAILABLE_EXPORTERS.values.select(&:available?)
         end

data/lib/sidekiq/prometheus/exporter/scheduler.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'erb'
+require 'time'
+
+# Exporter for the https://github.com/moove-it/sidekiq-scheduler
+module Sidekiq
+  module Prometheus
+    module Exporter
+      class Scheduler
+        TEMPLATE = ERB.new(File.read(File.expand_path('templates/scheduler.erb', __dir__)))
+        SECONDS_IN_MINUTE = 60
+        Stats = Struct.new(:jobs_count, :enabled_jobs_count, :last_runs)
+
+        def self.available?
+          defined?(Sidekiq::Scheduler)
+        end
+
+        def initialize
+          @stats = Stats.new(recurring_jobs.count, enabled_recurring_jobs.count, last_runs)
+        end
+
+        def to_s
+          TEMPLATE.result(binding).chomp!
+        end
+
+        private
+
+        def last_runs
+          enabled_recurring_jobs.each_with_object({}) do |name, memo|
+            execution_time = SidekiqScheduler::RedisManager.get_job_last_time(name)
+            next unless execution_time
+
+            memo[name] = (Time.now.to_i - Time.parse(execution_time).to_i) / SECONDS_IN_MINUTE
+          end
+        end
+
+        def enabled_recurring_jobs
+          recurring_jobs.select { |name| Sidekiq::Scheduler.job_enabled?(name) }
+        end
+
+        def recurring_jobs
+          @recurring_jobs ||= (Sidekiq.schedule! || {}).keys.sort
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/prometheus/exporter/standard.rb

@@ -46,7 +46,7 @@ module Sidekiq
         end
 
         def total_workers
-          Sidekiq::ProcessSet.new.map { |process| process['concurrency'] }.reduce(:+)
+          Sidekiq::ProcessSet.new.map { |process| process['concurrency'].to_i }.reduce(0, :+)
         end
       end
     end

data/lib/sidekiq/prometheus/exporter/templates/scheduler.erb

@@ -0,0 +1,12 @@
+# HELP sidekiq_scheduler_jobs The number of recurring jobs.
+# TYPE sidekiq_scheduler_jobs gauge
+sidekiq_scheduler_jobs <%= format('%d', @stats.jobs_count) %>
+
+# HELP sidekiq_scheduler_enabled_jobs The number of enabled recurring jobs.
+# TYPE sidekiq_scheduler_enabled_jobs gauge
+sidekiq_scheduler_enabled_jobs <%= format('%d', @stats.enabled_jobs_count) %>
+
+# HELP sidekiq_scheduler_time_since_last_run_minutes The number of minutes since the last recurring job was executed and current time.
+# TYPE sidekiq_scheduler_time_since_last_run_minutes gauge
+<% @stats.last_runs.each do |job, last_run_minutes| %>sidekiq_scheduler_time_since_last_run_minutes{name="<%= job %>"} <%= format('%i', last_run_minutes) %>
+<% end %>

data/lib/sidekiq/prometheus/exporter/templates/standard.erb

@@ -6,11 +6,11 @@ sidekiq_processed_jobs_total <%= format('%d', @overview_stats.processed) %>
 # TYPE sidekiq_failed_jobs_total counter
 sidekiq_failed_jobs_total <%= format('%d', @overview_stats.failed) %>
 
-# HELP sidekiq_workers The total number of workers across all the processes.
+# HELP sidekiq_workers The number of workers across all the processes.
 # TYPE sidekiq_workers gauge
 sidekiq_workers <%= format('%d', @total_workers) %>
 
-# HELP sidekiq_processes The total number of processes.
+# HELP sidekiq_processes The number of processes.
 # TYPE sidekiq_processes gauge
 sidekiq_processes <%= format('%d', @overview_stats.processes_size) %>
 
@@ -18,7 +18,7 @@ sidekiq_processes <%= format('%d', @overview_stats.processes_size) %>
 # TYPE sidekiq_busy_workers gauge
 sidekiq_busy_workers <%= format('%d', @overview_stats.workers_size) %>
 
-# HELP sidekiq_enqueued_jobs The total number of enqueued jobs.
+# HELP sidekiq_enqueued_jobs The number of enqueued jobs.
 # TYPE sidekiq_enqueued_jobs gauge
 sidekiq_enqueued_jobs <%= format('%d', @overview_stats.enqueued) %>
 
@@ -34,7 +34,7 @@ sidekiq_retry_jobs <%= format('%d', @overview_stats.retry_size) %>
 # TYPE sidekiq_dead_jobs gauge
 sidekiq_dead_jobs <%= format('%d', @overview_stats.dead_size) %>
 
-# HELP sidekiq_queue_latency_seconds The amount of seconds between oldest job being pushed to the queue and current time.
+# HELP sidekiq_queue_latency_seconds The number of seconds between oldest job being pushed to the queue and current time.
 # TYPE sidekiq_queue_latency_seconds gauge
 <% @queues_stats.each do |queue| %>sidekiq_queue_latency_seconds{name="<%= queue.name %>"} <%= format('%.3f', queue.latency) %>
 <% end %>
@@ -42,7 +42,7 @@ sidekiq_dead_jobs <%= format('%d', @overview_stats.dead_size) %>
 # TYPE sidekiq_queue_enqueued_jobs gauge
 <% @queues_stats.each do |queue| %>sidekiq_queue_enqueued_jobs{name="<%= queue.name %>"} <%= format('%d', queue.size) %>
 <% end %>
-# HELP sidekiq_queue_max_processing_time_seconds The amount of seconds between oldest job of the queue being executed and current time.
+# HELP sidekiq_queue_max_processing_time_seconds The number of seconds between oldest job of the queue being executed and current time.
 # TYPE sidekiq_queue_max_processing_time_seconds gauge
 <% @max_processing_times.each do |queue, max_processing_time| %>sidekiq_queue_max_processing_time_seconds{name="<%= queue %>"} <%= format('%i', max_processing_time) %>
 <% end %>

data/lib/sidekiq/prometheus/exporter/version.rb

@@ -3,7 +3,7 @@
 module Sidekiq
   module Prometheus
     module Exporter
-      VERSION = '0.1.9'.freeze
+      VERSION = '0.1.14'.freeze
     end
   end
 end

data/sidekiq-prometheus-exporter.gemspec

@@ -31,11 +31,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sidekiq', '>= 3.3.1'
 
   spec.add_development_dependency 'appraisal',                 '~> 2.2'
-  spec.add_development_dependency 'bundler',                   '~> 1.16'
+  spec.add_development_dependency 'bundler',                   '~> 2.1'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
-  spec.add_development_dependency 'pry-byebug',                '~> 3.6'
-  spec.add_development_dependency 'rack-test',                 '~> 0.8'
-  spec.add_development_dependency 'rake',                      '~> 10.0'
+  spec.add_development_dependency 'pry-byebug',                '~> 3.6.0'
+  spec.add_development_dependency 'rack-test',                 '~> 1.1'
+  spec.add_development_dependency 'rake',                      '~> 13.0'
   spec.add_development_dependency 'rspec',                     '~> 3.0'
   spec.add_development_dependency 'rubocop',                   '~> 0.58'
   spec.add_development_dependency 'rubocop-rspec',             '~> 1.28.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-prometheus-exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Sergey Fedorov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -183,12 +184,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker/Dockerfile
+- docker/README.md
+- docker/config.ru
 - examples/docker-compose.yml
 - examples/metrics/Dockerfile
 - examples/metrics/config.ru
 - examples/prometheus/prometheus.yml
 - examples/screenshot.png
-- examples/sidekiq.json
+- examples/sidekiq-dashboard.grafana-6.json
+- examples/sidekiq-dashboard.grafana-7.json
 - examples/sidekiq/Dockerfile
 - examples/sidekiq/sidekiq.rb
 - examples/sidekiq/sidekiq.yml
@@ -200,11 +205,29 @@ files:
 - gemfiles/sidekiq_4.x.gemfile.lock
 - gemfiles/sidekiq_5.x.gemfile
 - gemfiles/sidekiq_5.x.gemfile.lock
+- gemfiles/sidekiq_6.x.gemfile
+- gemfiles/sidekiq_6.x.gemfile.lock
+- gemfiles/sidekiq_head.gemfile
+- gemfiles/sidekiq_head.gemfile.lock
+- helm/sidekiq-prometheus-exporter/.helmignore
+- helm/sidekiq-prometheus-exporter/Chart.yaml
+- helm/sidekiq-prometheus-exporter/README.md
+- helm/sidekiq-prometheus-exporter/templates/NOTES.txt
+- helm/sidekiq-prometheus-exporter/templates/_helpers.tpl
+- helm/sidekiq-prometheus-exporter/templates/clusterrole.yaml
+- helm/sidekiq-prometheus-exporter/templates/clusterrolebinding.yaml
+- helm/sidekiq-prometheus-exporter/templates/deployment.yaml
+- helm/sidekiq-prometheus-exporter/templates/service.yaml
+- helm/sidekiq-prometheus-exporter/templates/serviceaccount.yaml
+- helm/sidekiq-prometheus-exporter/templates/servicemonitor.yaml
+- helm/sidekiq-prometheus-exporter/values.yaml
 - lib/sidekiq/prometheus/exporter.rb
 - lib/sidekiq/prometheus/exporter/cron.rb
 - lib/sidekiq/prometheus/exporter/exporters.rb
+- lib/sidekiq/prometheus/exporter/scheduler.rb
 - lib/sidekiq/prometheus/exporter/standard.rb
 - lib/sidekiq/prometheus/exporter/templates/cron.erb
+- lib/sidekiq/prometheus/exporter/templates/scheduler.erb
 - lib/sidekiq/prometheus/exporter/templates/standard.erb
 - lib/sidekiq/prometheus/exporter/version.rb
 - sidekiq-prometheus-exporter.gemspec
@@ -212,7 +235,7 @@ homepage: https://github.com/Strech/sidekiq-prometheus-exporter
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,9 +250,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Prometheus exporter for the Sidekiq
 test_files: []