gitlab-exporter 16.2.0 → 16.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e275e1cea2b8841c1c8471f44d851a49b552ede909c91aca462ad60efcd3ab
-  data.tar.gz: 59c1f60fc4caed54da0048db13c3dd1566fd70bbb744f3260c16cca78012c018
+  metadata.gz: dfb5ffd66eceaaada65415073b18a42568888669d775689fbf2aaf3e58b02d7f
+  data.tar.gz: 2cda7d12814c7164425331e2be436000dc91ea8551387ce207bfafe49bcc69aa
 SHA512:
-  metadata.gz: e790d3ec4ebb7e07546d5565dc14fdc62f1131b3b23cf367c502eb12e7d7ed55051dd79fed6e8c865af464d1b120eaf2fe6f4f72f3a6a581915adc342b446ad2
-  data.tar.gz: 829b42af76274c5ff4b25c9094545ea42491fc41f16bae2dec96cd3a76450beb7cca40496bbc10f926f75b0bcaa509fb9a4001a3f83b2e7dc3f1031b7554d0d3
+  metadata.gz: 0f91104bdeb03655fff74687478fcd81d1ffc03ac6f4be391c4bb9ff93e6b0171a57471aee54947b2536fe6cbdfd561ef0150fd7e306e3533ba3a2ea830b5d42
+  data.tar.gz: 195a6184776a297eadf4fa74883ff3780cd23f33a8d93fb67f19fcf79a202e818f88ac830656fb5d8fc9f64fd7378d6d4db6ae565b15866ad274d9fe7ccc2443

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    gitlab-exporter (16.2.0)
-      connection_pool (= 2.5.4)
+    gitlab-exporter (16.3.1)
+      connection_pool (= 2.5.5)
       deep_merge (~> 1.2.2)
       faraday (= 2.14.0)
       pg (= 1.6.2)
-      puma (= 6.6.1)
+      puma (= 7.1.0)
       quantile (= 0.2.1)
       redis (= 4.8.1)
       redis-namespace (= 1.11.0)
@@ -19,7 +19,7 @@ GEM
   specs:
     ast (2.4.3)
     base64 (0.2.0)
-    connection_pool (2.5.4)
+    connection_pool (2.5.5)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
     faraday (2.14.0)
@@ -40,7 +40,7 @@ GEM
       racc
     pg (1.6.2)
     prism (1.4.0)
-    puma (6.6.1)
+    puma (7.1.0)
       nio4r (~> 2.0)
     quantile (0.2.1)
     racc (1.8.1)
@@ -66,7 +66,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.81.1)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/gitlab-exporter.gemspec

@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
-  s.add_runtime_dependency "connection_pool", "2.5.4"
+  s.add_runtime_dependency "connection_pool", "2.5.5"
   s.add_runtime_dependency "deep_merge", "~> 1.2.2"
   s.add_runtime_dependency "faraday", "2.14.0"
   s.add_runtime_dependency "pg", "1.6.2"
-  s.add_runtime_dependency "puma", "6.6.1"
+  s.add_runtime_dependency "puma", "7.1.0"
   s.add_runtime_dependency "quantile", "0.2.1"
   s.add_runtime_dependency "redis", "4.8.1"
   s.add_runtime_dependency "redis-namespace", "1.11.0"

data/lib/gitlab_exporter/database/zoekt.rb

@@ -31,6 +31,16 @@ module GitLab
           SELECT schema_version, id FROM zoekt_nodes
         SQL
 
+        ZOEKT_NODES_STATUS_QUERY = <<~SQL.freeze
+          SELECT
+            id,
+            CASE
+              WHEN last_seen_at < NOW() - INTERVAL '2 minute' THEN 0
+              ELSE 1
+            END AS status
+          FROM zoekt_nodes;
+        SQL
+
         ZOEKT_REPOSITORY_SCHEMA_VERSION_QUERY = <<~SQL.freeze
           SELECT
             COUNT(*)
@@ -58,7 +68,8 @@ module GitLab
 
           {
             task_processing_query_result: execute(ZOEKT_TASKS_PROCESSING_QUERY, [Time.now.utc]),
-            repositories_schema_version_query_result: repositories_schema_version_query_result
+            repositories_schema_version_query_result: repositories_schema_version_query_result,
+            zoekt_nodes_status_query_result: execute(ZOEKT_NODES_STATUS_QUERY)
           }.compact
         end
 
@@ -119,13 +130,23 @@ module GitLab
 
       # The prober which is called when gathering metrics
       class ZoektProber
