sidekiq-prometheus-exporter 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcfe9974eac840b24b087bccb243d76860720cdf310938312c6ac04ac1b35a1d
-  data.tar.gz: 54afbfbf44d8a90b031b28df3e64bb670049b0cf6d544e83fc6684d14ea462c8
+  metadata.gz: b765e7d2573199042fcb0bc816c07797ddc7cd629a8491df3eee217f09282883
+  data.tar.gz: 7db77dd139a068968b55a79c1cdf57f9bbb7684f739ad95044cfd6fd4cf22389
 SHA512:
-  metadata.gz: 43ce7aeeda0b7fd9e74df39a62b86fa70c8f8a17d7b6d5ab7baf1e9d24cd25e94c43c0904db86889b029282fc6b3a37be743cfba929c058e68e6794dcd8c26be
-  data.tar.gz: 41bec0d4878d351ee281d7bc2e0d75c7e8d9315dda6567b9afc10cbff2af5d8c433b86012aec3ba38b5a4196a6d197844731cba3c38e848f4cde862d719c8ac6
+  metadata.gz: 6c83d7afd3fcf1a0dfe16bc9bc35f05ad84bad8a46656d4af313c309427682f6e4347f912c3f0daeb7594d12fc9914f9e2e4f5452a4925643eebe81224e2e736
+  data.tar.gz: 3be26fb67085e9dbebcd9eb9a377feb24acfbb075e1a67eebdf550ffa8e5c54716398e254fbf6cee9b4c92cf2b814bd1951dc13f9c13ded4c27c054020cc3828

data/.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [Strech]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: strech
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://paypal.me/onistrech/eur5.0']

data/.rubocop.yml

@@ -2,7 +2,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: ~
 
 Style/Alias:
   EnforcedStyle: prefer_alias_method
@@ -30,7 +30,7 @@ Style/Documentation:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
-  EnforcedStyle: when_needed
+  EnforcedStyle: always
   SupportedStyles:
     # `when_needed` will add the frozen string literal comment to files
     # only when the `TargetRubyVersion` is set to 2.3+.
@@ -89,25 +89,25 @@ Style/NumericPredicate:
   # Exclude RSpec specs because assertions like `expect(1).to be > 0` cause
   # false positives.
   Exclude:
-    - 'spec/**/*'
+    - "spec/**/*"
 
 Style/MethodCalledOnDoEndBlock:
-  Description: 'Avoid chaining a method call on a do...end block.'
-  StyleGuide: '#single-line-blocks'
+  Description: "Avoid chaining a method call on a do...end block."
+  StyleGuide: "#single-line-blocks"
   Enabled: true
 
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
-    '%':  ()
-    '%i': ()
-    '%I': ()
-    '%q': ()
-    '%Q': ()
-    '%r': '{}'
-    '%s': ()
-    '%w': ()
-    '%W': ()
-    '%x': '{}'
+    "%": ()
+    "%i": ()
+    "%I": ()
+    "%q": ()
+    "%Q": ()
+    "%r": "{}"
+    "%s": ()
+    "%w": ()
+    "%W": ()
+    "%x": "{}"
 
 Style/SpecialGlobalVars:
   EnforcedStyle: use_english_names
@@ -158,10 +158,10 @@ Style/TernaryParentheses:
 
 Naming/AccessorMethodName:
   Description: Check the naming of accessor methods for get_/set_.
-  StyleGuide: '#accessor_mutator_method_names'
+  StyleGuide: "#accessor_mutator_method_names"
 
 # https://rubocop.readthedocs.io/en/latest/cops_naming/#naminguncommunicativemethodparamname
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   AllowedNames:
     - _
     - io
@@ -174,7 +174,11 @@ Naming/UncommunicativeMethodParamName:
 
 #################### Layout ####################################
 
