Merge pull request #638 from kminehart/replicaset-labels

Add replicaset label metrics
kubernetes · Jan 23, 2019 · 491d94d · 491d94d
2 parents 00871c1 + d4f7306
commit 491d94d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/Documentation/replicaset-metrics.md b/Documentation/replicaset-metrics.md
@@ -8,5 +8,6 @@
 | kube_replicaset_status_observed_generation | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; | STABLE |
 | kube_replicaset_spec_replicas | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; | STABLE |
 | kube_replicaset_metadata_generation | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; | STABLE |
+| kube_replicaset_labels | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; | STABLE |
 | kube_replicaset_created | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; | STABLE |
-| kube_replicaset_owner | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; <br> `owner_kind`=&lt;owner kind&gt; <br> `owner_name`=&lt;owner name&gt; <br> `owner_is_controller`=&lt;whether owner is controller&gt;  | STABLE |
+| kube_replicaset_owner | Gauge | `replicaset`=&lt;replicaset-name&gt; <br> `namespace`=&lt;replicaset-namespace&gt; <br> `owner_kind`=&lt;owner kind&gt; <br> `owner_name`=&lt;owner name&gt; <br> `owner_is_controller`=&lt;whether owner is controller&gt;  | STABLE |
diff --git a/pkg/collectors/replicaset.go b/pkg/collectors/replicaset.go
@@ -30,6 +30,8 @@ import (
 )
 
 var (
+	descReplicaSetLabelsName          = "kube_replicaset_labels"
+	descReplicaSetLabelsHelp          = "Kubernetes labels converted to Prometheus labels."
 	descReplicaSetLabelsDefaultLabels = []string{"namespace", "replicaset"}
 
 	replicaSetMetricFamilies = []metrics.FamilyGenerator{
@@ -157,6 +159,20 @@ var (
 				return f
 			}),
 		},
+		{
+			Name: descReplicaSetLabelsName,
+			Type: metrics.MetricTypeGauge,
+			Help: descReplicaSetLabelsHelp,
+			GenerateFunc: wrapReplicaSetFunc(func(d *v1beta1.ReplicaSet) metrics.Family {
+				labelKeys, labelValues := kubeLabelsToPrometheusLabels(d.Labels)
+				return metrics.Family{&metrics.Metric{
+					Name:        descReplicaSetLabelsName,
+					LabelKeys:   labelKeys,
+					LabelValues: labelValues,
+					Value:       1,
+				}}
+			}),
+		},
 	}
 )
 

diff --git a/pkg/collectors/replicaset_test.go b/pkg/collectors/replicaset_test.go
@@ -51,6 +51,8 @@ func TestReplicaSetCollector(t *testing.T) {
 		# TYPE kube_replicaset_spec_replicas gauge
 		# HELP kube_replicaset_owner Information about the ReplicaSet's owner.
 		# TYPE kube_replicaset_owner gauge
+		# HELP kube_replicaset_labels Kubernetes labels converted to Prometheus labels.
+		# TYPE kube_replicaset_labels gauge
 	`
 	cases := []generateMetricsTestCase{
 		{
@@ -67,6 +69,9 @@ func TestReplicaSetCollector(t *testing.T) {
 							Controller: &test,
 						},
 					},
+					Labels: map[string]string{
+						"app": "example1",
+					},
 				},
 				Status: v1beta1.ReplicaSetStatus{
 					Replicas:             5,
@@ -79,6 +84,7 @@ func TestReplicaSetCollector(t *testing.T) {
 				},
 			},
 			Want: `
+				kube_replicaset_labels{replicaset="rs1",namespace="ns1",label_app="example1"} 1
 				kube_replicaset_created{namespace="ns1",replicaset="rs1"} 1.5e+09
 				kube_replicaset_metadata_generation{namespace="ns1",replicaset="rs1"} 21
 				kube_replicaset_status_replicas{namespace="ns1",replicaset="rs1"} 5
@@ -95,6 +101,10 @@ func TestReplicaSetCollector(t *testing.T) {
 					Name:       "rs2",
 					Namespace:  "ns2",
 					Generation: 14,
+					Labels: map[string]string{
+						"app": "example2",
+						"env": "ex",
+					},
 				},
 				Status: v1beta1.ReplicaSetStatus{
 					Replicas:             0,
@@ -107,6 +117,7 @@ func TestReplicaSetCollector(t *testing.T) {
 				},
 			},
 			Want: `
+				kube_replicaset_labels{replicaset="rs2",namespace="ns2",label_app="example2",label_env="ex"} 1
 				kube_replicaset_metadata_generation{namespace="ns2",replicaset="rs2"} 14
 				kube_replicaset_status_replicas{namespace="ns2",replicaset="rs2"} 0
 				kube_replicaset_status_observed_generation{namespace="ns2",replicaset="rs2"} 5