RubyGems - gitlab-exporter - Versions diffs - 13.4.0 → 13.5.0 - Mend

gitlab-exporter 13.4.0 → 13.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/.gitlab/merge_request_templates/Release.md +13 -0
data/.gitlab-ci.yml +4 -14
data/Gemfile.lock +1 -1
data/gitlab-exporter.gemspec +1 -1
data/lib/gitlab_exporter/database/ci_builds.rb +47 -47
data/lib/gitlab_exporter/version.rb +1 -1
metadata +3 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef90bbddd738fecc23deb3342a8c24461289d1286c46c1d5d1879da07f32991d
-  data.tar.gz: 94e6b7eea624ee7a07aa435f3985e03006a8d8ab042d7958f2d1150b71a64d3a
+  metadata.gz: 71244a8992a3116e4513746514842e6d6f0c53abbef7e0a7435a3889acce66c1
+  data.tar.gz: fc013ec18e7f7a11e3d5da3a1375fe80add92f96da1f572eb8b577ee98bedebb
 SHA512:
-  metadata.gz: 67c47e28e6685067027922a2e12ec106b6eb4f14e1475dccb8a6430ae53e7a4e0bb111f0d2e83c4559ac38b49cb69aac6ead4308ee1534763cb9434761573085
-  data.tar.gz: 2066407a7735b144e4c84179b8b585d8ea4dddee4d74592a2538bd3ccd1d8c69610efa3d9a7fa9cb4a6d2aa26cc61578cb564015305f56f60627ea48f56a7f7c
+  metadata.gz: b4d3c84092ca842c13123bb6573118adc44b60f090594db51b559bc20d2718c1e8a341494fd6ba376e6a30ce07985b2ae88923e7a68760a631936f3e962ed62f
+  data.tar.gz: eb579c03705bdbd4d64b5c0a5b6dc40cbfa0125939b03d250d6efe44f395fe55effabbf3733ab57a0297494530ce8efc5b3521eda12c930b7ec8ffeadc8fb7b0

data/.gitlab/merge_request_templates/Release.md ADDED Viewed

@@ -0,0 +1,13 @@
+<!-- Replace `<PREVIOUS_VERSION>` with the previous version number here, `<COMMIT_UPDATING_VERSION>` with the latest
+commit from this merge request, and `<NEW_VERSION>` with the upcoming version number. -->
+## Diff
+https://gitlab.com/gitlab-org/ruby/gems/gitlab-exporter/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
+## Checklist
+- [ ] Diff link is up-to-date.
+- [ ] Check the release notes: https://gitlab.com/api/v4/projects/gitlab-org%2Fruby%2Fgems%2Fgitlab-exporter/repository/changelog?version=<NEW_VERSION>
+- [ ] Based on the diff and the release notes, `version.rb` is updated, according to [SemVer](https://semver.org).
+/label ~"type::maintenance" ~"static code analysis"

data/.gitlab-ci.yml CHANGED Viewed

@@ -5,6 +5,9 @@ include:
   - 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"
@@ -12,7 +15,7 @@ variables:
 stages:
   - test
   - dast
-  - publish
+  - deploy
 default:
   image: ruby:${RUBY_VERSION}
@@ -70,16 +73,3 @@ gemnasium-dependency_scanning:
 secret_detection:
   rules: *workflow_rules
-publish_to_rubygems:
-  stage: publish
-  script:
-    - mkdir -p ~/.gem
-    - 'echo ":rubygems_api_key: ${RUBYGEMS_API_KEY}" > ~/.gem/credentials'
-    - chmod 0600 ~/.gem/credentials
-    - gem build gitlab-exporter.gemspec --output=gitlab-exporter.gem
-    - gem push gitlab-exporter.gem
-  before_script: *before_scripts
-  rules:
-    # Only push to RubyGems.org when we tag a new version
-    - if: '$CI_COMMIT_TAG'

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (13.4.0)
+    gitlab-exporter (13.5.0)
       connection_pool (= 2.2.5)
       faraday (~> 1.8.0)
       pg (= 1.5.3)

data/gitlab-exporter.gemspec CHANGED Viewed

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(spec)/})
   s.require_paths = ["lib"]
-  s.homepage      = "http://gitlab.com"
+  s.homepage      = "https://gitlab.com/gitlab-org/ruby/gems/gitlab-exporter"
   s.license       = "MIT"
   s.add_runtime_dependency "connection_pool", "2.2.5"

data/lib/gitlab_exporter/database/ci_builds.rb CHANGED Viewed

@@ -9,27 +9,27 @@ module GitLab
           <<~SQL.freeze
             SELECT
               projects.namespace_id,
