Merge pull request #1845 from lantingchiang/lease

Allow Lease metrics to be exported across all namespaces

Author: k8s-ci-robot

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; | 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> `namespace` = &lt;namespace&gt; <br> `lease_holder`=&lt;lease holder name&gt;| EXPERIMENTAL |
+| kube_lease_renew_time | Gauge | `lease`=&lt;lease-name&gt;                                                                                                              | EXPERIMENTAL |

internal/store/lease.go

@@ -40,15 +40,20 @@ var (
 			metric.Gauge,
 			"",
 			wrapLeaseFunc(func(l *coordinationv1.Lease) *metric.Family {
-				labelKeys := []string{"owner_kind", "owner_name"}
+				labelKeys := []string{"owner_kind", "owner_name", "namespace", "lease_holder"}
+
+				var holder string
+				if l.Spec.HolderIdentity != nil {
+					holder = *l.Spec.HolderIdentity
+				}
 
 				owners := l.GetOwnerReferences()
 				if len(owners) == 0 {
 					return &metric.Family{
 						Metrics: []*metric.Metric{
 							{
 								LabelKeys:   labelKeys,
-								LabelValues: []string{"<none>", "<none>"},
+								LabelValues: []string{"<none>", "<none>", l.Namespace, holder},
 								Value:       1,
 							},
 						},
@@ -59,7 +64,7 @@ var (
 				for i, owner := range owners {
 					ms[i] = &metric.Metric{
 						LabelKeys:   labelKeys,
-						LabelValues: []string{owner.Kind, owner.Name},
+						LabelValues: []string{owner.Kind, owner.Name, l.Namespace, holder},
 						Value:       1,
 					}
 				}
@@ -107,10 +112,10 @@ func wrapLeaseFunc(f func(*coordinationv1.Lease) *metric.Family) func(interface{
 func createLeaseListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{
 		ListFunc: func(opts metav1.ListOptions) (runtime.Object, error) {
-			return kubeClient.CoordinationV1().Leases("kube-node-lease").List(context.TODO(), opts)
+			return kubeClient.CoordinationV1().Leases("").List(context.TODO(), opts)
 		},
 		WatchFunc: func(opts metav1.ListOptions) (watch.Interface, error) {
-			return kubeClient.CoordinationV1().Leases("kube-node-lease").Watch(context.TODO(), opts)
+			return kubeClient.CoordinationV1().Leases("").Watch(context.TODO(), opts)
 		},
 	}
 }

internal/store/lease_test.go

@@ -33,19 +33,48 @@ 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{
 			{
 				Obj: &coordinationv1.Lease{
 					ObjectMeta: metav1.ObjectMeta{
 						Generation:        2,
 						Name:              "kube-master",
+						Namespace:         "default",
+						CreationTimestamp: metav1.Time{Time: time.Unix(1500000000, 0)},
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind: "Node",
+								Name: leaseOwner,
+							},
+						},
+					},
+					Spec: coordinationv1.LeaseSpec{
+						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",lease_holder="kube-master"} 1
+                    kube_lease_renew_time{lease="kube-master"} 1.5e+09
+			`,
+				MetricNames: []string{
+					"kube_lease_owner",
+					"kube_lease_renew_time",
+				},
+			},
+			{
+				Obj: &coordinationv1.Lease{
+					ObjectMeta: metav1.ObjectMeta{
+						Generation:        2,
+						Name:              "kube-master",
+						Namespace:         "default",
 						CreationTimestamp: metav1.Time{Time: time.Unix(1500000000, 0)},
 						OwnerReferences: []metav1.OwnerReference{
 							{
 								Kind: "Node",
-								Name: "kube-master",
+								Name: leaseOwner,
 							},
 						},
 					},
@@ -54,7 +83,7 @@ func TestLeaseStore(t *testing.T) {
 					},
 				},
 				Want: metadata + `
-                    kube_lease_owner{lease="kube-master",owner_kind="Node",owner_name="kube-master"} 1
+                    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
 			`,
 				MetricNames: []string{