From d1089d151aca32b5ed32b5c598e34afd95bd4e77 Mon Sep 17 00:00:00 2001 From: Michael Katsoulis Date: Wed, 8 May 2024 13:00:38 +0300 Subject: [PATCH] Add kubernetes.pod.status_reason and kubernetes.pod.status.ready_time fields in Kubernetes state_pod metricset (#39316) * Add kubernetes.pod.status_reason and kubernetes.pod.status.ready_time fields * Update tests and docs * Declare timestamp field as double * Add evicted pod ksm * Changelog entry * Update field description --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 20 +++ .../_meta/test/KSM/ksm.v2.12.0.plain | 2 +- metricbeat/module/kubernetes/fields.go | 2 +- .../kubernetes/state_pod/_meta/data.json | 10 +- .../kubernetes/state_pod/_meta/fields.yml | 8 ++ .../_meta/test/ksm.v2.10.0.plain.expected | 76 ++++++----- .../_meta/test/ksm.v2.11.0.plain.expected | 123 ++++++++++-------- .../_meta/test/ksm.v2.12.0.plain.expected | 107 ++++++++------- .../_meta/testdata/docs.plain-expected.json | 118 +++++++++-------- .../testdata/ksm.v2.10.0.plain-expected.json | 82 +++++++----- .../testdata/ksm.v2.11.0.plain-expected.json | 107 ++++++++------- .../testdata/ksm.v2.12.0.plain-expected.json | 119 +++++++++-------- .../module/kubernetes/state_pod/state_pod.go | 10 +- 14 files changed, 452 insertions(+), 333 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 92a79460b6a..fdbb36ad275 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -290,6 +290,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Add SSL support to mysql module {pull}37997[37997] - Add SSL support for aerospike module {pull}38126[38126] - Add last_terminated_timestamp metric in kubernetes module {pull}39200[39200] {issue}3802[3802] +- Add pod.status.ready_time and pod.status.reason metrics in kubernetes module {pull}39316[39316] *Metricbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index ca8f1185445..708d996f99d 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -46811,6 +46811,26 @@ type: keyword -- +*`kubernetes.pod.status.reason`*:: ++ +-- +The reason the pod is in its current state (Evicted, NodeAffinity, NodeLost, Shutdown or UnexpectedAdmissionError) + + +type: keyword + +-- + +*`kubernetes.pod.status.ready_time`*:: ++ +-- +Readiness achieved time in unix timestamp for a pod + + +type: double + +-- + [float] === replicaset diff --git a/metricbeat/module/kubernetes/_meta/test/KSM/ksm.v2.12.0.plain b/metricbeat/module/kubernetes/_meta/test/KSM/ksm.v2.12.0.plain index 35cf6a5ab8c..35b3f0e3aa0 100644 --- a/metricbeat/module/kubernetes/_meta/test/KSM/ksm.v2.12.0.plain +++ b/metricbeat/module/kubernetes/_meta/test/KSM/ksm.v2.12.0.plain @@ -1057,7 +1057,7 @@ kube_pod_status_container_ready_time{namespace="kube-system",pod="kube-scheduler kube_pod_status_container_ready_time{namespace="kube-system",pod="coredns-76f75df574-v8skx",uid="b02dd54a-7c6b-4a45-8f42-cbc00c6fb040"} 1.713862204e+09 # HELP kube_pod_status_reason The pod status reasons # TYPE kube_pod_status_reason gauge -kube_pod_status_reason{namespace="default",pod="web-0",uid="37dd3592-b439-4090-a233-49b8faa2b9b3",reason="Evicted"} 0 +kube_pod_status_reason{namespace="default",pod="web-0",uid="37dd3592-b439-4090-a233-49b8faa2b9b3",reason="Evicted"} 1 kube_pod_status_reason{namespace="default",pod="web-0",uid="37dd3592-b439-4090-a233-49b8faa2b9b3",reason="NodeAffinity"} 0 kube_pod_status_reason{namespace="default",pod="web-0",uid="37dd3592-b439-4090-a233-49b8faa2b9b3",reason="NodeLost"} 0 kube_pod_status_reason{namespace="default",pod="web-0",uid="37dd3592-b439-4090-a233-49b8faa2b9b3",reason="Shutdown"} 0 diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go index 1c89d8a6235..36d93f81a8e 100644 --- a/metricbeat/module/kubernetes/fields.go +++ b/metricbeat/module/kubernetes/fields.go @@ -32,5 +32,5 @@ func init() { // AssetKubernetes returns asset data. // This is the base64 encoded zlib format compressed contents of module/kubernetes. func AssetKubernetes() string { - return "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" + return "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" } diff --git a/metricbeat/module/kubernetes/state_pod/_meta/data.json b/metricbeat/module/kubernetes/state_pod/_meta/data.json index 41ba094c58e..3d0dc66558b 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/data.json +++ b/metricbeat/module/kubernetes/state_pod/_meta/data.json @@ -6,17 +6,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "etcd-kind-control-plane", + "ip": "10.244.0.173", + "name": "hello-28564555-zdfjz", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } diff --git a/metricbeat/module/kubernetes/state_pod/_meta/fields.yml b/metricbeat/module/kubernetes/state_pod/_meta/fields.yml index 157ec4ec411..988851b7a6f 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/fields.yml +++ b/metricbeat/module/kubernetes/state_pod/_meta/fields.yml @@ -25,3 +25,11 @@ type: keyword description: > Kubernetes pod scheduled status (true, false, unknown) + - name: reason + type: keyword + description: > + The reason the pod is in its current state (Evicted, NodeAffinity, NodeLost, Shutdown or UnexpectedAdmissionError) + - name: ready_time + type: double + description: > + Readiness achieved time in unix timestamp for a pod diff --git a/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.10.0.plain.expected b/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.10.0.plain.expected index 1a6a2705b72..77419e6472e 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.10.0.plain.expected +++ b/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.10.0.plain.expected @@ -2,18 +2,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "local-path-storage", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-6bc4bddd6b-6vl7d", + "ip": "10.244.0.5", + "name": "kube-state-metrics-7857446fb4-x78j6", "status": { "phase": "running", "ready": "true", + "ready_time": 1698751133, "scheduled": "true" } }, @@ -39,10 +40,11 @@ "MetricSetFields": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "kube-proxy-2nq9k", + "name": "kube-scheduler-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675684, "scheduled": "true" } }, @@ -60,18 +62,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.8", - "name": "hello-mwrpw", + "ip": "172.18.0.2", + "name": "kube-controller-manager-kind-control-plane", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1698675686, "scheduled": "true" } }, @@ -96,11 +99,12 @@ }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.7", - "name": "fluentd-elasticsearch-m2tlp", + "ip": "10.244.0.3", + "name": "coredns-5d78c9869d-crtn9", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675701, "scheduled": "true" } }, @@ -125,8 +129,8 @@ }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.9", - "name": "hello-28312520-d5d5s", + "ip": "10.244.0.8", + "name": "hello-mwrpw", "status": { "phase": "succeeded", "ready": "false", @@ -154,11 +158,12 @@ }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.3", - "name": "coredns-5d78c9869d-crtn9", + "ip": "10.244.0.4", + "name": "coredns-5d78c9869d-gskzq", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675701, "scheduled": "true" } }, @@ -176,18 +181,18 @@ { "RootFields": null, "ModuleFields": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.4", - "name": "coredns-5d78c9869d-gskzq", + "ip": "10.244.0.9", + "name": "hello-28312520-d5d5s", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } }, @@ -213,10 +218,11 @@ "MetricSetFields": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "kube-scheduler-kind-control-plane", + "name": "kindnet-xg6gs", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675698, "scheduled": "true" } }, @@ -241,11 +247,12 @@ }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.5", - "name": "kube-state-metrics-7857446fb4-x78j6", + "ip": "10.244.0.7", + "name": "fluentd-elasticsearch-m2tlp", "status": { "phase": "running", "ready": "true", + "ready_time": 1698751174, "scheduled": "true" } }, @@ -271,10 +278,11 @@ "MetricSetFields": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "kube-controller-manager-kind-control-plane", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675692, "scheduled": "true" } }, @@ -300,10 +308,11 @@ "MetricSetFields": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "kindnet-xg6gs", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675692, "scheduled": "true" } }, @@ -321,18 +330,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "172.18.0.2", - "name": "kube-apiserver-kind-control-plane", + "ip": "10.244.0.6", + "name": "web-0", "status": { "phase": "running", "ready": "true", + "ready_time": 1698751165, "scheduled": "true" } }, @@ -350,18 +360,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "default", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.18.0.2", - "ip": "10.244.0.6", - "name": "web-0", + "ip": "10.244.0.2", + "name": "local-path-provisioner-6bc4bddd6b-6vl7d", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675701, "scheduled": "true" } }, @@ -387,10 +398,11 @@ "MetricSetFields": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "etcd-kind-control-plane", + "name": "kube-proxy-2nq9k", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675697, "scheduled": "true" } }, diff --git a/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.11.0.plain.expected b/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.11.0.plain.expected index 9dd8d1e7d41..13457ad1b49 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.11.0.plain.expected +++ b/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.11.0.plain.expected @@ -9,40 +9,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-controller-manager-kind-control-plane", - "status": { - "phase": "running", - "ready": "true", - "scheduled": "true" - } - }, - "Index": "", - "ID": "", - "Namespace": "kubernetes.pod", - "Timestamp": "0001-01-01T00:00:00Z", - "Error": null, - "Host": "", - "Service": "", - "Took": 0, - "Period": 0, - "DisableTimeSeries": false - }, - { - "RootFields": null, - "ModuleFields": { - "namespace": "kube-system", - "node": { - "name": "kind-control-plane" - } - }, - "MetricSetFields": { - "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kindnet-98xlt", + "ip": "10.244.0.4", + "name": "coredns-76f75df574-wfchs", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } }, @@ -89,18 +61,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.8", - "name": "web-0", + "ip": "172.21.0.2", + "name": "kube-proxy-45qj9", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862200, "scheduled": "true" } }, @@ -125,11 +98,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.40", - "name": "kube-state-metrics-cbc966f68-9kq2v", + "ip": "172.21.0.2", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862195, "scheduled": "true" } }, @@ -147,18 +121,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "local-path-storage", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-7577fdbbfb-wmdwd", + "ip": "172.21.0.2", + "name": "kube-scheduler-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862197, "scheduled": "true" } }, @@ -183,11 +158,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.4", - "name": "coredns-76f75df574-wfchs", + "ip": "172.21.0.2", + "name": "kube-controller-manager-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862193, "scheduled": "true" } }, @@ -205,18 +181,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "kube-system", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "etcd-kind-control-plane", + "ip": "10.244.0.2", + "name": "local-path-provisioner-7577fdbbfb-wmdwd", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } }, @@ -241,11 +218,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-apiserver-kind-control-plane", + "ip": "10.244.0.40", + "name": "kube-state-metrics-cbc966f68-9kq2v", "status": { "phase": "running", "ready": "true", + "ready_time": 1713879978, "scheduled": "true" } }, @@ -271,10 +249,11 @@ "MetricSetFields": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kube-proxy-45qj9", + "name": "kindnet-98xlt", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862201, "scheduled": "true" } }, @@ -357,11 +336,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.85", - "name": "mycurlpod", + "ip": "10.244.0.6", + "name": "fluentd-elasticsearch-l8b6x", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862304, "scheduled": "true" } }, @@ -415,11 +395,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.3", - "name": "coredns-76f75df574-v8skx", + "ip": "10.244.0.85", + "name": "mycurlpod", "status": { "phase": "running", "ready": "true", + "ready_time": 1713881941, "scheduled": "true" } }, @@ -444,11 +425,42 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.6", - "name": "fluentd-elasticsearch-l8b6x", + "ip": "172.21.0.2", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862189, + "scheduled": "true" + } + }, + "Index": "", + "ID": "", + "Namespace": "kubernetes.pod", + "Timestamp": "0001-01-01T00:00:00Z", + "Error": null, + "Host": "", + "Service": "", + "Took": 0, + "Period": 0, + "DisableTimeSeries": false + }, + { + "RootFields": null, + "ModuleFields": { + "namespace": "default", + "node": { + "name": "kind-control-plane" + } + }, + "MetricSetFields": { + "host_ip": "172.21.0.2", + "ip": "10.244.0.8", + "name": "web-0", + "status": { + "phase": "running", + "ready": "true", + "ready_time": 1713862311, "scheduled": "true" } }, @@ -473,11 +485,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-scheduler-kind-control-plane", + "ip": "10.244.0.3", + "name": "coredns-76f75df574-v8skx", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } }, diff --git a/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.12.0.plain.expected b/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.12.0.plain.expected index ff6eac9e4f0..dbe4a449707 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.12.0.plain.expected +++ b/metricbeat/module/kubernetes/state_pod/_meta/test/ksm.v2.12.0.plain.expected @@ -9,11 +9,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-controller-manager-kind-control-plane", + "ip": "10.244.0.4", + "name": "coredns-76f75df574-wfchs", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } }, @@ -39,10 +40,11 @@ "MetricSetFields": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kindnet-98xlt", + "name": "kube-proxy-45qj9", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862200, "scheduled": "true" } }, @@ -60,18 +62,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.8", - "name": "web-0", + "ip": "172.21.0.2", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862195, "scheduled": "true" } }, @@ -147,18 +150,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "local-path-storage", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-7577fdbbfb-wmdwd", + "ip": "172.21.0.2", + "name": "kube-scheduler-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862197, "scheduled": "true" } }, @@ -183,11 +187,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.174", - "name": "kube-state-metrics-5bcd4898-bntgt", + "ip": "172.21.0.2", + "name": "kube-controller-manager-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862193, "scheduled": "true" } }, @@ -205,18 +210,18 @@ { "RootFields": null, "ModuleFields": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.4", - "name": "coredns-76f75df574-wfchs", + "ip": "10.244.0.173", + "name": "hello-28564555-zdfjz", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } }, @@ -234,18 +239,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "default", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.173", - "name": "hello-28564555-zdfjz", + "ip": "10.244.0.2", + "name": "local-path-provisioner-7577fdbbfb-wmdwd", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } }, @@ -270,11 +276,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "etcd-kind-control-plane", + "ip": "10.244.0.174", + "name": "kube-state-metrics-5bcd4898-bntgt", "status": { "phase": "running", "ready": "true", + "ready_time": 1713873343, "scheduled": "true" } }, @@ -300,10 +307,11 @@ "MetricSetFields": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kube-apiserver-kind-control-plane", + "name": "kindnet-98xlt", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862201, "scheduled": "true" } }, @@ -321,18 +329,18 @@ { "RootFields": null, "ModuleFields": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-proxy-45qj9", + "ip": "10.244.0.7", + "name": "hello-wlb5q", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } }, @@ -350,18 +358,19 @@ { "RootFields": null, "ModuleFields": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.7", - "name": "hello-wlb5q", + "ip": "10.244.0.6", + "name": "fluentd-elasticsearch-l8b6x", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862304, "scheduled": "true" } }, @@ -379,18 +388,18 @@ { "RootFields": null, "ModuleFields": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" } }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.3", - "name": "coredns-76f75df574-v8skx", + "ip": "10.244.0.176", + "name": "hello-28564556-gkqsk", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } }, @@ -415,11 +424,13 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.176", - "name": "hello-28564556-gkqsk", + "ip": "10.244.0.8", + "name": "web-0", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862311, + "reason": "evicted", "scheduled": "true" } }, @@ -444,11 +455,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "10.244.0.6", - "name": "fluentd-elasticsearch-l8b6x", + "ip": "172.21.0.2", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862189, "scheduled": "true" } }, @@ -473,11 +485,12 @@ }, "MetricSetFields": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-scheduler-kind-control-plane", + "ip": "10.244.0.3", + "name": "coredns-76f75df574-v8skx", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } }, diff --git a/metricbeat/module/kubernetes/state_pod/_meta/testdata/docs.plain-expected.json b/metricbeat/module/kubernetes/state_pod/_meta/testdata/docs.plain-expected.json index 2f6d43d7933..92a365f6f2c 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/testdata/docs.plain-expected.json +++ b/metricbeat/module/kubernetes/state_pod/_meta/testdata/docs.plain-expected.json @@ -6,17 +6,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "etcd-kind-control-plane", + "ip": "10.244.0.173", + "name": "hello-28564555-zdfjz", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -37,17 +37,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.173", - "name": "hello-28564555-zdfjz", + "ip": "10.244.0.174", + "name": "kube-state-metrics-5bcd4898-bntgt", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713873343, "scheduled": "true" } } @@ -74,11 +75,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.4", - "name": "coredns-76f75df574-wfchs", + "ip": "172.21.0.2", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862195, "scheduled": "true" } } @@ -106,10 +108,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kindnet-98xlt", + "name": "kube-controller-manager-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862193, "scheduled": "true" } } @@ -130,17 +133,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-proxy-45qj9", + "ip": "10.244.0.2", + "name": "local-path-provisioner-7577fdbbfb-wmdwd", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -161,17 +165,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.172", - "name": "hello-28564554-llbsx", + "ip": "10.244.0.3", + "name": "coredns-76f75df574-v8skx", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -192,17 +197,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.3", - "name": "coredns-76f75df574-v8skx", + "ip": "10.244.0.172", + "name": "hello-28564554-llbsx", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -260,11 +265,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.6", - "name": "fluentd-elasticsearch-l8b6x", + "ip": "172.21.0.2", + "name": "kube-scheduler-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862197, "scheduled": "true" } } @@ -291,11 +297,11 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-scheduler-kind-control-plane", + "ip": "10.244.0.177", + "name": "mycurlpod", "status": { "phase": "running", - "ready": "true", + "ready": "false", "scheduled": "true" } } @@ -322,11 +328,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.177", - "name": "mycurlpod", + "ip": "10.244.0.6", + "name": "fluentd-elasticsearch-l8b6x", "status": { "phase": "running", - "ready": "false", + "ready": "true", + "ready_time": 1713862304, "scheduled": "true" } } @@ -347,17 +354,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.8", - "name": "web-0", + "ip": "10.244.0.4", + "name": "coredns-76f75df574-wfchs", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -385,10 +393,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kube-controller-manager-kind-control-plane", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862189, "scheduled": "true" } } @@ -409,17 +418,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.176", - "name": "hello-28564556-gkqsk", + "ip": "172.21.0.2", + "name": "kindnet-98xlt", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862201, "scheduled": "true" } } @@ -440,17 +450,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "local-path-storage", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-7577fdbbfb-wmdwd", + "ip": "10.244.0.8", + "name": "web-0", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862311, "scheduled": "true" } } @@ -471,17 +482,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-apiserver-kind-control-plane", + "ip": "10.244.0.176", + "name": "hello-28564556-gkqsk", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -508,11 +519,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.174", - "name": "kube-state-metrics-5bcd4898-bntgt", + "ip": "172.21.0.2", + "name": "kube-proxy-45qj9", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862200, "scheduled": "true" } } diff --git a/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.10.0.plain-expected.json b/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.10.0.plain-expected.json index 74de4188355..dbd86f44e72 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.10.0.plain-expected.json +++ b/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.10.0.plain-expected.json @@ -6,17 +6,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "10.244.0.6", - "name": "web-0", + "ip": "10.244.0.2", + "name": "local-path-provisioner-6bc4bddd6b-6vl7d", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675701, "scheduled": "true" } } @@ -48,6 +49,7 @@ "status": { "phase": "running", "ready": "true", + "ready_time": 1698675701, "scheduled": "true" } } @@ -68,17 +70,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "10.244.0.9", - "name": "hello-28312520-d5d5s", + "ip": "10.244.0.7", + "name": "fluentd-elasticsearch-m2tlp", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1698751174, "scheduled": "true" } } @@ -99,17 +102,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "172.18.0.2", - "name": "kube-apiserver-kind-control-plane", + "ip": "10.244.0.9", + "name": "hello-28312520-d5d5s", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -130,17 +133,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "10.244.0.8", - "name": "hello-mwrpw", + "ip": "172.18.0.2", + "name": "kube-scheduler-kind-control-plane", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1698675684, "scheduled": "true" } } @@ -161,17 +165,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "172.18.0.2", - "name": "kube-controller-manager-kind-control-plane", + "ip": "10.244.0.8", + "name": "hello-mwrpw", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -199,10 +203,11 @@ "pod": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "etcd-kind-control-plane", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675692, "scheduled": "true" } } @@ -223,17 +228,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "local-path-storage", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-6bc4bddd6b-6vl7d", + "ip": "172.18.0.2", + "name": "kindnet-xg6gs", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675698, "scheduled": "true" } } @@ -265,6 +271,7 @@ "status": { "phase": "running", "ready": "true", + "ready_time": 1698751133, "scheduled": "true" } } @@ -292,10 +299,11 @@ "pod": { "host_ip": "172.18.0.2", "ip": "172.18.0.2", - "name": "kube-scheduler-kind-control-plane", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675692, "scheduled": "true" } } @@ -322,11 +330,12 @@ }, "pod": { "host_ip": "172.18.0.2", - "ip": "172.18.0.2", - "name": "kindnet-xg6gs", + "ip": "10.244.0.4", + "name": "coredns-5d78c9869d-gskzq", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675701, "scheduled": "true" } } @@ -358,6 +367,7 @@ "status": { "phase": "running", "ready": "true", + "ready_time": 1698675697, "scheduled": "true" } } @@ -378,17 +388,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.18.0.2", - "ip": "10.244.0.7", - "name": "fluentd-elasticsearch-m2tlp", + "ip": "10.244.0.6", + "name": "web-0", "status": { "phase": "running", "ready": "true", + "ready_time": 1698751165, "scheduled": "true" } } @@ -415,11 +426,12 @@ }, "pod": { "host_ip": "172.18.0.2", - "ip": "10.244.0.4", - "name": "coredns-5d78c9869d-gskzq", + "ip": "172.18.0.2", + "name": "kube-controller-manager-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1698675686, "scheduled": "true" } } diff --git a/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.11.0.plain-expected.json b/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.11.0.plain-expected.json index cab0d7b67c3..c43a3d60599 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.11.0.plain-expected.json +++ b/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.11.0.plain-expected.json @@ -44,10 +44,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "etcd-kind-control-plane", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862195, "scheduled": "true" } } @@ -74,11 +75,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.4", - "name": "coredns-76f75df574-wfchs", + "ip": "172.21.0.2", + "name": "kube-controller-manager-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862193, "scheduled": "true" } } @@ -99,17 +101,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.85", - "name": "mycurlpod", + "ip": "10.244.0.2", + "name": "local-path-provisioner-7577fdbbfb-wmdwd", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -130,17 +133,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kindnet-98xlt", + "ip": "10.244.0.81", + "name": "hello-28564697-8dmzw", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -161,17 +164,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.81", - "name": "hello-28564697-8dmzw", + "ip": "10.244.0.3", + "name": "coredns-76f75df574-v8skx", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -192,17 +196,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-proxy-45qj9", + "ip": "10.244.0.7", + "name": "hello-wlb5q", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -229,11 +233,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.40", - "name": "kube-state-metrics-cbc966f68-9kq2v", + "ip": "172.21.0.2", + "name": "kube-scheduler-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862197, "scheduled": "true" } } @@ -254,17 +259,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.3", - "name": "coredns-76f75df574-v8skx", + "ip": "10.244.0.84", + "name": "hello-28564698-tv8jb", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -285,17 +290,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.7", - "name": "hello-wlb5q", + "ip": "10.244.0.6", + "name": "fluentd-elasticsearch-l8b6x", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862304, "scheduled": "true" } } @@ -322,11 +328,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.6", - "name": "fluentd-elasticsearch-l8b6x", + "ip": "10.244.0.4", + "name": "coredns-76f75df574-wfchs", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -354,10 +361,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kube-scheduler-kind-control-plane", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862189, "scheduled": "true" } } @@ -378,17 +386,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.84", - "name": "hello-28564698-tv8jb", + "ip": "172.21.0.2", + "name": "kindnet-98xlt", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862201, "scheduled": "true" } } @@ -420,6 +429,7 @@ "status": { "phase": "running", "ready": "true", + "ready_time": 1713862311, "scheduled": "true" } } @@ -446,11 +456,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-controller-manager-kind-control-plane", + "ip": "10.244.0.85", + "name": "mycurlpod", "status": { "phase": "running", "ready": "true", + "ready_time": 1713881941, "scheduled": "true" } } @@ -471,17 +482,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "local-path-storage", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-7577fdbbfb-wmdwd", + "ip": "10.244.0.40", + "name": "kube-state-metrics-cbc966f68-9kq2v", "status": { "phase": "running", "ready": "true", + "ready_time": 1713879978, "scheduled": "true" } } @@ -509,10 +521,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kube-apiserver-kind-control-plane", + "name": "kube-proxy-45qj9", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862200, "scheduled": "true" } } diff --git a/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.12.0.plain-expected.json b/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.12.0.plain-expected.json index 2f6d43d7933..884759e3d5f 100644 --- a/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.12.0.plain-expected.json +++ b/metricbeat/module/kubernetes/state_pod/_meta/testdata/ksm.v2.12.0.plain-expected.json @@ -6,17 +6,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "etcd-kind-control-plane", + "ip": "10.244.0.173", + "name": "hello-28564555-zdfjz", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -37,17 +37,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.173", - "name": "hello-28564555-zdfjz", + "ip": "10.244.0.174", + "name": "kube-state-metrics-5bcd4898-bntgt", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713873343, "scheduled": "true" } } @@ -74,11 +75,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.4", - "name": "coredns-76f75df574-wfchs", + "ip": "172.21.0.2", + "name": "kube-apiserver-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862195, "scheduled": "true" } } @@ -106,10 +108,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kindnet-98xlt", + "name": "kube-controller-manager-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862193, "scheduled": "true" } } @@ -130,17 +133,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "local-path-storage", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-proxy-45qj9", + "ip": "10.244.0.2", + "name": "local-path-provisioner-7577fdbbfb-wmdwd", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -161,17 +165,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.172", - "name": "hello-28564554-llbsx", + "ip": "10.244.0.3", + "name": "coredns-76f75df574-v8skx", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -192,17 +197,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.3", - "name": "coredns-76f75df574-v8skx", + "ip": "10.244.0.172", + "name": "hello-28564554-llbsx", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -260,11 +265,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.6", - "name": "fluentd-elasticsearch-l8b6x", + "ip": "172.21.0.2", + "name": "kube-scheduler-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862197, "scheduled": "true" } } @@ -291,11 +297,11 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-scheduler-kind-control-plane", + "ip": "10.244.0.177", + "name": "mycurlpod", "status": { "phase": "running", - "ready": "true", + "ready": "false", "scheduled": "true" } } @@ -322,11 +328,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.177", - "name": "mycurlpod", + "ip": "10.244.0.6", + "name": "fluentd-elasticsearch-l8b6x", "status": { "phase": "running", - "ready": "false", + "ready": "true", + "ready_time": 1713862304, "scheduled": "true" } } @@ -347,17 +354,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.8", - "name": "web-0", + "ip": "10.244.0.4", + "name": "coredns-76f75df574-wfchs", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862204, "scheduled": "true" } } @@ -385,10 +393,11 @@ "pod": { "host_ip": "172.21.0.2", "ip": "172.21.0.2", - "name": "kube-controller-manager-kind-control-plane", + "name": "etcd-kind-control-plane", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862189, "scheduled": "true" } } @@ -409,17 +418,18 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "default", + "namespace": "kube-system", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.176", - "name": "hello-28564556-gkqsk", + "ip": "172.21.0.2", + "name": "kindnet-98xlt", "status": { - "phase": "succeeded", - "ready": "false", + "phase": "running", + "ready": "true", + "ready_time": 1713862201, "scheduled": "true" } } @@ -440,17 +450,17 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "local-path-storage", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.2", - "name": "local-path-provisioner-7577fdbbfb-wmdwd", + "ip": "10.244.0.176", + "name": "hello-28564556-gkqsk", "status": { - "phase": "running", - "ready": "true", + "phase": "succeeded", + "ready": "false", "scheduled": "true" } } @@ -471,17 +481,19 @@ "module": "kubernetes" }, "kubernetes": { - "namespace": "kube-system", + "namespace": "default", "node": { "name": "kind-control-plane" }, "pod": { "host_ip": "172.21.0.2", - "ip": "172.21.0.2", - "name": "kube-apiserver-kind-control-plane", + "ip": "10.244.0.8", + "name": "web-0", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862311, + "reason": "evicted", "scheduled": "true" } } @@ -508,11 +520,12 @@ }, "pod": { "host_ip": "172.21.0.2", - "ip": "10.244.0.174", - "name": "kube-state-metrics-5bcd4898-bntgt", + "ip": "172.21.0.2", + "name": "kube-proxy-45qj9", "status": { "phase": "running", "ready": "true", + "ready_time": 1713862200, "scheduled": "true" } } diff --git a/metricbeat/module/kubernetes/state_pod/state_pod.go b/metricbeat/module/kubernetes/state_pod/state_pod.go index 4ec1f253893..7f6fb13eeca 100644 --- a/metricbeat/module/kubernetes/state_pod/state_pod.go +++ b/metricbeat/module/kubernetes/state_pod/state_pod.go @@ -27,10 +27,12 @@ import ( // mapping stores the state metrics we want to fetch and will be used by this metricset var mapping = &p.MetricsMapping{ Metrics: map[string]p.MetricMap{ - "kube_pod_info": p.InfoMetric(), - "kube_pod_status_phase": p.LabelMetric("status.phase", "phase", p.OpLowercaseValue()), - "kube_pod_status_ready": p.LabelMetric("status.ready", "condition", p.OpLowercaseValue()), - "kube_pod_status_scheduled": p.LabelMetric("status.scheduled", "condition", p.OpLowercaseValue()), + "kube_pod_info": p.InfoMetric(), + "kube_pod_status_phase": p.LabelMetric("status.phase", "phase", p.OpLowercaseValue()), + "kube_pod_status_ready": p.LabelMetric("status.ready", "condition", p.OpLowercaseValue()), + "kube_pod_status_scheduled": p.LabelMetric("status.scheduled", "condition", p.OpLowercaseValue()), + "kube_pod_status_reason": p.LabelMetric("status.reason", "reason", p.OpLowercaseValue()), + "kube_pod_status_ready_time": p.Metric("status.ready_time"), }, Labels: map[string]p.LabelMap{