-              ci_builds.status,
+              p_ci_builds.status,
               projects.shared_runners_enabled,
               (COALESCE(namespaces.shared_runners_minutes_limit, application_settings.shared_runners_minutes, 0) = 0 OR
                  COALESCE(namespace_statistics.shared_runners_seconds, 0) < COALESCE(namespaces.shared_runners_minutes_limit, application_settings.shared_runners_minutes, 0) * 60) as has_minutes,
               COUNT(*) AS count
-            FROM ci_builds
+            FROM p_ci_builds
             JOIN projects
-              ON projects.id = ci_builds.project_id
+              ON projects.id = p_ci_builds.project_id
             JOIN namespaces
               ON namespaces.id = projects.namespace_id
             LEFT JOIN namespace_statistics
               ON namespace_statistics.namespace_id = namespaces.id
             JOIN application_settings ON (TRUE)
-            WHERE ci_builds.type = 'Ci::Build'
-              AND ci_builds.status = '%s'
+            WHERE p_ci_builds.type = 'Ci::Build'
+              AND p_ci_builds.status = '%s'
               -- The created_at filter has been introduced for performance reasons only
-              AND ci_builds.created_at > NOW() - INTERVAL '7 days'
+              AND p_ci_builds.created_at > NOW() - INTERVAL '7 days'
               AND projects.pending_delete = 'f'
             GROUP BY
               projects.namespace_id,
-              ci_builds.status,
+              p_ci_builds.status,
               projects.shared_runners_enabled,
               namespaces.shared_runners_minutes_limit,
               namespace_statistics.shared_runners_seconds,
@@ -40,20 +40,20 @@ module GitLab
           <<~SQL.freeze
             SELECT
               projects.namespace_id,
-              ci_builds.status,
+              p_ci_builds.status,
               projects.shared_runners_enabled,
               COUNT(*) AS count
-            FROM ci_builds
+            FROM p_ci_builds
             JOIN projects
-              ON projects.id = ci_builds.project_id
-            WHERE ci_builds.type = 'Ci::Build'
-              AND ci_builds.status = '%s'
+              ON projects.id = p_ci_builds.project_id
+            WHERE p_ci_builds.type = 'Ci::Build'
+              AND p_ci_builds.status = '%s'
               -- The created_at filter has been introduced for performance reasons only
-              AND ci_builds.created_at > NOW() - INTERVAL '7 days'
+              AND p_ci_builds.created_at > NOW() - INTERVAL '7 days'
               AND projects.pending_delete = 'f'
             GROUP BY
               projects.namespace_id,
-              ci_builds.status,
+              p_ci_builds.status,
               projects.shared_runners_enabled
           SQL
@@ -61,53 +61,53 @@ module GitLab
           <<~SQL.freeze
             SELECT
               COUNT(*) AS count
-            FROM ci_builds
+            FROM p_ci_builds
             JOIN projects
-              ON projects.id = ci_builds.project_id
-            WHERE ci_builds.type = 'Ci::Build'
-              AND ci_builds.status = 'running'
-              AND ci_builds.updated_at < NOW() - INTERVAL '1 hour'
+              ON projects.id = p_ci_builds.project_id
+            WHERE p_ci_builds.type = 'Ci::Build'
+              AND p_ci_builds.status = 'running'
+              AND p_ci_builds.updated_at < NOW() - INTERVAL '1 hour'
               AND projects.pending_delete = 'f'
           SQL
         PER_RUNNER_QUERY_EE =
           <<~SQL.freeze
             SELECT
-              ci_builds.runner_id,
+              p_ci_builds.runner_id,
               ci_runners.runner_type,
               projects.namespace_id,
               projects.mirror,
               projects.mirror_trigger_builds,
               ci_pipelines.pipeline_schedule_id,
-              ci_builds.trigger_request_id,
+              p_ci_builds.trigger_request_id,
               (COALESCE(namespaces.shared_runners_minutes_limit, application_settings.shared_runners_minutes, 0) = 0 OR
                  COALESCE(namespace_statistics.shared_runners_seconds, 0) < COALESCE(namespaces.shared_runners_minutes_limit, application_settings.shared_runners_minutes, 0) * 60) as has_minutes,
               COUNT(*) AS count
-            FROM ci_builds
+            FROM p_ci_builds
             JOIN ci_runners
-              ON ci_runners.id = ci_builds.runner_id
+              ON ci_runners.id = p_ci_builds.runner_id
             JOIN projects
-              ON projects.id = ci_builds.project_id
+              ON projects.id = p_ci_builds.project_id
             JOIN ci_pipelines
