diff --git a/Gemfile.lock b/Gemfile.lock index dd9e113ee84643dcef2014776420f8d39e8c323a..dcb6da5031c13a3a26b701bc7393faabbacf688d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - gitlab-monitor (3.6.0) + gitlab-monitor (3.7.0) connection_pool (~> 2.2.1) pg (~> 1.1) quantile (~> 0.2.0) diff --git a/README.md b/README.md index 1557c55069a2c20f7c66f7f26fc9fe9dcdbc6726..b4796660950cf1587746c98207a974af4c8df473 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ metrics. `gitlab_database_bloat_$type_$key` with type `btree` (index bloat) or `table` (table bloat) and keys `bloat_ratio bloat_size extra_size real_size` (see below) * [Remote mirrors](lib/gitlab_monitor/database/remote_mirrors.rb) -- - `project_remote_mirror_last_successful_update_time_seconds` + `project_remote_mirror_last_successful_update_time_seconds`, `project_remote_mirror_last_update_time_seconds` 1. Git * [git pull/push timings](lib/gitlab_monitor/git.rb) -- `git_pull_time_milliseconds`, `git_push_time_milliseconds` diff --git a/lib/gitlab_monitor/database/remote_mirrors.rb b/lib/gitlab_monitor/database/remote_mirrors.rb index a4ed78d178e7fd5a7d48e671c3630174648db35b..cb3d20e9c333aef15312192760076dbe59027416 100644 --- a/lib/gitlab_monitor/database/remote_mirrors.rb +++ b/lib/gitlab_monitor/database/remote_mirrors.rb @@ -4,7 +4,9 @@ module GitLab # A helper class to collect remote mirrors metrics. class RemoteMirrorsCollector < Base QUERY = <<~SQL.freeze - SELECT project_id, url, EXTRACT(EPOCH FROM last_successful_update_at) AS last_successful_update_at + SELECT project_id, url, + EXTRACT(EPOCH FROM last_successful_update_at) AS last_successful_update_at, + EXTRACT(EPOCH FROM last_update_at) AS last_update_at FROM remote_mirrors WHERE project_id IN (%s) AND enabled = 't' SQL @@ -41,14 +43,18 @@ module GitLab ) end - def probe_db + def probe_db # rubocop:disable Metrics/MethodLength results = @collector.run results.to_a.each do |row| - last_successful_update_at = row.delete("last_successful_update_at").to_i - @metrics.add( "project_remote_mirror_last_successful_update_time_seconds", - last_successful_update_at, + row["last_successful_update_at"].to_i, + project_id: row["project_id"], + url: row["url"] + ) + @metrics.add( + "project_remote_mirror_last_update_time_seconds", + row["last_update_at"].to_i, project_id: row["project_id"], url: row["url"] ) diff --git a/lib/gitlab_monitor/version.rb b/lib/gitlab_monitor/version.rb index 3f6e5518b49a90fbf460a5dd4fd5b2f1450d9a34..beb21bb8b64f99cee21db518cacc521f0288b651 100644 --- a/lib/gitlab_monitor/version.rb +++ b/lib/gitlab_monitor/version.rb @@ -1,5 +1,5 @@ module GitLab module Monitor - VERSION = "3.6.0".freeze + VERSION = "3.7.0".freeze end end