kube_pod_nodeselector -> kube_pod_nodeselectors

Author: geojaz

docs/pod-metrics.md

@@ -8,7 +8,7 @@
 | kube_pod_completion_time | Gauge | Completion time in unix timestamp for a pod | seconds | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `uid`=&lt;pod-uid&gt; | STABLE | - |
 | kube_pod_owner | Gauge | Information about the Pod's owner | |`pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-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; <br> `uid`=&lt;pod-uid&gt;  | STABLE | - |
 | kube_pod_labels | Gauge | Kubernetes labels converted to Prometheus labels | | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `label_POD_LABEL`=&lt;POD_LABEL&gt; <br> `uid`=&lt;pod-uid&gt; | STABLE | - |
-| kube_pod_nodeselector | Gauge | Describes the Pod nodeSelectors | |  `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `nodeselector_NODE_SELECTOR`=&lt;NODE_SELECTOR&gt; <br> `uid`=&lt;pod-uid&gt; | EXPERIMENTAL | Opt-in |
+| kube_pod_nodeselectors| Gauge | Describes the Pod nodeSelectors | |  `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `nodeselectors_NODE_SELECTOR`=&lt;NODE_SELECTOR&gt; <br> `uid`=&lt;pod-uid&gt; | EXPERIMENTAL | Opt-in |
 | kube_pod_status_phase | Gauge | The pods current phase | | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `phase`=&lt;Pending\|Running\|Succeeded\|Failed\|Unknown&gt; <br> `uid`=&lt;pod-uid&gt; | STABLE | - |
 | kube_pod_status_ready | Gauge | Describes whether the pod is ready to serve requests | | `pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `condition`=&lt;true\|false\|unknown&gt; <br> `uid`=&lt;pod-uid&gt; | STABLE | - |
 | kube_pod_status_scheduled | Gauge | Describes the status of the scheduling process for the pod | |`pod`=&lt;pod-name&gt; <br> `namespace`=&lt;pod-namespace&gt; <br> `condition`=&lt;true\|false\|unknown&gt; <br> `uid`=&lt;pod-uid&gt; | STABLE | - |

internal/store/pod.go

@@ -82,7 +82,7 @@ func podMetricFamilies(allowAnnotationsList, allowLabelsList []string) []generat
 		createPodStatusScheduledFamilyGenerator(),
 		createPodStatusScheduledTimeFamilyGenerator(),
 		createPodStatusUnschedulableFamilyGenerator(),
-		createPodNodeSelectorFamilyGenerator(),
+		createPodNodeSelectorsFamilyGenerator(),
 	}
 }
 
@@ -1359,9 +1359,9 @@ func createPodStatusUnschedulableFamilyGenerator() generator.FamilyGenerator {
 	)
 }
 
-func createPodNodeSelectorFamilyGenerator() generator.FamilyGenerator {
+func createPodNodeSelectorsFamilyGenerator() generator.FamilyGenerator {
 	return *generator.NewOptInFamilyGenerator(
-		"kube_pod_nodeselector",
+		"kube_pod_nodeselectors",
 		"Describes the Pod nodeSelectors.",
 		metric.Gauge,
 		"",

internal/store/pod_test.go

@@ -1829,12 +1829,12 @@ func TestPodStore(t *testing.T) {
 			},
 			AllowLabelsList: []string{options.LabelWildcard},
 			Want: `
-				# HELP kube_pod_nodeselector Describes the Pod nodeSelectors.
-				# TYPE kube_pod_nodeselector gauge
-				kube_pod_nodeselector{nodeselector_a="b",namespace="ns1",pod="pod1",uid="uid1"} 1
+				# HELP kube_pod_nodeselectors Describes the Pod nodeSelectors.
+				# TYPE kube_pod_nodeselectors gauge
+				kube_pod_nodeselectors{nodeselector_a="b",namespace="ns1",pod="pod1",uid="uid1"} 1
 		`,
 			MetricNames: []string{
-				"kube_pod_nodeselector",
+				"kube_pod_nodeselectors",
 			},
 		},
 		{
@@ -1853,9 +1853,9 @@ func TestPodStore(t *testing.T) {
 			},
 			AllowLabelsList: []string{options.LabelWildcard},
 			Want: `
-				# HELP kube_pod_nodeselector Describes the Pod nodeSelectors.
-				# TYPE kube_pod_nodeselector gauge
-				kube_pod_nodeselector{nodeselector_kubernetes_io_os="linux",nodeselector_cloud_google_com_gke_accelerator="nvidia-tesla-t4",namespace="ns1",pod="pod2",uid="uid6"} 1
+				# HELP kube_pod_nodeselectors Describes the Pod nodeSelectors.
+				# TYPE kube_pod_nodeselectors gauge
+				kube_pod_nodeselectors{nodeselector_kubernetes_io_os="linux",nodeselector_cloud_google_com_gke_accelerator="nvidia-tesla-t4",namespace="ns1",pod="pod2",uid="uid6"} 1
 		`,
 			MetricNames: []string{
 				"kube_pod_nodeselector",

pkg/app/server_test.go

@@ -207,7 +207,7 @@ func TestFullScrapeCycle(t *testing.T) {
 # HELP kube_pod_init_container_status_waiting Describes whether the init container is currently in waiting state.
 # HELP kube_pod_init_container_status_waiting_reason Describes the reason the init container is currently in waiting state.
 # HELP kube_pod_labels Kubernetes labels converted to Prometheus labels.
-# HELP kube_pod_nodeselector Describes the Pod nodeSelectors.
+# HELP kube_pod_nodeselectors Describes the Pod nodeSelectors.
 # HELP kube_pod_overhead_cpu_cores The pod overhead in regards to cpu cores associated with running a pod.
 # HELP kube_pod_overhead_memory_bytes The pod overhead in regards to memory associated with running a pod.
 # HELP kube_pod_runtimeclass_name_info The runtimeclass associated with the pod.
@@ -251,7 +251,7 @@ func TestFullScrapeCycle(t *testing.T) {
 # TYPE kube_pod_init_container_status_waiting gauge
 # TYPE kube_pod_init_container_status_waiting_reason gauge
 # TYPE kube_pod_labels gauge
-# TYPE kube_pod_nodeselector gauge
+# TYPE kube_pod_nodeselectors gauge
 # TYPE kube_pod_overhead_cpu_cores gauge
 # TYPE kube_pod_overhead_memory_bytes gauge
 # TYPE kube_pod_runtimeclass_name_info gauge
@@ -298,7 +298,7 @@ kube_pod_container_status_waiting{namespace="default",pod="pod0",uid="abc-0",con
 kube_pod_created{namespace="default",pod="pod0",uid="abc-0"} 1.5e+09
 kube_pod_info{namespace="default",pod="pod0",uid="abc-0",host_ip="1.1.1.1",pod_ip="1.2.3.4",node="node1",created_by_kind="<none>",created_by_name="<none>",priority_class="",host_network="false"} 1
 kube_pod_labels{namespace="default",pod="pod0",uid="abc-0"} 1
-kube_pod_nodeselector{namespace="default",pod="pod0",uid="abc-0"} 1
+kube_pod_nodeselectors{namespace="default",pod="pod0",uid="abc-0"} 1
 kube_pod_owner{namespace="default",pod="pod0",uid="abc-0",owner_kind="<none>",owner_name="<none>",owner_is_controller="<none>"} 1
 kube_pod_restart_policy{namespace="default",pod="pod0",uid="abc-0",type="Always"} 1
 kube_pod_status_phase{namespace="default",pod="pod0",uid="abc-0",phase="Failed"} 0