Skip to content

Commit 5464a9d

Browse files
committed
update lease store to export namespace
1 parent 8f883f0 commit 5464a9d

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

docs/lease-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
| Metric name| Metric type | Labels/tags | Status |
44
| ---------- | ----------- |-------------------------------------------------------------------------------------------------------------------------------------------| ----------- |
55
| kube_lease_owner | Gauge | `lease`=&lt;lease-name&gt; <br> `owner_kind`=&lt;onwer kind&gt; <br> `owner_name`=&lt;owner name&gt; <br> `namespace` = &lt;namespace&gt; | EXPERIMENTAL |
6-
| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt; <br> `namespace` = &lt;namespace&gt; | EXPERIMENTAL |
6+
| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt; | EXPERIMENTAL |

internal/store/lease.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ var (
4040
metric.Gauge,
4141
"",
4242
wrapLeaseFunc(func(l *coordinationv1.Lease) *metric.Family {
43-
labelKeys := []string{"owner_kind", "owner_name"}
43+
labelKeys := []string{"owner_kind", "owner_name", "namespace"}
4444

4545
owners := l.GetOwnerReferences()
4646
if len(owners) == 0 {
4747
return &metric.Family{
4848
Metrics: []*metric.Metric{
4949
{
5050
LabelKeys: labelKeys,
51-
LabelValues: []string{"<none>", "<none>"},
51+
LabelValues: []string{"<none>", "<none>", l.Namespace},
5252
Value: 1,
5353
},
5454
},
@@ -59,7 +59,7 @@ var (
5959
for i, owner := range owners {
6060
ms[i] = &metric.Metric{
6161
LabelKeys: labelKeys,
62-
LabelValues: []string{owner.Kind, owner.Name},
62+
LabelValues: []string{owner.Kind, owner.Name, l.Namespace},
6363
Value: 1,
6464
}
6565
}

internal/store/lease_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func TestLeaseStore(t *testing.T) {
4141
ObjectMeta: metav1.ObjectMeta{
4242
Generation: 2,
4343
Name: "kube-master",
44+
Namespace: "default",
4445
CreationTimestamp: metav1.Time{Time: time.Unix(1500000000, 0)},
4546
OwnerReferences: []metav1.OwnerReference{
4647
{
@@ -54,7 +55,7 @@ func TestLeaseStore(t *testing.T) {
5455
},
5556
},
5657
Want: metadata + `
57-
kube_lease_owner{lease="kube-master",owner_kind="Node",owner_name="kube-master"} 1
58+
kube_lease_owner{lease="kube-master",owner_kind="Node",owner_name="kube-master",namespace="default"} 1
5859
kube_lease_renew_time{lease="kube-master"} 1.5e+09
5960
`,
6061
MetricNames: []string{

0 commit comments

Comments
 (0)