-        PrometheusMetrics.describe("search_zoekt_task_processing_queue_size",
-                                   "Number of tasks waiting to be processed by Zoekt",
-                                   "gauge")
-
-        PrometheusMetrics.describe("search_zoekt_repositories_schema_version_count",
-                                   "Number of zoekt_repositories which do not have the latest schema version",
-                                   "gauge")
+        PrometheusMetrics.describe(
+          "search_zoekt_task_processing_queue_size",
+          "Number of tasks waiting to be processed by Zoekt",
+          "gauge"
+        )
+
+        PrometheusMetrics.describe(
+          "search_zoekt_repositories_schema_version_count",
+          "Number of zoekt_repositories which do not have the latest schema version",
+          "gauge"
+        )
+
+        PrometheusMetrics.describe(
+          "search_zoekt_nodes_status",
+          "Status of each zoekt_node. 0 is offline (last seen more than 2 minutes ago), 1 is online",
+          "gauge"
+        )
 
         def initialize(metrics: PrometheusMetrics.new, **opts)
           @metrics = metrics
@@ -140,6 +161,9 @@ module GitLab
           results[:repositories_schema_version_query_result]&.each do |row|
             add_zoekt_repositories_by_schema_version_to_metric(row)
           end
+          results[:zoekt_nodes_status_query_result]&.each do |row|
+            add_zoekt_nodes_status_to_metric(row)
+          end
 
           self
         rescue PG::ConnectionBad
@@ -164,6 +188,14 @@ module GitLab
           )
         end
 
+        def add_zoekt_nodes_status_to_metric(row)
+          @metrics.add(
+            "search_zoekt_nodes_status",
+            row["status"].to_i,
+            zoekt_node_id: row["id"]
+          )
+        end
+
         def write_to(target)
           target.write(@metrics.to_s)
         end

data/lib/gitlab_exporter/version.rb

@@ -1,5 +1,5 @@
 module GitLab
   module Exporter
-    VERSION = "16.2.0".freeze
+    VERSION = "16.3.1".freeze
   end
 end

data/spec/database/zoekt_spec.rb

@@ -9,6 +9,8 @@ describe GitLab::Exporter::Database::ZoektCollector do
   let(:zoekt_nodes_query_results) { [{ "id" => "1", "schema_version" => "2302" }] }
   let(:zoekt_enabled_query) { described_class::ZOEKT_ENABLED_QUERY }
   let(:zoekt_repository_schema_version_query) { described_class::ZOEKT_REPOSITORY_SCHEMA_VERSION_QUERY }
+  let(:zoekt_nodes_status_query) { described_class::ZOEKT_NODES_STATUS_QUERY }
+  let(:zoekt_nodes_status_query_results) { [{ "id" => "1", "status" => "1" }] }
 
   let(:zoekt_repository_schema_version_query_results) { [{ "count" => "1" }] }
 
@@ -45,7 +47,8 @@ describe GitLab::Exporter::Database::ZoektCollector do
     let(:result) do
       {
         repositories_schema_version_query_result: zoekt_repositories_schema_version_query_results,
-        task_processing_query_result: zoekt_tasks_processing_query_results
+        task_processing_query_result: zoekt_tasks_processing_query_results,
+        zoekt_nodes_status_query_result: zoekt_nodes_status_query_results
       }
     end
 
@@ -75,6 +78,8 @@ describe GitLab::Exporter::Database::ZoektCollector do
                                                    .and_return(zoekt_nodes_query_results)
         expect(connection).to receive(:exec_params).with(zoekt_repository_schema_version_query, %w[1 2302])
                                                    .and_return(zoekt_repository_schema_version_query_results)
+        expect(connection).to receive(:exec_params).with(zoekt_nodes_status_query, [])
+                                                   .and_return(zoekt_nodes_status_query_results)
 
         expect(collector.run).to eq(result)
       end
@@ -85,6 +90,8 @@ describe GitLab::Exporter::Database::ZoektCollector do
                                                     .and_raise(PG::UndefinedTable)
           allow(connection).to receive(:exec_params).with(zoekt_nodes_query, [])
                                                     .and_raise(PG::UndefinedTable)
+          allow(connection).to receive(:exec_params).with(zoekt_nodes_status_query, [])
+                                                    .and_raise(PG::UndefinedTable)
 
           expect(collector.run).to eq({})
         end
@@ -98,6 +105,7 @@ describe GitLab::Exporter::Database::ZoektCollector do
                                                      .and_return(zoekt_nodes_query_results)
           expect(connection).to receive(:exec_params).with(zoekt_repository_schema_version_query, %w[1 2302])
                                                      .and_raise(PG::UndefinedTable)
+          expect(connection).to receive(:exec_params).with(zoekt_nodes_status_query, []).and_raise(PG::UndefinedTable)
 
           expect(collector.run).to eq({ task_processing_query_result: zoekt_tasks_processing_query_results })
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-exporter
 version: !ruby/object:Gem::Version
-  version: 16.2.0
+  version: 16.3.1
 platform: ruby
 authors:
 - Pablo Carranza
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.5.5
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.1
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.6.1
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: quantile
   requirement: !ruby/object:Gem::Requirement