-Layout/AlignParameters:
+Layout/LineLength:
+  # Default: 80
+  Max: 120
+
+Layout/ParameterAlignment:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_first_parameter` style aligns the following lines along the same
@@ -194,7 +198,7 @@ Layout/AlignParameters:
     - with_fixed_indentation
 
 # Checks the indentation of the first element in an array literal.
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   # The value `special_inside_parentheses` means that array literals with
   # brackets that have their opening bracket on the same line as a surrounding
   # opening round parenthesis, shall have their first element indented relative
@@ -216,7 +220,7 @@ Layout/IndentArray:
   IndentationWidth: ~
 
 # Checks the indentation of the first key in a hash literal.
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   # The value `special_inside_parentheses` means that hash literals with braces
   # that have their opening brace on the same line as a surrounding opening
   # round parenthesis, shall have their first key indented relative to the
@@ -277,20 +281,16 @@ Layout/MultilineOperationIndentation:
 
 ##################### Metrics ##################################
 
-Metrics/LineLength:
-  # Default: 80
-  Max: 120
-
 Metrics/MethodLength:
   # Default: 10
   Max: 15
 
 Metrics/BlockLength:
   Exclude:
-    - 'Rakefile'
-    - '**/*.gemspec'
-    - '**/*.rake'
-    - 'spec/**/*.rb'
+    - "Rakefile"
+    - "**/*.gemspec"
+    - "**/*.rake"
+    - "spec/**/*.rb"
 
 ##################### Lint ##################################
 

data/.travis.yml

@@ -1,11 +1,12 @@
 os: linux
+dist: xenial
 language: ruby
 rvm:
   - 2.3.8
-  - 2.4.9
-  - 2.5.7
-  - 2.6.5
-  - 2.7.0
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
   - ruby-head
 notifications:
   email: false
@@ -20,26 +21,36 @@ gemfile:
 
 jobs:
   include:
-    - rvm: "2.6.5"
+    - rvm: "2.6.6"
       gemfile: "gemfiles/sidekiq_5.x.gemfile"
       env:
         - CODECLIMATE_REPORT=true
   exclude:
     - rvm: "2.3.8"
       gemfile: "gemfiles/sidekiq_6.x.gemfile"
-    - rvm: "2.4.9"
+    - rvm: "2.4.10"
       gemfile: "gemfiles/sidekiq_6.x.gemfile"
     - rvm: "2.3.8"
       gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.4.9"
+    - rvm: "2.4.10"
       gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.5.7"
+    - rvm: "2.5.8"
       gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.6.5"
+    - rvm: "2.6.6"
       gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.7.0"
+    - rvm: "2.7.1"
       gemfile: "gemfiles/sidekiq_head.gemfile"
   allow_failures:
+    - rvm: "ruby-head"
+      gemfile: "gemfiles/sidekiq_3.3.1.gemfile"
+    - rvm: "ruby-head"
+      gemfile: "gemfiles/sidekiq_3.x.gemfile"
+    - rvm: "ruby-head"
+      gemfile: "gemfiles/sidekiq_4.x.gemfile"
+    - rvm: "ruby-head"
+      gemfile: "gemfiles/sidekiq_5.x.gemfile"
+    - rvm: "ruby-head"
+      gemfile: "gemfiles/sidekiq_6.x.gemfile"
     - rvm: "ruby-head"
       gemfile: "gemfiles/sidekiq_head.gemfile"
 
@@ -63,8 +74,10 @@ before_script:
     echo "Start recording Codeclimate test coverage";
     ./vendor/cc-test-reporter before-build;
     fi
+
 script:
   - bundle exec rake spec
+
 after_success:
   - if [ ! -z "$CODECLIMATE_REPORT" ]; then
     echo "Finish recording Codeclimate test coverage";

data/README.md

@@ -10,42 +10,54 @@
 
 ![Grafana dashboard example](/examples/screenshot.png)
 
-Open [dashboard example file](/examples/sidekiq.json), then open `https://<your grafana-url>/dashboard/import` and paste the content of the file.
+Open [dashboard example file](/examples/sidekiq-dashboard.grafana-7.json) (grafana 7), then open `https://<your grafana-url>/dashboard/import` and paste the content of the file.
 
 # Available metrics
 
