From 9aa380dbc94f9fb8be43e3fb691dadfcbefff94c Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 5 May 2022 10:53:53 -0400 Subject: [PATCH] 18794: Add version metric to RailsAPI. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- .../api/app/controllers/arvados/v1/management_controller.rb | 3 +++ .../test/functional/arvados/v1/management_controller_test.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/services/api/app/controllers/arvados/v1/management_controller.rb b/services/api/app/controllers/arvados/v1/management_controller.rb index 55a00d3463..8f37960ef2 100644 --- a/services/api/app/controllers/arvados/v1/management_controller.rb +++ b/services/api/app/controllers/arvados/v1/management_controller.rb @@ -37,6 +37,9 @@ arvados_config_load_timestamp_seconds{sha256="#{Rails.configuration.SourceSHA256 # HELP arvados_config_source_timestamp_seconds Timestamp of config file when it was loaded. # TYPE arvados_config_source_timestamp_seconds gauge arvados_config_source_timestamp_seconds{sha256="#{Rails.configuration.SourceSHA256}"} #{Rails.configuration.SourceTimestamp.to_f} +# HELP arvados_version_running Indicated version is running. +# TYPE arvados_version_running gauge +arvados_version_running{version="#{AppVersion.package_version}"} 1 EOF end diff --git a/services/api/test/functional/arvados/v1/management_controller_test.rb b/services/api/test/functional/arvados/v1/management_controller_test.rb index 5b34f9fef9..6d27bccfc4 100644 --- a/services/api/test/functional/arvados/v1/management_controller_test.rb +++ b/services/api/test/functional/arvados/v1/management_controller_test.rb @@ -47,6 +47,8 @@ class Arvados::V1::ManagementControllerTest < ActionController::TestCase m = @response.body.match(/\narvados_config_load_timestamp_seconds{sha256="#{hash}"} (.*?)\n/) assert_operator m[1].to_f, :>, mtime.utc.to_f assert_operator m[1].to_f, :<, Time.now.utc.to_f + + assert_match /\narvados_version_running{version="#{Regexp.escape AppVersion.package_version}"} 1\n/, @response.body end test "metrics disabled" do -- 2.30.2