Adds tests for load_avg metrics

xonvanetta · Apr 20, 2023 · f9985b3 · f9985b3
1 parent 48f9cee
commit f9985b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/collectors/nodestats/nodestats_collector_test.go b/collectors/nodestats/nodestats_collector_test.go
@@ -79,6 +79,9 @@ func TestCollectNotNil(t *testing.T) {
 		"logstash_stats_pipeline_reloads_successes",
 		"logstash_stats_process_cpu_percent",
 		"logstash_stats_process_cpu_total_millis",
+		"logstash_stats_process_cpu_load_average_1m",
+		"logstash_stats_process_cpu_load_average_5m",
+		"logstash_stats_process_cpu_load_average_15m",
 		"logstash_stats_process_max_file_descriptors",
 		"logstash_stats_process_mem_total_virtual",
 		"logstash_stats_process_open_file_descriptors",

diff --git a/prometheus_helper/prometheus_helper.go b/prometheus_helper/prometheus_helper.go
@@ -29,7 +29,7 @@ func (h *SimpleDescHelper) NewDescWithHelpAndLabel(name, help, label string) *pr
 // ExtractFqName extracts the fqName from a prometheus.Desc string.
 // This is useful for testing collectors.
 func ExtractFqName(metric string) (string, error) {
-	regex := regexp.MustCompile(`fqName:\s*"([a-zA-Z_-]+)"`)
+	regex := regexp.MustCompile(`fqName:\s*"([a-zA-Z0-9_-]+)"`)
 	matches := regex.FindStringSubmatch(metric)
 	if len(matches) < 2 {
 		return "", errors.New("failed to extract fqName from metric string")

diff --git a/scripts/snapshots/metric_names.txt b/scripts/snapshots/metric_names.txt
@@ -26,6 +26,9 @@ logstash_stats_pipeline_reloads_failures
 logstash_stats_pipeline_reloads_successes
 logstash_stats_process_cpu_percent
 logstash_stats_process_cpu_total_millis
+logstash_stats_process_cpu_load_average_1m
+logstash_stats_process_cpu_load_average_5m
+logstash_stats_process_cpu_load_average_15m
 logstash_stats_process_max_file_descriptors
 logstash_stats_process_mem_total_virtual
 logstash_stats_process_open_file_descriptors