discourse
/
prometheus_exporter
mirror of https://github.com/discourse/prometheus_exporter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include hostname into ActiveRecord metrics (#272) 

* Include hostname into ActiveRecord metrics

* Disable rubocop debugger rule on a placeholder collector
This commit is contained in:
Dan Sosedoff 2023-02-16 17:53:13 -06:00 committed by GitHub
parent dd38011b1b
commit e8186520a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/prometheus_exporter/server/active_record_collector.rb
View File

@ -26,7 +26,7 @@ module PrometheusExporter::Server
metrics = {}
@active_record_metrics.map do |m|
metric_key = (m["metric_labels"] || {}).merge("pid" => m["pid"])
metric_key = (m["metric_labels"] || {}).merge("pid" => m["pid"], "hostname" => m["hostname"])
metric_key.merge!(m["custom_labels"]) if m["custom_labels"]
ACTIVE_RECORD_GAUGES.map do |k, help|

1
test/custom_type_collector.rb
View File

@ -1,4 +1,5 @@
# frozen_string_literal: true
# rubocop: disable Lint/Debugger
class CustomTypeCollector < PrometheusExporter::Server::TypeCollector
def type

15
test/server/active_record_collector_test.rb
View File

@ -14,6 +14,7 @@ class PrometheusActiveRecordCollectorTest < Minitest::Test
collector.collect(
"type" => "active_record",
"pid" => "1000",
"hostname" => "localhost",
"connections" => 50,
"busy" => 20,
"dead" => 10,
@ -30,20 +31,21 @@ class PrometheusActiveRecordCollectorTest < Minitest::Test
collector.collect(
"type" => "active_record",
"pid" => "1000",
"hostname" => "localhost",
"connections" => 50,
"busy" => 20,
"dead" => 10,
"idle" => 20,
"waiting" => 0,
"size" => 120,
'metric_labels' => {
'service' => 'service1'
"metric_labels" => {
"service" => "service1"
}
)
metrics = collector.metrics
assert_equal 6, metrics.size
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{service="service1",pid="1000"} 50'))
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{service="service1",pid="1000",hostname="localhost"} 50'))
end
def test_collecting_metrics_with_client_default_labels
@ -51,6 +53,7 @@ class PrometheusActiveRecordCollectorTest < Minitest::Test
collector.collect(
"type" => "active_record",
"pid" => "1000",
"hostname" => "localhost",
"connections" => 50,
"busy" => 20,
"dead" => 10,
@ -67,7 +70,7 @@ class PrometheusActiveRecordCollectorTest < Minitest::Test
metrics = collector.metrics
assert_equal 6, metrics.size
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{service="service1",pid="1000",environment="test"} 50'))
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{service="service1",pid="1000",hostname="localhost",environment="test"} 50'))
end
def test_collecting_metrics_for_multiple_pools
@ -102,7 +105,7 @@ class PrometheusActiveRecordCollectorTest < Minitest::Test
metrics = collector.metrics
assert_equal 6, metrics.size
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{pool_name="primary",pid="1000"} 50'))
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{pool_name="other",pid="1000"} 5'))
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{pool_name="primary",pid="1000",hostname="localhost"} 50'))
assert(metrics.first.metric_text.include?('active_record_connection_pool_connections{pool_name="other",pid="1000",hostname="localhost"} 5'))
end
end