Count recording rules used in rules group as used (#8133)

grafana · Jul 10, 2024 · 2ce3a49 · 2ce3a49
1 parent 51da3f3
commit 2ce3a49
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,6 +73,8 @@
 
 ### Mimirtool
 
+* [CHANGE] Analyze Rules: Count recording rules used in rules group as used. #6133
+
 ### Mimir Continuous Test
 
 * [CHANGE] Use test metrics that do not pass through 0 to make identifying incorrect results easier. #8630

diff --git a/pkg/mimirtool/analyze/ruler.go b/pkg/mimirtool/analyze/ruler.go
@@ -57,11 +57,6 @@ func ParseMetricsInRuleGroup(mir *MetricsInRuler, group rwrulefmt.RuleGroup, ns
 		})
 	}
 
-	// remove defined recording rule metrics in same RG
-	for ruleMetric := range ruleMetrics {
-		delete(refMetrics, ruleMetric)
-	}
-
 	var metricsInGroup []string
 	var parseErrs []string
 

diff --git a/pkg/mimirtool/commands/analyse_rulefiles_test.go b/pkg/mimirtool/commands/analyse_rulefiles_test.go
@@ -12,11 +12,14 @@ import (
 func TestAnalyzeRuleFiles(t *testing.T) {
 	mir, err := AnalyzeRuleFiles([]string{"testdata/prometheus_rules.yaml"})
 	require.NoError(t, err)
-	require.Equal(t, 24, len(mir.MetricsUsed))
+	require.Equal(t, 28, len(mir.MetricsUsed))
 	expectedMetrics := model.LabelValues{
 		"apiserver_request_duration_seconds_bucket",
 		"apiserver_request_duration_seconds_count",
 		"apiserver_request_total",
+		"code:apiserver_request_total:increase30d",
+		"code_verb:apiserver_request_total:increase1h",
+		"code_verb:apiserver_request_total:increase30d",
 		"container_memory_cache",
 		"container_memory_rss",
 		"container_memory_swap",
@@ -35,6 +38,7 @@ func TestAnalyzeRuleFiles(t *testing.T) {
 		"node_memory_MemAvailable_bytes",
 		"node_memory_MemFree_bytes",
 		"node_memory_Slab_bytes",
+		"node_namespace_pod:kube_pod_info:",
 		"scheduler_binding_duration_seconds_bucket",
 		"scheduler_e2e_scheduling_duration_seconds_bucket",
 		"scheduler_scheduling_algorithm_duration_seconds_bucket",

diff --git a/pkg/mimirtool/commands/analyse_rules_test.go b/pkg/mimirtool/commands/analyse_rules_test.go
@@ -25,6 +25,9 @@ var allMetricsInRuleTest = []string{
 	"apiserver_request_duration_seconds_bucket",
 	"apiserver_request_duration_seconds_count",
 	"apiserver_request_total",
+	"code:apiserver_request_total:increase30d",
+	"code_verb:apiserver_request_total:increase1h",
+	"code_verb:apiserver_request_total:increase30d",
 	"container_memory_cache",
 	"container_memory_rss",
 	"container_memory_swap",
@@ -43,6 +46,7 @@ var allMetricsInRuleTest = []string{
 	"node_memory_MemAvailable_bytes",
 	"node_memory_MemFree_bytes",
 	"node_memory_Slab_bytes",
+	"node_namespace_pod:kube_pod_info:",
 	"scheduler_binding_duration_seconds_bucket",
 	"scheduler_e2e_scheduling_duration_seconds_bucket",
 	"scheduler_scheduling_algorithm_duration_seconds_bucket",