export Lease.Spec.HolderIdentity

kubernetes · Oct 11, 2022 · 109beeb · 109beeb
1 parent 5464a9d
commit 109beeb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/docs/lease-metrics.md b/docs/lease-metrics.md
@@ -1,6 +1,6 @@
 # Lease Metrics
 
-| 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; | EXPERIMENTAL |
-| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt;                                                                                                              | EXPERIMENTAL |
+| 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> `lease_holder`=&lt;lease holder name&gt; | EXPERIMENTAL |
+| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt;                                                                                                                         | EXPERIMENTAL |
diff --git a/internal/store/lease.go b/internal/store/lease.go
@@ -40,15 +40,15 @@ var (
 			metric.Gauge,
 			"",
 			wrapLeaseFunc(func(l *coordinationv1.Lease) *metric.Family {
-				labelKeys := []string{"owner_kind", "owner_name", "namespace"}
+				labelKeys := []string{"owner_kind", "owner_name", "namespace", "lease_owner"}
 
 				owners := l.GetOwnerReferences()
 				if len(owners) == 0 {
 					return &metric.Family{
 						Metrics: []*metric.Metric{
 							{
 								LabelKeys:   labelKeys,
-								LabelValues: []string{"<none>", "<none>", l.Namespace},
+								LabelValues: []string{"<none>", "<none>", l.Namespace, *l.Spec.HolderIdentity},
 								Value:       1,
 							},
 						},
@@ -59,7 +59,7 @@ var (
 				for i, owner := range owners {
 					ms[i] = &metric.Metric{
 						LabelKeys:   labelKeys,
-						LabelValues: []string{owner.Kind, owner.Name, l.Namespace},
+						LabelValues: []string{owner.Kind, owner.Name, l.Namespace, *l.Spec.HolderIdentity},
 						Value:       1,
 					}
 				}

diff --git a/internal/store/lease_test.go b/internal/store/lease_test.go
@@ -33,7 +33,7 @@ func TestLeaseStore(t *testing.T) {
         # HELP kube_lease_renew_time Kube lease renew time.
         # TYPE kube_lease_renew_time gauge
 	`
-
+	leaseOwner := "kube-master"
 	var (
 		cases = []generateMetricsTestCase{
 			{
@@ -46,16 +46,17 @@ func TestLeaseStore(t *testing.T) {
 						OwnerReferences: []metav1.OwnerReference{
 							{
 								Kind: "Node",
-								Name: "kube-master",
+								Name: leaseOwner,
 							},
 						},
 					},
 					Spec: coordinationv1.LeaseSpec{
-						RenewTime: &metav1.MicroTime{Time: time.Unix(1500000000, 0)},
+						RenewTime:      &metav1.MicroTime{Time: time.Unix(1500000000, 0)},
+						HolderIdentity: &leaseOwner,
 					},
 				},
 				Want: metadata + `
-                    kube_lease_owner{lease="kube-master",owner_kind="Node",owner_name="kube-master",namespace="default"} 1
+                    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
 			`,
 				MetricNames: []string{