Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display Valkey version on admin dashboard (#35785)

Browse Source
This commit is contained in:
Yamagishi Kazutoshi
2025-09-10 19:58:51 +09:00
committed by GitHub
parent eb118d8523
commit ffaa672fd6
5 changed files with 104 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/lib/admin/metrics/dimension/software_versions_dimension.rb
View File

@@ -1,7 +1,7 @@
# frozen_string_literal: true
class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dimension::BaseDimension
include Redisable
include Admin::Metrics::Dimension::StoreHelper
def key
'software_versions'
@@ -45,13 +45,11 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
end
def redis_version
value = redis_info['redis_version']
{
key: 'redis',
human_key: 'Redis',
value: value,
human_value: value,
human_key: store_name,
value: store_version,
human_value: store_version,
}
end
@@ -117,8 +115,4 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError, Oj::ParseError
nil
end
def redis_info
@redis_info ||= redis.info
end
end

14
app/lib/admin/metrics/dimension/space_usage_dimension.rb
View File

@@ -1,8 +1,8 @@
# frozen_string_literal: true
class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension::BaseDimension
include Redisable
include ActionView::Helpers::NumberHelper
include Admin::Metrics::Dimension::StoreHelper
def key
'space_usage'
@@ -27,14 +27,12 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
end
def redis_size
value = redis_info['used_memory']
{
key: 'redis',
human_key: 'Redis',
value: value.to_s,
human_key: store_name,
value: store_size.to_s,
unit: 'bytes',
human_value: number_to_human_size(value),
human_value: number_to_human_size(store_size),
}
end
@@ -57,10 +55,6 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
}
end
def redis_info
@redis_info ||= redis.info
end
def search_size
return unless Chewy.enabled?

26
app/lib/admin/metrics/dimension/store_helper.rb Normal file
View File

@@ -0,0 +1,26 @@
# frozen_string_literal: true
module Admin::Metrics::Dimension::StoreHelper
include Redisable
private
def store_name
return 'Valkey' if redis_info.key?('valkey_version')
return 'Dragonfly' if redis_info.key?('dragonfly_version')
'Redis'
end
def store_version
redis_info['valkey_version'] || redis_info['dragonfly_version'] || redis_info['redis_version']
end
def store_size
redis_info['used_memory']
end
def redis_info
@redis_info ||= redis.info
end
end