gitlab-exporter 13.0.0 → 13.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83e761659c465160f92d3473b6d3f816066807a0126764e2dbba29a65d998273
-  data.tar.gz: 68a0b79fe5aa6e44df1c073c09d75e2f1f6e20aacb377ec8303ea1b28aca79e0
+  metadata.gz: e25742f97cb40db0a84768e5b780c3d4d29af3c35ce456cc54ab5cebbf39ded7
+  data.tar.gz: 13cf4d4d86554c783d9c7cb1a7c9db42189b0fd6fe520e10f15b084cb5b43761
 SHA512:
-  metadata.gz: 35394994c429efd84c43718f955d4dded45f9133894fc2da2ddeeba2446ab74c1a2018b831c1c03fe38abc8d25e48ec9455e8a4371493f897b033ae47cb88460
-  data.tar.gz: 2143e9b485304140c3b7f5139f152eab9355b8bdad1cef7c4ea4cd03b5ca114a557bbb3daeba558f4ac8aac30a01827187682df6be4725799919702ce178acf8
+  metadata.gz: 7f48b26649ec291a96b41976d6b674171667c43ab0f8de188809e9d22fdb3d0ee0d17c33ac1ef30a4f217f1f52c701335a88ed600a915797d8013a264359bdde
+  data.tar.gz: 954a83f62a78a78244503a2b47c5bfe9fc2fac338e46cf692d03731b53b459ec715e83b4bbd5df5320c55efe47c8e7db17b0af944fb490e09ee1b1453b4bf6a3

data/.gitlab-ci.yml

@@ -43,7 +43,7 @@ rspec:
   before_script: *before_scripts
   parallel:
     matrix:
-      - RUBY_VERSION: ["2.7", "3.0"]
+      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
 
 rspec_integration:
   script:
@@ -55,7 +55,7 @@ rspec_integration:
     REDIS_URL: "redis://redis"
   parallel:
     matrix:
-      - RUBY_VERSION: ["2.7", "3.0"]
+      - RUBY_VERSION: ["2.7", "3.0", "3.1", "3.2"]
 
 rubocop:
   script:

data/Gemfile

@@ -3,6 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem "rspec", "~>3.5"
+  gem "rspec", "~>3.12"
   gem "rubocop", "~>0.42"
 end

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (13.0.0)
+    gitlab-exporter (13.1.0)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
-      pg (= 1.2.3)
+      pg (= 1.5.3)
       puma (= 5.6.5)
       quantile (= 0.2.1)
       redis (= 4.4.0)
@@ -18,7 +18,7 @@ GEM
   specs:
     ast (2.4.1)
     connection_pool (2.2.5)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -45,7 +45,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.5.3)
     puma (5.6.5)
       nio4r (~> 2.0)
     quantile (0.2.1)
@@ -58,19 +58,19 @@ GEM
       redis (>= 4)
     regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -102,8 +102,8 @@ PLATFORMS
 
 DEPENDENCIES
   gitlab-exporter!
-  rspec (~> 3.5)
-  rspec-expectations (~> 3.7.0)
+  rspec (~> 3.12)
+  rspec-expectations (~> 3.12.0)
   rubocop (~> 0.42)
 
 BUNDLED WITH

data/gitlab-exporter.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "connection_pool", "2.2.5"
   s.add_runtime_dependency "faraday", "~> 1.8.0"
-  s.add_runtime_dependency "pg", "1.2.3"
+  s.add_runtime_dependency "pg", "1.5.3"
   s.add_runtime_dependency "puma", "5.6.5"
   s.add_runtime_dependency "quantile", "0.2.1"
   s.add_runtime_dependency "redis", "4.4.0"
@@ -31,6 +31,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "sinatra", "~> 2.2.0"
   s.add_runtime_dependency "webrick", "~> 1.7"
 
-  s.add_development_dependency "rspec", "~> 3.7.0"
-  s.add_development_dependency "rspec-expectations", "~> 3.7.0"
+  s.add_development_dependency "rspec", "~> 3.12.0"
+  s.add_development_dependency "rspec-expectations", "~> 3.12.0"
 end

data/lib/gitlab_exporter/cli.rb

@@ -1,5 +1,19 @@
 require "yaml"
 
+# TODO: Remove this once we're on Ruby 3
+# https://gitlab.com/gitlab-org/gitlab/-/issues/393651
+unless YAML.respond_to?(:safe_load_file)
+  module YAML # rubocop:disable Style/Documentation
+    # Temporary Ruby 2 back-compat workaround.
+    #
+    # This method only exists as of stdlib 3.0.0:
+    # https://ruby-doc.org/stdlib-3.0.0/libdoc/psych/rdoc/Psych.html
+    def self.safe_load_file(path, **options)
+      YAML.safe_load(File.read(path), **options)
+    end
+  end
+end
+
 module GitLab
   module Exporter
     # Stores runner classes in a single place