-*(starting Sidekiq `v3.3.1`)*
+_(starting Sidekiq `v3.3.1`)_
 
-### Standard
+## Standard
 
-| Name                                      | Type    | Description             |
-|-------------------------------------------|---------|-------------------------|
-| sidekiq_processed_jobs_total              | counter | The total number of processed jobs
-| sidekiq_failed_jobs_total                 | counter | The total number of failed jobs
-| sidekiq_workers                           | gauge   | The number of workers across all the processes
-| sidekiq_processes                         | gauge   | The number of processes
-| sidekiq_busy_workers                      | gauge   | The number of workers performing the job
-| sidekiq_enqueued_jobs                     | gauge   | The number of enqueued jobs
-| sidekiq_scheduled_jobs                    | gauge   | The number of jobs scheduled for a future execution
-| sidekiq_retry_jobs                        | gauge   | The number of jobs scheduled for the next try
-| sidekiq_dead_jobs                         | gauge   | The number of jobs being dead
-| sidekiq_queue_latency_seconds             | gauge   | The number of seconds between oldest job being pushed to the queue and current time (labels: `name`)
-| sidekiq_queue_max_processing_time_seconds | gauge   | The number of seconds between oldest job of the queue being executed and current time (labels: `name`)
-| sidekiq_queue_enqueued_jobs               | gauge   | The number of enqueued jobs in the queue (labels: `name`)
+| Name                                      | Type    | Description                                                                                            |
+| ----------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------ |
+| sidekiq_processed_jobs_total              | counter | The total number of processed jobs                                                                     |
+| sidekiq_failed_jobs_total                 | counter | The total number of failed jobs                                                                        |
+| sidekiq_workers                           | gauge   | The number of workers across all the processes                                                         |
+| sidekiq_processes                         | gauge   | The number of processes                                                                                |
+| sidekiq_busy_workers                      | gauge   | The number of workers performing the job                                                               |
+| sidekiq_enqueued_jobs                     | gauge   | The number of enqueued jobs                                                                            |
+| sidekiq_scheduled_jobs                    | gauge   | The number of jobs scheduled for a future execution                                                    |
+| sidekiq_retry_jobs                        | gauge   | The number of jobs scheduled for the next try                                                          |
+| sidekiq_dead_jobs                         | gauge   | The number of jobs being dead                                                                          |
+| sidekiq_queue_latency_seconds             | gauge   | The number of seconds between oldest job being pushed to the queue and current time (labels: `name`)   |
+| sidekiq_queue_max_processing_time_seconds | gauge   | The number of seconds between oldest job of the queue being executed and current time (labels: `name`) |
+| sidekiq_queue_enqueued_jobs               | gauge   | The number of enqueued jobs in the queue (labels: `name`)                                              |
 
-### [Scheduler](https://github.com/moove-it/sidekiq-scheduler)
+<details>
+  <summary>Click to expand for all available contribs</summary>
 
-| Name                                          | Type  | Description           |
-|-----------------------------------------------|-------|-----------------------|
-| sidekiq_scheduler_jobs                        | gauge | The number of recurring jobs
-| sidekiq_scheduler_enabled_jobs                | gauge | The number of enabled recurring jobs
-| sidekiq_scheduler_time_since_last_run_minutes | gauge | The number of minutes since the last recurring job was executed and current time (labels: `name`)
+## [Scheduler](https://github.com/moove-it/sidekiq-scheduler)
 
-### [Cron](https://github.com/ondrejbartas/sidekiq-cron)
+| Name                                          | Type  | Description                                                                                       |
+| --------------------------------------------- | ----- | ------------------------------------------------------------------------------------------------- |
+| sidekiq_scheduler_jobs                        | gauge | The number of recurring jobs                                                                      |
+| sidekiq_scheduler_enabled_jobs                | gauge | The number of enabled recurring jobs                                                              |
+| sidekiq_scheduler_time_since_last_run_minutes | gauge | The number of minutes since the last recurring job was executed and current time (labels: `name`) |
 
