gitlab-exporter 12.0.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca354fcfa5a8bde34e45a37610546ed70135c1a9208e92f2986c1811ddf9bf26
-  data.tar.gz: fc584b756b3032c31d758271d603df84104821be727b4fce50b23f7cf5488185
+  metadata.gz: 7c67811051d44f3c3e2fe6213eeb60f7a1c7997ddd2409008d52949cff5560fa
+  data.tar.gz: 0d750aef0b50d237783a09c22c35fdbcef0651a4998f6363cef2447786b9f8e1
 SHA512:
-  metadata.gz: 4f199b0d85a71d607023bb39e2d16d8aec6fff0506ea151b5358c1ce374d34e0ae91ad1eb70079da22ca8ba726b3f4d758517623a00bfa5bef8b72e97b5c2f2d
-  data.tar.gz: 76bcce5399be29898662aa0cb067d1285bf41c1a2286380b835924aeac0b8d3577b874ad943f080c6a93076715e1e32a7172d28e8c06e7b929766faf561cd7d6
+  metadata.gz: 5e60b685e6005754b165963ad218462875a80eb26aef8f5a01753fb90c138f6e98e2ceb13a43aea058487579c2a9068328611af78b01ba6b58a391cc0d0e84a0
+  data.tar.gz: 611b3b9f1a66a50e7754a27f16f8fbd12f143559607fa1a4097c252823ace586043d334df8ae2a6a7060a52adb01b24ff6978141267bdddb2dc9b595d8f004e1

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+2.7.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (12.0.0)
+    gitlab-exporter (12.1.0)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
       pg (= 1.2.3)
@@ -48,8 +48,8 @@ GEM
     puma (5.6.5)
       nio4r (~> 2.0)
     quantile (0.2.1)
-    rack (2.2.4)
-    rack-protection (2.2.2)
+    rack (2.2.5)
+    rack-protection (2.2.4)
       rack
     rainbow (3.0.0)
     redis (4.4.0)
@@ -87,10 +87,10 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sinatra (2.2.2)
+    sinatra (2.2.4)
       mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.2)
+      rack-protection (= 2.2.4)
       tilt (~> 2.0)
     tilt (2.0.11)
     unicode-display_width (1.7.0)

data/lib/gitlab_exporter/database/row_count.rb

@@ -19,11 +19,6 @@ module GitLab
           projects.mirror = true
           AND projects.archived = false
           AND project_mirror_data.retry_count <= 14
-          AND (
-            (projects.visibility_level = 20 AND root_namespaces.visibility_level = 20)
-            OR
-            plans.name IN ('early_adopter', 'bronze', 'silver', 'gold')
-          )
           AND project_mirror_data.next_execution_timestamp > '2020-03-28'
         SQL
 
@@ -31,15 +26,6 @@ module GitLab
           select: :projects,
           joins: <<~SQL,
             INNER JOIN project_mirror_data ON project_mirror_data.project_id = projects.id
-            INNER JOIN namespaces AS root_namespaces ON root_namespaces.id = (
-              WITH RECURSIVE "base_and_ancestors" AS (
-                (SELECT "namespaces".* FROM "namespaces" WHERE "namespaces"."id" = projects.namespace_id)
-                UNION
-                (SELECT "namespaces".* FROM "namespaces", "base_and_ancestors" WHERE "namespaces"."id" = "base_and_ancestors"."parent_id")
-              ) SELECT "namespaces".id FROM "base_and_ancestors" AS "namespaces" WHERE "namespaces"."parent_id" IS NULL
-            )
-            LEFT JOIN gitlab_subscriptions ON gitlab_subscriptions.namespace_id = root_namespaces.id
-            LEFT JOIN plans ON plans.id = gitlab_subscriptions.hosted_plan_id
           SQL
           check: "SELECT 1 FROM information_schema.tables WHERE table_name='plans'"
         }.freeze
@@ -192,21 +178,21 @@ module GitLab
             select: :container_repositories,
             where: <<~SQL
               migration_state = 'pre_importing'
-              AND (COALESCE(migration_pre_import_started_at, '01-01-1970') < (now() - INTERVAL '20 minutes'))
+              AND (COALESCE(migration_pre_import_started_at, TO_TIMESTAMP(0)) < (now() - INTERVAL '20 minutes'))
             SQL
           },
           container_repositories_stalled_pre_import_done: {
             select: :container_repositories,
             where: <<~SQL
               migration_state = 'pre_import_done'
-              AND (COALESCE(migration_pre_import_done_at, '01-01-1970') < (now() - INTERVAL '5 minutes'))
+              AND (COALESCE(migration_pre_import_done_at, TO_TIMESTAMP(0)) < (now() - INTERVAL '5 minutes'))
             SQL
           },
           container_repositories_stalled_importing: {
             select: :container_repositories,
             where: <<~SQL
               migration_state = 'importing'
-              AND (COALESCE(migration_import_started_at, '01-01-1970') < (now() - INTERVAL '5 minutes'))
+              AND (COALESCE(migration_import_started_at, TO_TIMESTAMP(0)) < (now() - INTERVAL '5 minutes'))
             SQL
           },
           container_repositories_skipped_not_in_plan: {

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "12.0.0".freeze
+    VERSION = "12.1.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.0
 platform: ruby
 authors:
 - Pablo Carranza