gitlab-exporter 14.1.0 → 14.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd25ebf8533fde9c59b0db768540fcbdf338c961715617459c2a4aa2eb2cc912
-  data.tar.gz: 12e190d1ea1f1cf0a16aa68ab54995c4953555807c7e3c80ecf8a40072d811dd
+  metadata.gz: 29f3158dee598bed73c4e431a9452e69b4979ba6bf909a6dd6a41627e1fe0ccf
+  data.tar.gz: 84cba853f91ab6cb79baadfb3b51bad8a7a90833f2a58e5529ce34f37b6a5539
 SHA512:
-  metadata.gz: f482931b5c30361f7d9e2899c47de30e4fe296b02028818c83bf189defcd8e0dd6fa30f411c1a96e2abab809c1d45ea4c679479b61ac093c09d678154a8b6ce5
-  data.tar.gz: 5942a5b4b0ea8ecdccdab0de8a5bfdad2f7b1f125e200bfc94e64cf4328ca750cf866ccd394dbe14dfc91fe3dcc5915332e5519c9f9d37682f49251ac2a7b581
+  metadata.gz: 255d13c0d0912f5ad7ef0ceb688d30db6575606f7a222f6e0d34304dfde50ab7d87b9340fb58fed29d145ca56e8171dae8b9bdf0dd3d76e403fbf79d478a9a05
+  data.tar.gz: 3599068af65f49e842b4cff1a8777d4523d5d22e84224fc30a7c6c6fdd3ce04f261e5bd00725f8462ee52efebed0edc960202197477afba02b6dc4738845ba1b

data/.gitlab-ci.yml

@@ -1,13 +1,10 @@
 include:
+  - component: gitlab.com/components/container-scanning/container-scanning@~latest
+  - component: gitlab.com/components/sast/sast@~latest
+  - component: gitlab.com/components/secret-detection/secret-detection@~latest
+  - component: gitlab.com/gitlab-org/components/gem-release/gem-release@~latest
   - template: Security/DAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
-  - template: Security/Container-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
   - template: Security/Dependency-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
-  - template: Security/License-Scanning.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml
-  - template: Security/SAST.gitlab-ci.yml  # https://gitlab.com/gitlab-org/gitlab-foss/blob/master/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
-  - template: Security/Secret-Detection.gitlab-ci.yml # https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/lib/gitlab/ci/templates/Security/Secret-Detection.gitlab-ci.yml
-  - project: 'gitlab-org/quality/pipeline-common'
-    file:
-      - '/ci/gem-release.yml'
 
 variables:
   RUBY_VERSION: "2.7"
@@ -65,9 +62,6 @@ rubocop:
     - bundle exec rubocop
   before_script: *before_scripts
 
-license_scanning:
-  rules: *workflow_rules
-
 gemnasium-dependency_scanning:
   rules: *workflow_rules
 

data/.rubocop.yml

@@ -33,4 +33,4 @@ Metrics/AbcSize:
   Enabled: false
 
 Metrics/ClassLength:
-  Max: 150
+  Max: 155

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (14.1.0)
+    gitlab-exporter (14.3.0)
       connection_pool (= 2.2.5)
       deep_merge (~> 1.2.2)
-      faraday (~> 1.8.0)
+      faraday (>= 1.8.0, <= 2.8.1)
       pg (= 1.5.3)
-      puma (= 5.6.5)
+      puma (= 5.6.7)
       quantile (= 0.2.1)
       redis (= 4.4.0)
       redis-namespace (= 1.9.0)
@@ -18,29 +18,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
+    base64 (0.2.0)
     connection_pool (2.2.5)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    multipart-post (2.2.3)
+    faraday-net_http (3.0.2)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)
@@ -48,7 +34,7 @@ GEM
     parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.5.3)
-    puma (5.6.5)
+    puma (5.6.7)
       nio4r (~> 2.0)
     quantile (0.2.1)
     rack (2.2.5)

data/config/gitlab-exporter.yml.example

@@ -94,6 +94,9 @@ probes:
       - probe_retries
     opts:
       redis_url: "redis://localhost:6379"
+      # Uncomment if username or password is not part of the redis_url specified above
+      # redis_username: 'redis-username'
+      # redis_password: 'redis-password'
       redis_enable_client: true
 
   ruby: &ruby

data/gitlab-exporter.gemspec

@@ -22,9 +22,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "connection_pool", "2.2.5"
   s.add_runtime_dependency "deep_merge", "~> 1.2.2"
-  s.add_runtime_dependency "faraday", "~> 1.8.0"
+  # Lock to 2.8.1 until RubyGems 3.5.5 is shipped with the fix for
+  # https://github.com/rubygems/rubygems/issues/7374
+  s.add_runtime_dependency "faraday", [">= 1.8.0", "<= 2.8.1"]
   s.add_runtime_dependency "pg", "1.5.3"
-  s.add_runtime_dependency "puma", "5.6.5"
+  s.add_runtime_dependency "puma", "5.6.7"
   s.add_runtime_dependency "quantile", "0.2.1"
   s.add_runtime_dependency "redis", "4.4.0"
   s.add_runtime_dependency "redis-namespace", "1.9.0"

data/lib/gitlab_exporter/sidekiq.rb

@@ -199,6 +199,10 @@ module GitLab
           reconnect_attempts: 0
         }
 
+        %i[username password].each do |credential|
+          options[credential] = @opts[:"redis_#{credential}"] if @opts.key?(:"redis_#{credential}")
+        end
+
         options[:id] = nil unless redis_enable_client?
         options
       end

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "14.1.0".freeze
+    VERSION = "14.3.0".freeze
   end
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 14.1.0
+  version: 14.3.0
 platform: ruby
 authors:
 - Pablo Carranza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-07-27 00:00:00.000000000 Z
@@ -42,16 +42,22 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.5
+        version: 5.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.5
+        version: 5.6.7
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +263,7 @@ homepage: https://gitlab.com/gitlab-org/ruby/gems/gitlab-exporter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,8 +278,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: GitLab metrics exporter
 test_files: