Skip to content

Commit 2c3ea01

Browse files
pawcykcapawcykca
committed
Replace "<none>" with empty string for "owner_kind", "owner_name" and "owner_is_controller" dimensions.
Returning empty string instead of "<none>" value for "owner_kind", "owner_name" and "owner_is_controller" dimensions when no metadata.ownerReferences exists in Kubernetes resoures.
1 parent 44aea58 commit 2c3ea01

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

‎internal/store/job.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ func jobMetricFamilies(allowAnnotationsList, allowLabelsList []string) []generat
364364
Metrics: []*metric.Metric{
365365
{
366366
LabelKeys: labelKeys,
367-
LabelValues: []string{"<none>", "<none>", "<none>"},
367+
LabelValues: []string{"", "", ""},
368368
Value: 1,
369369
},
370370
},

‎internal/store/job_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func TestJobStore(t *testing.T) {
154154
},
155155
Want: metadata + `
156156
kube_job_annotations{job_name="SuccessfulJob1",namespace="ns1"} 1
157-
kube_job_owner{job_name="SuccessfulJob1",namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>"} 1
157+
kube_job_owner{job_name="SuccessfulJob1",namespace="ns1",owner_is_controller="",owner_kind="",owner_name=""} 1
158158
kube_job_complete{condition="false",job_name="SuccessfulJob1",namespace="ns1"} 0
159159
kube_job_complete{condition="true",job_name="SuccessfulJob1",namespace="ns1"} 1
160160
kube_job_complete{condition="unknown",job_name="SuccessfulJob1",namespace="ns1"} 0
@@ -198,7 +198,7 @@ func TestJobStore(t *testing.T) {
198198
},
199199
Want: metadata + `
200200
kube_job_annotations{job_name="FailedJob1",namespace="ns1"} 1
201-
kube_job_owner{job_name="FailedJob1",namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>"} 1
201+
kube_job_owner{job_name="FailedJob1",namespace="ns1",owner_is_controller="",owner_kind="",owner_name=""} 1
202202
kube_job_failed{condition="false",job_name="FailedJob1",namespace="ns1"} 0
203203
kube_job_failed{condition="true",job_name="FailedJob1",namespace="ns1"} 1
204204
kube_job_failed{condition="unknown",job_name="FailedJob1",namespace="ns1"} 0
@@ -243,7 +243,7 @@ func TestJobStore(t *testing.T) {
243243
},
244244
},
245245
Want: metadata + `
246-
kube_job_owner{job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>"} 1
246+
kube_job_owner{job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1",owner_is_controller="",owner_kind="",owner_name=""} 1
247247
kube_job_complete{condition="false",job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1"} 0
248248
kube_job_complete{condition="true",job_name="SuccessfulJob2NoActiveDeadlineSeconds",namespace="ns1"} 1
249249

‎internal/store/lease.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var (
5353
Metrics: []*metric.Metric{
5454
{
5555
LabelKeys: labelKeys,
56-
LabelValues: []string{"<none>", "<none>", l.Namespace, holder},
56+
LabelValues: []string{"", "", l.Namespace, holder},
5757
Value: 1,
5858
},
5959
},

‎internal/store/pod.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,8 +597,8 @@ func createPodInfoFamilyGenerator() generator.FamilyGenerator {
597597
"",
598598
wrapPodFunc(func(p *v1.Pod) *metric.Family {
599599
createdBy := metav1.GetControllerOf(p)
600-
createdByKind := "<none>"
601-
createdByName := "<none>"
600+
createdByKind := ""
601+
createdByName := ""
602602
if createdBy != nil {
603603
if createdBy.Kind != "" {
604604
createdByKind = createdBy.Kind
@@ -1118,7 +1118,7 @@ func createPodOwnerFamilyGenerator() generator.FamilyGenerator {
11181118
Metrics: []*metric.Metric{
11191119
{
11201120
LabelKeys: labelKeys,
1121-
LabelValues: []string{"<none>", "<none>", "<none>"},
1121+
LabelValues: []string{"", "", ""},
11221122
Value: 1,
11231123
},
11241124
},

‎internal/store/pod_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,11 +1032,11 @@ func TestPodStore(t *testing.T) {
10321032
# TYPE kube_pod_owner gauge
10331033
# TYPE kube_pod_start_time gauge
10341034
kube_pod_created{namespace="ns1",pod="pod1",uid="abc-123-xxx"} 1.5e+09
1035-
kube_pod_info{created_by_kind="<none>",created_by_name="<none>",host_ip="1.1.1.1",namespace="ns1",node="node1",pod="pod1",pod_ip="1.2.3.4",uid="abc-123-xxx",priority_class="system-node-critical",host_network="true"} 1
1035+
kube_pod_info{created_by_kind="",created_by_name="",host_ip="1.1.1.1",namespace="ns1",node="node1",pod="pod1",pod_ip="1.2.3.4",uid="abc-123-xxx",priority_class="system-node-critical",host_network="true"} 1
10361036
kube_pod_ips{namespace="ns1",pod="pod1",uid="abc-123-xxx",ip="1.2.3.4",ip_family="4"} 1
10371037
kube_pod_ips{namespace="ns1",pod="pod1",uid="abc-123-xxx",ip="fc00:1234:5678:90ab:cdef:cafe:f00d:d00d",ip_family="6"} 1
10381038
kube_pod_start_time{namespace="ns1",pod="pod1",uid="abc-123-xxx"} 1.501569018e+09
1039-
kube_pod_owner{namespace="ns1",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>",pod="pod1",uid="abc-123-xxx"} 1
1039+
kube_pod_owner{namespace="ns1",owner_is_controller="",owner_kind="",owner_name="",pod="pod1",uid="abc-123-xxx"} 1
10401040
`,
10411041
MetricNames: []string{"kube_pod_created", "kube_pod_info", "kube_pod_ips", "kube_pod_start_time", "kube_pod_completion_time", "kube_pod_owner"},
10421042
},

‎internal/store/replicaset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func replicaSetMetricFamilies(allowAnnotationsList, allowLabelsList []string) []
178178
Metrics: []*metric.Metric{
179179
{
180180
LabelKeys: []string{"owner_kind", "owner_name", "owner_is_controller"},
181-
LabelValues: []string{"<none>", "<none>", "<none>"},
181+
LabelValues: []string{"", "", ""},
182182
Value: 1,
183183
},
184184
},

‎internal/store/replicaset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func TestReplicaSetStore(t *testing.T) {
129129
kube_replicaset_status_fully_labeled_replicas{namespace="ns2",replicaset="rs2"} 5
130130
kube_replicaset_status_ready_replicas{namespace="ns2",replicaset="rs2"} 0
131131
kube_replicaset_spec_replicas{namespace="ns2",replicaset="rs2"} 0
132-
kube_replicaset_owner{namespace="ns2",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>",replicaset="rs2"} 1
132+
kube_replicaset_owner{namespace="ns2",owner_is_controller="",owner_kind="",owner_name="",replicaset="rs2"} 1
133133
`,
134134
},
135135
}

‎internal/store/replicationcontroller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ var (
185185
if len(owners) == 0 {
186186
ms = append(ms, &metric.Metric{
187187
LabelKeys: labelKeys,
188-
LabelValues: []string{"<none>", "<none>", "<none>"},
188+
LabelValues: []string{"", "", ""},
189189
Value: 1,
190190
})
191191
} else {

‎internal/store/replicationcontroller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func TestReplicationControllerStore(t *testing.T) {
116116
},
117117
Want: metadata + `
118118
kube_replicationcontroller_metadata_generation{namespace="ns2",replicationcontroller="rc2"} 14
119-
kube_replicationcontroller_owner{namespace="ns2",owner_is_controller="<none>",owner_kind="<none>",owner_name="<none>",replicationcontroller="rc2"} 1
119+
kube_replicationcontroller_owner{namespace="ns2",owner_is_controller="",owner_kind="",owner_name="",replicationcontroller="rc2"} 1
120120
kube_replicationcontroller_status_replicas{namespace="ns2",replicationcontroller="rc2"} 0
121121
kube_replicationcontroller_status_observed_generation{namespace="ns2",replicationcontroller="rc2"} 5
122122
kube_replicationcontroller_status_fully_labeled_replicas{namespace="ns2",replicationcontroller="rc2"} 5

‎pkg/app/server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ kube_pod_container_status_waiting_reason{namespace="default",pod="pod0",uid="abc
322322
kube_pod_container_status_waiting{namespace="default",pod="pod0",uid="abc-0",container="pod1_con1"} 1
323323
kube_pod_container_status_waiting{namespace="default",pod="pod0",uid="abc-0",container="pod1_con2"} 0
324324
kube_pod_created{namespace="default",pod="pod0",uid="abc-0"} 1.5e+09
325-
kube_pod_info{namespace="default",pod="pod0",uid="abc-0",host_ip="1.1.1.1",pod_ip="1.2.3.4",node="node1",created_by_kind="<none>",created_by_name="<none>",priority_class="",host_network="false"} 1
325+
kube_pod_info{namespace="default",pod="pod0",uid="abc-0",host_ip="1.1.1.1",pod_ip="1.2.3.4",node="node1",created_by_kind="",created_by_name="",priority_class="",host_network="false"} 1
326326
kube_pod_labels{namespace="default",pod="pod0",uid="abc-0"} 1
327-
kube_pod_owner{namespace="default",pod="pod0",uid="abc-0",owner_kind="<none>",owner_name="<none>",owner_is_controller="<none>"} 1
327+
kube_pod_owner{namespace="default",pod="pod0",uid="abc-0",owner_kind="",owner_name="",owner_is_controller=""} 1
328328
kube_pod_restart_policy{namespace="default",pod="pod0",uid="abc-0",type="Always"} 1
329329
kube_pod_status_phase{namespace="default",pod="pod0",uid="abc-0",phase="Failed"} 0
330330
kube_pod_status_phase{namespace="default",pod="pod0",uid="abc-0",phase="Pending"} 0

0 commit comments

Comments
 (0)