Introducing Deployment condition status metric in Kubernetes module (#…

…35999) * adding deployment condition status * Update CHANGELOG.next.asciidoc * fixing unittests --------- Co-authored-by: Chris Mark <chrismarkou92@gmail.com>
elastic · Jul 6, 2023 · c903cb0 · c903cb0
1 parent ba20101
commit c903cb0
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 8 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -372,6 +372,8 @@ automatic splitting at root level, if root level element is an array. {pull}3415
 - Add new parameter `include_linked_accounts` to enable/disable metrics collection from multiple linked AWS Accounts {pull}35648[35648]
 - Migrate Azure Billing, Monitor, and Storage metricsets to the newer SDK. {pull}33585[33585]
 - Add support for float64 values parsing for statsd metrics of counter type. {pull}35099[35099]
+- Add kubernetes.deployment.status.* fields for Kubernetes module {pull}35999[35999]
+
 
 *Osquerybeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -45789,6 +45789,26 @@ type: boolean
 
 --
 
+
+*`kubernetes.deployment.status.available`*::
++
+--
+Deployment Available Condition status (true, false or unknown)
+
+
+type: keyword
+
+--
+
+*`kubernetes.deployment.status.progressing`*::
++
+--
+Deployment Progresing Condition status (true, false or unknown)
+
+type: keyword
+
+--
+
 [float]
 === replicas
 

diff --git a/metricbeat/module/kubernetes/fields.go b/metricbeat/module/kubernetes/fields.go
diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/data.json b/metricbeat/module/kubernetes/state_deployment/_meta/data.json
@@ -14,6 +14,10 @@
                 "desired": 1,
                 "unavailable": 0,
                 "updated": 1
+            },
+            "status": {
+                "available": "true",
+                "progressing": "true"
             }
         },
         "namespace": "kube-system"

diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/fields.yml b/metricbeat/module/kubernetes/state_deployment/_meta/fields.yml
@@ -8,6 +8,16 @@
       type: boolean
       description: >
         Kubernetes deployment paused status
+    - name: status
+      type: group
+      fields:
+        - name: available
+          type: keyword
+          description: |
+            Deployment Available Condition status (true, false or unknown)
+        - name: progressing
+          type: keyword
+          description: Deployment Progresing Condition status (true, false or unknown)
     - name: replicas
       type: group
       description: >

diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.4.2.plain.expected b/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.4.2.plain.expected
@@ -7,6 +7,10 @@
 		"MetricSetFields": {
 			"name": "kube-state-metrics",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -33,6 +37,10 @@
 		"MetricSetFields": {
 			"name": "local-path-provisioner",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -59,6 +67,10 @@
 		"MetricSetFields": {
 			"name": "coredns",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 2,
 				"desired": 2,
@@ -77,4 +89,4 @@
 		"Period": 0,
 		"DisableTimeSeries": false
 	}
-]
+]
diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.5.0.plain.expected b/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.5.0.plain.expected
@@ -7,6 +7,10 @@
 		"MetricSetFields": {
 			"name": "kube-state-metrics",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -33,6 +37,10 @@
 		"MetricSetFields": {
 			"name": "local-path-provisioner",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -59,6 +67,10 @@
 		"MetricSetFields": {
 			"name": "coredns",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 2,
 				"desired": 2,
@@ -77,4 +89,4 @@
 		"Period": 0,
 		"DisableTimeSeries": false
 	}
-]
+]
diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.6.0.plain.expected b/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.6.0.plain.expected
@@ -7,6 +7,10 @@
 		"MetricSetFields": {
 			"name": "kube-state-metrics",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -33,6 +37,10 @@
 		"MetricSetFields": {
 			"name": "local-path-provisioner",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -59,6 +67,10 @@
 		"MetricSetFields": {
 			"name": "coredns",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 2,
 				"desired": 2,
@@ -77,4 +89,4 @@
 		"Period": 0,
 		"DisableTimeSeries": false
 	}
-]
+]
diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.7.0.plain.expected b/metricbeat/module/kubernetes/state_deployment/_meta/test/ksm.v2.7.0.plain.expected
@@ -7,6 +7,10 @@
 		"MetricSetFields": {
 			"name": "kube-state-metrics",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -33,6 +37,10 @@
 		"MetricSetFields": {
 			"name": "local-path-provisioner",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 1,
 				"desired": 1,
@@ -59,6 +67,10 @@
 		"MetricSetFields": {
 			"name": "coredns",
 			"paused": false,
+			"status": {
+				"available": "true",
+				"progressing": "true"
+			},
 			"replicas": {
 				"available": 2,
 				"desired": 2,
@@ -77,4 +89,4 @@
 		"Period": 0,
 		"DisableTimeSeries": false
 	}
-]
+]
diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/docs.plain-expected.json b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/docs.plain-expected.json
@@ -9,6 +9,10 @@
             "deployment": {
                 "name": "kube-state-metrics",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -37,6 +41,10 @@
             "deployment": {
                 "name": "local-path-provisioner",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -65,6 +73,10 @@
             "deployment": {
                 "name": "coredns",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 2,
                     "desired": 2,

diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.4.2.plain-expected.json b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.4.2.plain-expected.json
@@ -9,6 +9,10 @@
             "deployment": {
                 "name": "kube-state-metrics",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -37,6 +41,10 @@
             "deployment": {
                 "name": "local-path-provisioner",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -65,6 +73,10 @@
             "deployment": {
                 "name": "coredns",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 2,
                     "desired": 2,

diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.5.0.plain-expected.json b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.5.0.plain-expected.json
@@ -9,6 +9,10 @@
             "deployment": {
                 "name": "kube-state-metrics",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -37,6 +41,10 @@
             "deployment": {
                 "name": "local-path-provisioner",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -65,6 +73,10 @@
             "deployment": {
                 "name": "coredns",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 2,
                     "desired": 2,

diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.6.0.plain-expected.json b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.6.0.plain-expected.json
@@ -9,6 +9,10 @@
             "deployment": {
                 "name": "kube-state-metrics",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -37,6 +41,10 @@
             "deployment": {
                 "name": "local-path-provisioner",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -65,6 +73,10 @@
             "deployment": {
                 "name": "coredns",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 2,
                     "desired": 2,

diff --git a/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.7.0.plain-expected.json b/metricbeat/module/kubernetes/state_deployment/_meta/testdata/ksm.v2.7.0.plain-expected.json
@@ -9,6 +9,10 @@
             "deployment": {
                 "name": "kube-state-metrics",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -37,6 +41,10 @@
             "deployment": {
                 "name": "local-path-provisioner",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 1,
                     "desired": 1,
@@ -65,6 +73,10 @@
             "deployment": {
                 "name": "coredns",
                 "paused": false,
+                "status": {
+                    "available": "true",
+                    "progressing": "true"
+                },
                 "replicas": {
                     "available": 2,
                     "desired": 2,