From 77fcdf3b90ef8a45ec7c4d5c955f06519c5e55db Mon Sep 17 00:00:00 2001 From: msotnikov Date: Wed, 5 Feb 2025 06:12:22 +0300 Subject: [PATCH 1/5] Update v1_compatibility.go Fixed mess with oldName and newName for mongodb_ss_wt_cache_maximum_bytes_configured --- exporter/v1_compatibility.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/v1_compatibility.go b/exporter/v1_compatibility.go index 85016069f..5177ff8ed 100644 --- a/exporter/v1_compatibility.go +++ b/exporter/v1_compatibility.go @@ -649,8 +649,8 @@ var conversions = []conversion{ newName: "mongodb_ss_metrics_getLastError_wtime_totalMillis", }, { - oldName: "mongodb_ss_wt_cache_maximum_bytes_configured", - newName: "mongodb_mongod_wiredtiger_cache_max_bytes", + oldName: "mongodb_mongod_wiredtiger_cache_max_bytes", + newName: "mongodb_ss_wt_cache_maximum_bytes_configured", }, { oldName: "mongodb_mongod_db_collections_total", From bf52d3cae87d06d880d69e3e1754e54c9262dd74 Mon Sep 17 00:00:00 2001 From: msotnikov Date: Wed, 5 Feb 2025 13:20:45 +0300 Subject: [PATCH 2/5] Update diagnostic_data_collector_test.go --- exporter/diagnostic_data_collector_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/diagnostic_data_collector_test.go b/exporter/diagnostic_data_collector_test.go index c3a618681..fddc1292c 100644 --- a/exporter/diagnostic_data_collector_test.go +++ b/exporter/diagnostic_data_collector_test.go @@ -230,6 +230,7 @@ func TestAllDiagnosticDataCollectorMetrics(t *testing.T) { "mongodb_mongod_wiredtiger_cache_bytes", "mongodb_mongod_wiredtiger_transactions_total", "mongodb_mongod_wiredtiger_cache_bytes_total", + "mongodb_mongod_wiredtiger_cache_max_bytes", "mongodb_op_counters_total", "mongodb_ss_mem_resident", "mongodb_ss_mem_virtual", @@ -237,7 +238,6 @@ func TestAllDiagnosticDataCollectorMetrics(t *testing.T) { "mongodb_ss_metrics_getLastError_wtime_totalMillis", "mongodb_ss_opcounters", "mongodb_ss_opcountersRepl", - "mongodb_ss_wt_cache_maximum_bytes_configured", "mongodb_ss_wt_cache_modified_pages_evicted", } actualMetrics = filterMetrics(actualMetrics, filters) From 10e55cc6c6e558a78e27e3667e8f895fc6415083 Mon Sep 17 00:00:00 2001 From: msotnikov Date: Wed, 5 Feb 2025 16:24:55 +0300 Subject: [PATCH 3/5] Update v1_compatibility.go removed duplicate mongodb_ss_wt_cache_maximum_bytes_configured --- exporter/v1_compatibility.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/exporter/v1_compatibility.go b/exporter/v1_compatibility.go index 5177ff8ed..72e064117 100644 --- a/exporter/v1_compatibility.go +++ b/exporter/v1_compatibility.go @@ -435,10 +435,6 @@ var conversions = []conversion{ prefix: "mongodb_ss_wt_block_manager", suffixLabel: "type", }, - { - oldName: "mongodb_mongod_wiredtiger_cache_max_bytes", - newName: "mongodb_ss_wt_cache_maximum_bytes_configured", - }, { oldName: "mongodb_mongod_wiredtiger_cache_overhead_percent", newName: "mongodb_ss_wt_cache_percentage_overhead", From d2f798843ace4f1058e684c3f5a23ecad15f2f34 Mon Sep 17 00:00:00 2001 From: msotnikov Date: Wed, 5 Feb 2025 16:25:44 +0300 Subject: [PATCH 4/5] Update diagnostic_data_collector_test.go --- exporter/diagnostic_data_collector_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/diagnostic_data_collector_test.go b/exporter/diagnostic_data_collector_test.go index fddc1292c..c3a618681 100644 --- a/exporter/diagnostic_data_collector_test.go +++ b/exporter/diagnostic_data_collector_test.go @@ -230,7 +230,6 @@ func TestAllDiagnosticDataCollectorMetrics(t *testing.T) { "mongodb_mongod_wiredtiger_cache_bytes", "mongodb_mongod_wiredtiger_transactions_total", "mongodb_mongod_wiredtiger_cache_bytes_total", - "mongodb_mongod_wiredtiger_cache_max_bytes", "mongodb_op_counters_total", "mongodb_ss_mem_resident", "mongodb_ss_mem_virtual", @@ -238,6 +237,7 @@ func TestAllDiagnosticDataCollectorMetrics(t *testing.T) { "mongodb_ss_metrics_getLastError_wtime_totalMillis", "mongodb_ss_opcounters", "mongodb_ss_opcountersRepl", + "mongodb_ss_wt_cache_maximum_bytes_configured", "mongodb_ss_wt_cache_modified_pages_evicted", } actualMetrics = filterMetrics(actualMetrics, filters) From a8672564c4d97fe4bed34840ce721940afd251bd Mon Sep 17 00:00:00 2001 From: msotnikov Date: Wed, 5 Feb 2025 16:28:32 +0300 Subject: [PATCH 5/5] Update v1_compatibility.go --- exporter/v1_compatibility.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/exporter/v1_compatibility.go b/exporter/v1_compatibility.go index 72e064117..d3cc7199c 100644 --- a/exporter/v1_compatibility.go +++ b/exporter/v1_compatibility.go @@ -435,6 +435,10 @@ var conversions = []conversion{ prefix: "mongodb_ss_wt_block_manager", suffixLabel: "type", }, + { + oldName: "mongodb_mongod_wiredtiger_cache_max_bytes", + newName: "mongodb_ss_wt_cache_maximum_bytes_configured", + }, { oldName: "mongodb_mongod_wiredtiger_cache_overhead_percent", newName: "mongodb_ss_wt_cache_percentage_overhead", @@ -644,10 +648,6 @@ var conversions = []conversion{ oldName: "mongodb_mongod_metrics_get_last_error_wtime_total_milliseconds", newName: "mongodb_ss_metrics_getLastError_wtime_totalMillis", }, - { - oldName: "mongodb_mongod_wiredtiger_cache_max_bytes", - newName: "mongodb_ss_wt_cache_maximum_bytes_configured", - }, { oldName: "mongodb_mongod_db_collections_total", newName: "mongodb_dbstats_collections",