use metric list during check

Cloudzero · Dec 3, 2024 · e68ec94 · e68ec94
1 parent 14b87d4
commit e68ec94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/diagnostic/kms/check.go b/pkg/diagnostic/kms/check.go
@@ -96,7 +96,7 @@ func (c *checker) Check(_ context.Context, client *http.Client, accessor status.
 		}
 
 		metrics := string(body)
-		requiredMetrics := []string{"kube_pod_info", "kube_node_info"} // Add the required metrics here
+		requiredMetrics := c.cfg.Prometheus.KubeMetrics // Use the required metrics from the configuration
 		for _, metric := range requiredMetrics {
 			if !strings.Contains(metrics, metric) {
 				c.logger.Errorf("Required metric %s not found on attempt %d", metric, attempt)

diff --git a/pkg/diagnostic/kms/check_test.go b/pkg/diagnostic/kms/check_test.go
@@ -53,6 +53,7 @@ func TestChecker_CheckOK(t *testing.T) {
 	cfg := &config.Settings{
 		Prometheus: config.Prometheus{
 			KubeStateMetricsServiceEndpoint: mockURL,
+			KubeMetrics:                     []string{"kube_pod_info", "kube_node_info"},
 		},
 	}
 	clientset := fake.NewSimpleClientset()
@@ -80,6 +81,7 @@ func TestChecker_CheckRetry(t *testing.T) {
 	cfg := &config.Settings{
 		Prometheus: config.Prometheus{
 			KubeStateMetricsServiceEndpoint: mockURL,
+			KubeMetrics:                     []string{"kube_pod_info", "kube_node_info"},
 		},
 	}
 	clientset := fake.NewSimpleClientset()
@@ -114,6 +116,7 @@ func TestChecker_CheckRetryFailure(t *testing.T) {
 	cfg := &config.Settings{
 		Prometheus: config.Prometheus{
 			KubeStateMetricsServiceEndpoint: mockURL,
+			KubeMetrics:                     []string{"kube_pod_info", "kube_node_info"},
 		},
 	}
 	clientset := fake.NewSimpleClientset()
@@ -147,6 +150,7 @@ func TestChecker_CheckMetricsValidation(t *testing.T) {
 	cfg := &config.Settings{
 		Prometheus: config.Prometheus{
 			KubeStateMetricsServiceEndpoint: mockURL,
+			KubeMetrics:                     []string{"kube_pod_info", "kube_node_info"},
 		},
 	}
 	clientset := fake.NewSimpleClientset()
@@ -174,6 +178,7 @@ func TestChecker_CheckHandles500Error(t *testing.T) {
 	cfg := &config.Settings{
 		Prometheus: config.Prometheus{
 			KubeStateMetricsServiceEndpoint: mockURL,
+			KubeMetrics:                     []string{"kube_pod_info", "kube_node_info"},
 		},
 	}
 	clientset := fake.NewSimpleClientset()