-| Name                                      | Type    | Description             |
-|-------------------------------------------|---------|-------------------------|
-| sidekiq_cron_jobs                         | gauge   | The number of cron jobs
+## [Cron](https://github.com/ondrejbartas/sidekiq-cron)
+
+| Name              | Type  | Description             |
+| ----------------- | ----- | ----------------------- |
+| sidekiq_cron_jobs | gauge | The number of cron jobs |
+
+</details>
+
+## Sponsorship
+
+If you like the project and want to support me on my sleepless nights, you can
+
+[![Support via PayPal](https://cdn.rawgit.com/twolfson/paypal-github-button/1.0.0/dist/button.svg)](https://www.paypal.com/paypalme/onistrech/eur5.0)
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/W7W8367XJ)
 
 # Installation
 
@@ -57,17 +69,17 @@ gem 'sidekiq-prometheus-exporter', '~> 0.1'
 
 And then execute:
 
-```bash
+```console
 $ bundle
 ```
 
 Or install it yourself as:
 
-```bash
+```console
 $ gem install sidekiq-prometheus-exporter -v '~> 0.1'
 ```
 
-# Rack application
+## Rack application
 
 For a fresh new application to expose metrics create `config.ru` file with
 next code inside
@@ -85,13 +97,13 @@ run Sidekiq::Prometheus::Exporter.to_app
 
 Use your favorite server to start it up, like this
 
-```bash
+```console
 $ bundle exec rackup -p9292 -o0.0.0.0
 ```
 
 and then `curl https://0.0.0.0:9292/metrics`
 
-# Rails application
+## Rails application
 
 When you have rails application, it's possible to mount exporter
 as a rack application in your `routes.rb`
@@ -109,13 +121,13 @@ end
 
 Use rails server from `bin` folder to start it up, like this
 
-```bash
+```console
 $ ./bin/rails s -p 9292 -b 0.0.0.0
 ```
 
 and then `curl https://0.0.0.0:9292/metrics`
 
-# Sidekiq Web (extream)
+## Sidekiq Web (extream)
 
 If you are ok with metrics being exposed via Sidekiq web dashboard because
 you have it inside your private network or only Prometheus scraper will have access
@@ -130,7 +142,52 @@ Sidekiq::Web.register(Sidekiq::Prometheus::Exporter)
 
 and then `curl https://<your-sidekiq-web-uri>/metrics`
 
-# Sidekiq Contribs
+## Docker
+
+If we are talking about isolation you can run already prepared official
+rack application in the Docker container by using the [public image](https://hub.docker.com/r/strech/sidekiq-prometheus-exporter)
+(check out this [README](/blob/master/docker/README.md) for more)
+
+```bash
+$ docker run -it --rm \
+             -p 9292:9292 \
+             -e REDIS_URL=redis://<your-redis-host>:6379/0 \
+             strech/sidekiq-prometheus-exporter
+```
+
+and then `curl https://0.0.0.0:9292/metrics`
+
+## Helm
+
+And finally the cloud solution _(who don't these days)_. Easy to install, easy
+to use. A fully-functioning Helm-package based on official [Docker
+image](https://hub.docker.com/r/strech/sidekiq-prometheus-exporter), comes with lots of [configuration
+options](https://github.com/Strech/sidekiq-prometheus-exporter/blob/master/helm/sidekiq-prometheus-exporter/README.md)
+
+```console
+$ helm repo add strech https://strech.github.io/sidekiq-prometheus-exporter
+"strech" has been added to your repositories
+
+$ helm install strech/sidekiq-prometheus-exporter --name sidekiq-metrics
+```
+
+to `curl` your metrics, please follow the post-installation guide
+
+# Tips&Tricks
+
+If you want to see at the exporter startup time a banner about which exporters
+are enabled add this call to your `config.ru` (but after exporter `configure` statement)
+
+```ruby
+require 'sidekiq/prometheus/exporter'
+
+puts Sidekiq::Prometheus::Exporter.banner
+```
+
+:anger: if you don't see your banner try to output into `STDERR` instead of
+`STDOUT`
+
+## Sidekiq Contribs
 
 By default we try to detect as many as possible [sidekiq contribs](https://github.com/mperham/sidekiq/wiki/Related-Projects)
 and add their metrics to the output.
@@ -152,20 +209,7 @@ end
 
 :bulb: if you did't find the contrib you would like to see, don't hesitate to [open an issue](https://github.com/Strech/sidekiq-prometheus-exporter/issues/new) and describe what do you think we should export.
 
-# Tips&Tricks
-
-If you want to see at the exporter startup time a banner about which exporters
-are enabled add this call to your `config.ru` (but after exporter `configure` statement)
-
-```ruby
-require 'sidekiq/prometheus/exporter'
-
-puts Sidekiq::Prometheus::Exporter.banner
-```
-
-:anger: if you don't see your banner try to output into `STDERR` instead of `STDOUT`
-
-## Contributing
+# Contributing
 
 Bug reports and pull requests to support earlier versions of Sidekiq are welcome on GitHub at https://github.com/Strech/sidekiq-prometheus-exporter/issues.
 

data/Rakefile

@@ -4,3 +4,76 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+# ==============================================================================
+
+require 'English'
+require 'fileutils'
+require_relative 'lib/sidekiq/prometheus/exporter/version'
+
+def execute(command)
+  output = `#{command}`
+
+  unless $CHILD_STATUS.success?
+    warn output
+    exit 1
+  end
+
+  output
+end
+
+namespace :docker do
+  task :release do
+    Rake::Task['docker:build'].invoke
+    Rake::Task['docker:push'].invoke
+  end
+
+  task :build do
+    image = 'strech/sidekiq-prometheus-exporter'
+
+    Dir.chdir(File.expand_path('./docker')) do
+      execute("docker build -t #{image}:#{Sidekiq::Prometheus::Exporter::VERSION} -t #{image}:latest .")
+    end
+
+    puts "Successfully built strech/sidekiq-prometheus-exporter and tagged #{Sidekiq::Prometheus::Exporter::VERSION}, latest"
+  end
+
+  task :push do
+    image = 'strech/sidekiq-prometheus-exporter'
+
+    execute("docker push #{image}:#{Sidekiq::Prometheus::Exporter::VERSION}")
+    execute("docker push #{image}:latest")
+
+    puts "Successfully pushed strech/sidekiq-prometheus-exporter #{Sidekiq::Prometheus::Exporter::VERSION}, latest"
+  end
+end
+
+namespace :helm do
+  desc 'Generate new Helm repo index'
+  task :generate do
+    archive_dir = File.expand_path("./tmp/archive-#{Time.now.to_i}")
+
+    Rake::Task['helm:package'].invoke(archive_dir)
+    Rake::Task['helm:index'].invoke(archive_dir)
+
+    puts "New index generated: #{File.join(archive_dir, 'index.yaml')}"
+  end
+
+  task :package, [:directory] do |_, args|
+    chart_dir = File.expand_path('./helm/sidekiq-prometheus-exporter')
+    archive_dir = args.fetch(:directory) { File.expand_path("./tmp/archive-#{Time.now.to_i}") }
+
+    FileUtils.mkdir_p(archive_dir)
+
+    execute("helm package #{chart_dir} -d #{archive_dir}")
+  end
+
+  task :index, [:directory] do |_, args|
+    Dir.chdir(args.fetch(:directory)) do
+      url = "https://github.com/Strech/sidekiq-prometheus-exporter/releases/download/v#{Sidekiq::Prometheus::Exporter::VERSION}"
+
+      execute('git show gh-pages:index.yaml > existing-index.yaml')
+      execute("helm repo index . --url #{url} --merge existing-index.yaml")
+    end
+  end
+end