@@ -184,7 +198,7 @@ module GitLab
         def run
           validate!
 
-          config = Utils.deep_symbolize_hash_keys(YAML.load_file(@config_file))
+          config = Utils.deep_symbolize_hash_keys(YAML.safe_load_file(@config_file, aliases: true))
 
           WebExporter.setup(config)
           WebExporter.run!

data/lib/gitlab_exporter/database/row_count.rb

@@ -8,7 +8,7 @@ module GitLab
       # This class works under the assumption you do COUNT(*) queries, define
       # queries in the QUERIES constant. If in doubt how these work, read
       # #construct_query
-      class RowCountCollector < Base
+      class RowCountCollector < Base # rubocop:disable Metrics/ClassLength
         # We ignore mirrors with a next_execution_timestamp before
         # 2020-03-28 because this is when we stopped processing mirrors
         # for private projects on the free plan. Skipping those can
@@ -29,6 +29,15 @@ module GitLab
           check: "SELECT 1 FROM information_schema.tables WHERE table_name='plans'"
         }.freeze
 
+        CONTAINER_REPOSITORIES_CLEANUP_ENABLED_QUERY = {
+          select: :container_repositories,
+          joins: <<~SQL,
+            INNER JOIN container_expiration_policies
+            ON container_repositories.project_id = container_expiration_policies.project_id
+          SQL
+          where: "container_expiration_policies.enabled = TRUE"
+        }.freeze
+
         QUERIES = {
           mirrors_ready_to_sync: MIRROR_QUERY.merge( # EE only
             where: <<~SQL
@@ -117,6 +126,52 @@ module GitLab
               visibility_level: {},
               root: { definition: "(parent_id IS NULL)" }
             }
+          },
+          container_repositories: { select: :container_repositories },
+          container_repositories_delete_scheduled: { select: :container_repositories, where: "status = 0" },
+          container_repositories_delete_failed: { select: :container_repositories, where: "status = 1" },
+          container_repositories_delete_ongoing: { select: :container_repositories, where: "status = 2" },
+          container_repositories_delete_staled: {
+            select: :container_repositories,
+            where: "status = 2 AND delete_started_at < (NOW() - INTERVAL '30 minutes')"
+          },
+          container_repositories_cleanup_enabled: CONTAINER_REPOSITORIES_CLEANUP_ENABLED_QUERY,
+          container_repositories_cleanup_pending: CONTAINER_REPOSITORIES_CLEANUP_ENABLED_QUERY.merge(
+            where: <<~SQL
+              container_expiration_policies.enabled = TRUE
+              AND container_repositories.expiration_policy_cleanup_status IN (0, 1)
+              AND (container_repositories.expiration_policy_started_at IS NULL OR container_repositories.expiration_policy_started_at < container_expiration_policies.next_run_at)
+              AND (container_expiration_policies.next_run_at < NOW())
+            SQL
+          ),
+          container_repositories_cleanup_unfinished: CONTAINER_REPOSITORIES_CLEANUP_ENABLED_QUERY.merge(
+            where: <<~SQL
+              container_expiration_policies.enabled = TRUE
+              AND container_repositories.expiration_policy_cleanup_status = 2
+            SQL
+          ),
+          container_repositories_cleanup_unscheduled: CONTAINER_REPOSITORIES_CLEANUP_ENABLED_QUERY.merge(
+            where: <<~SQL
+              container_expiration_policies.enabled = TRUE
+              AND container_repositories.expiration_policy_cleanup_status = 0
+            SQL
+          ),
+          container_repositories_cleanup_scheduled: CONTAINER_REPOSITORIES_CLEANUP_ENABLED_QUERY.merge(
+            where: <<~SQL
+              container_expiration_policies.enabled = TRUE
+              AND container_repositories.expiration_policy_cleanup_status = 1
+            SQL
+          ),
+          container_repositories_cleanup_ongoing: {
+            select: :container_repositories,
+            where: "expiration_policy_cleanup_status = 3"
+          },
+          container_repositories_cleanup_staled: {
+            select: :container_repositories,
+            where: <<~SQL
+              expiration_policy_cleanup_status = 3
+              AND (expiration_policy_started_at < (NOW() - INTERVAL '35 minutes') OR expiration_policy_started_at IS NULL)
+            SQL
           }
         }.freeze
 

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "13.0.0".freeze
+    VERSION = "13.1.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 13.1.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
 description: GitLab metrics exporter to use with prometheus
 email: pablo@gitlab.com
 executables: