Merge pull request #2073 from A-Hilaly/lease-renew-time-labels

Add namespace label to `kube_lease_renew_time`
kubernetes · May 20, 2023 · 42e7742 · 42e7742
2 parents 5010c4a + 379d9a5
commit 42e7742
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/lease-metrics.md b/docs/lease-metrics.md
@@ -3,4 +3,4 @@
 | Metric name| Metric type | Labels/tags                                                                                                                               | Status |
 | ---------- | ----------- |-------------------------------------------------------------------------------------------------------------------------------------------| ----------- |
 | 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; <br> `lease_holder`=&lt;lease holder name&gt;| EXPERIMENTAL |
-| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt;                                                                                                              | EXPERIMENTAL |
+| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt;  <br> `namespace` = &lt;namespace&gt;                                                                        | EXPERIMENTAL |
diff --git a/internal/store/lease.go b/internal/store/lease.go
@@ -83,11 +83,15 @@ var (
 			basemetrics.ALPHA,
 			"",
 			wrapLeaseFunc(func(l *coordinationv1.Lease) *metric.Family {
+				labelKeys := []string{"namespace"}
+
 				ms := []*metric.Metric{}
 
 				if !l.Spec.RenewTime.IsZero() {
 					ms = append(ms, &metric.Metric{
-						Value: float64(l.Spec.RenewTime.Unix()),
+						LabelKeys:   labelKeys,
+						LabelValues: []string{l.Namespace},
+						Value:       float64(l.Spec.RenewTime.Unix()),
 					})
 				}
 				return &metric.Family{

diff --git a/internal/store/lease_test.go b/internal/store/lease_test.go
@@ -57,7 +57,7 @@ func TestLeaseStore(t *testing.T) {
 				},
 				Want: metadata + `
                     kube_lease_owner{lease="kube-master",owner_kind="Node",owner_name="kube-master",namespace="default",lease_holder="kube-master"} 1
-                    kube_lease_renew_time{lease="kube-master"} 1.5e+09
+                    kube_lease_renew_time{lease="kube-master",namespace="default"} 1.5e+09
 			`,
 				MetricNames: []string{
 					"kube_lease_owner",
@@ -84,7 +84,7 @@ func TestLeaseStore(t *testing.T) {
 				},
 				Want: metadata + `
                     kube_lease_owner{lease="kube-master",owner_kind="Node",owner_name="kube-master",namespace="default",lease_holder=""} 1
-                    kube_lease_renew_time{lease="kube-master"} 1.5e+09
+                    kube_lease_renew_time{lease="kube-master",namespace="default"} 1.5e+09
 			`,
 				MetricNames: []string{
 					"kube_lease_owner",