-              ON ci_pipelines.id = ci_builds.commit_id
+              ON ci_pipelines.id = p_ci_builds.commit_id
             JOIN namespaces
               ON namespaces.id = projects.namespace_id
             LEFT JOIN namespace_statistics
               ON namespace_statistics.namespace_id = namespaces.id
             JOIN application_settings ON (TRUE)
-            WHERE ci_builds.type = 'Ci::Build'
-              AND ci_builds.status = 'running'
+            WHERE p_ci_builds.type = 'Ci::Build'
+              AND p_ci_builds.status = 'running'
               -- The created_at filter has been introduced for performance reasons only
-              AND ci_builds.created_at > NOW() - INTERVAL '7 days'
+              AND p_ci_builds.created_at > NOW() - INTERVAL '7 days'
               AND projects.pending_delete = 'f'
             GROUP BY
-              ci_builds.runner_id,
+              p_ci_builds.runner_id,
               ci_runners.runner_type,
               projects.namespace_id,
               projects.mirror,
               projects.mirror_trigger_builds,
               ci_pipelines.pipeline_schedule_id,
-              ci_builds.trigger_request_id,
+              p_ci_builds.trigger_request_id,
               namespaces.shared_runners_minutes_limit,
               namespace_statistics.shared_runners_seconds,
               application_settings.shared_runners_minutes
@@ -116,30 +116,30 @@ module GitLab
         PER_RUNNER_QUERY_CE =
           <<~SQL.freeze
             SELECT
-              ci_builds.runner_id,
+              p_ci_builds.runner_id,
               ci_runners.runner_type,
               projects.namespace_id,
               ci_pipelines.pipeline_schedule_id,
-              ci_builds.trigger_request_id,
+              p_ci_builds.trigger_request_id,
               COUNT(*) AS count
-            FROM ci_builds
+            FROM p_ci_builds
             JOIN ci_runners
-              ON ci_runners.id = ci_builds.runner_id
+              ON ci_runners.id = p_ci_builds.runner_id
             JOIN projects
-              ON projects.id = ci_builds.project_id
+              ON projects.id = p_ci_builds.project_id
             JOIN ci_pipelines
-              ON ci_pipelines.id = ci_builds.commit_id
-            WHERE ci_builds.type = 'Ci::Build'
-              AND ci_builds.status = 'running'
+              ON ci_pipelines.id = p_ci_builds.commit_id
+            WHERE p_ci_builds.type = 'Ci::Build'
+              AND p_ci_builds.status = 'running'
               -- The created_at filter has been introduced for performance reasons only
-              AND ci_builds.created_at > NOW() - INTERVAL '7 days'
+              AND p_ci_builds.created_at > NOW() - INTERVAL '7 days'
               AND projects.pending_delete = 'f'
             GROUP BY
-              ci_builds.runner_id,
+              p_ci_builds.runner_id,
               ci_runners.runner_type,
               projects.namespace_id,
               ci_pipelines.pipeline_schedule_id,
-              ci_builds.trigger_request_id
+              p_ci_builds.trigger_request_id
           SQL
         EE_CHECK_QUERY =
@@ -151,15 +151,15 @@ module GitLab
           <<~SQL.freeze
             SELECT
               COUNT(*) as count
-            FROM ci_builds
+            FROM p_ci_builds
             JOIN ci_build_trace_chunks
-              ON ci_build_trace_chunks.build_id = ci_builds.id
+              ON ci_build_trace_chunks.build_id = p_ci_builds.id
             LEFT JOIN ci_job_artifacts
-              ON ci_job_artifacts.job_id = ci_builds.id
+              ON ci_job_artifacts.job_id = p_ci_builds.id
               AND ci_job_artifacts.file_type = 3
-            WHERE ci_builds.type = 'Ci::Build'
-              AND ci_builds.status IN ('success', 'failed', 'canceled')
-              AND ci_builds.finished_at < '%s'
+            WHERE p_ci_builds.type = 'Ci::Build'
+              AND p_ci_builds.status IN ('success', 'failed', 'canceled')
+              AND p_ci_builds.finished_at < '%s'
               AND ci_job_artifacts.job_id IS NULL
           SQL

data/lib/gitlab_exporter/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "13.4.0".freeze
+    VERSION = "13.5.0".freeze
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 13.4.0
+  version: 13.5.0
 platform: ruby
 authors:
 - Pablo Carranza
@@ -187,6 +187,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/merge_request_templates/Release.md"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
@@ -238,7 +239,7 @@ files:
 - spec/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
-homepage: http://gitlab.com
+homepage: https://gitlab.com/gitlab-org/ruby/gems/gitlab-exporter
 licenses:
 - MIT
 metadata: {}