Do not export Job's owner metrics if Job's OwnerReference is empty

Signed-off-by: Andrey Klimentyev <andrey.klimentyev@flant.com>
kubernetes · Feb 25, 2019 · 15b93c4 · 15b93c4
1 parent 15f74a6
commit 15b93c4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/internal/collector/job.go b/internal/collector/job.go
@@ -271,13 +271,7 @@ var (
 				ms := []*metric.Metric{}
 
 				owners := j.GetOwnerReferences()
-				if len(owners) == 0 {
-					ms = append(ms, &metric.Metric{
-						LabelKeys:   labelKeys,
-						LabelValues: []string{"<none>", "<none>", "<none>"},
-						Value:       1,
-					})
-				} else {
+				if len(owners) > 0 {
 					for _, owner := range owners {
 						if owner.Controller != nil {
 							ms = append(ms, &metric.Metric{

diff --git a/internal/collector/job_test.go b/internal/collector/job_test.go
@@ -149,7 +149,6 @@ func TestJobCollector(t *testing.T) {
 				},
 			},
 			Want: `
-				kube_job_owner{job_name="SuccessfulJob1",namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>"} 1
 				kube_job_complete{condition="false",job_name="SuccessfulJob1",namespace="ns1"} 0
 				kube_job_complete{condition="true",job_name="SuccessfulJob1",namespace="ns1"} 1
 				kube_job_complete{condition="unknown",job_name="SuccessfulJob1",namespace="ns1"} 0
@@ -192,7 +191,6 @@ func TestJobCollector(t *testing.T) {
 				},
 			},
 			Want: `
-				kube_job_owner{job_name="FailedJob1",namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>"} 1
 				kube_job_failed{condition="false",job_name="FailedJob1",namespace="ns1"} 0
 				kube_job_failed{condition="true",job_name="FailedJob1",namespace="ns1"} 1
 				kube_job_failed{condition="unknown",job_name="FailedJob1",namespace="ns1"} 0
@@ -235,7 +233,6 @@ func TestJobCollector(t *testing.T) {
 				},
 			},
 			Want: `
-				kube_job_owner{job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>"} 1
 				kube_job_complete{condition="false",job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1"} 0
 				kube_job_complete{condition="true",job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1"} 1