Added K8s Container Waiting Reason (#90)

middleware-labs · Dec 5, 2024 · 17b71e9 · 17b71e9
1 parent 40ffc02
commit 17b71e9
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 3 deletions.
diff --git a/receiver/k8sclusterreceiver/documentation.md b/receiver/k8sclusterreceiver/documentation.md
@@ -524,6 +524,7 @@ Current status reason of the pod (1 - Evicted, 2 - NodeAffinity, 3 - NodeLost, 4
 | k8s.clusterrolebinding.type | The type of the Cluster Role Binding. | Any Str | true |
 | k8s.clusterrolebinding.uid | The UID of the Cluster Role Binding. | Any Str | true |
 | k8s.container.name | The k8s container name | Any Str | true |
+| k8s.container.status.current_waiting_reason | Current waiting reason of the Container. | Any Str | true |
 | k8s.container.status.last_terminated_reason | Last terminated reason of a container. | Any Str | true |
 | k8s.cronjob.name | The k8s CronJob name | Any Str | true |
 | k8s.cronjob.start_time | The start time of the Cronjob. | Any Str | true |

diff --git a/receiver/k8sclusterreceiver/generated_package_test.go b/receiver/k8sclusterreceiver/generated_package_test.go
diff --git a/receiver/k8sclusterreceiver/internal/container/containers.go b/receiver/k8sclusterreceiver/internal/container/containers.go
@@ -73,6 +73,9 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev
 			if cs.LastTerminationState.Terminated != nil {
 				rb.SetK8sContainerStatusLastTerminatedReason(cs.LastTerminationState.Terminated.Reason)
 			}
+			if cs.State.Waiting != nil {
+				rb.SetK8sContainerStatusCurrentWaitingReason(cs.State.Waiting.Reason)
+			}
 			break
 		}
 	}

diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_config_test.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics.go b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_metrics_test.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go b/receiver/k8sclusterreceiver/internal/metadata/generated_resource.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go b/receiver/k8sclusterreceiver/internal/metadata/generated_resource_test.go
diff --git a/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml b/receiver/k8sclusterreceiver/internal/metadata/testdata/config.yaml
@@ -154,6 +154,8 @@ all_set:
       enabled: true
     k8s.container.name:
       enabled: true
+    k8s.container.status.current_waiting_reason:
+      enabled: true
     k8s.container.status.last_terminated_reason:
       enabled: true
     k8s.cronjob.name:
@@ -525,6 +527,8 @@ none_set:
       enabled: false
     k8s.container.name:
       enabled: false
+    k8s.container.status.current_waiting_reason:
+      enabled: false
     k8s.container.status.last_terminated_reason:
       enabled: false
     k8s.cronjob.name:
@@ -831,6 +835,10 @@ filter_set_include:
       enabled: true
       metrics_include:
         - regexp: ".*"
+    k8s.container.status.current_waiting_reason:
+      enabled: true
+      metrics_include:
+        - regexp: ".*"
     k8s.container.status.last_terminated_reason:
       enabled: true
       metrics_include:
@@ -1353,6 +1361,10 @@ filter_set_exclude:
       enabled: true
       metrics_exclude:
         - strict: "k8s.container.name-val"
+    k8s.container.status.current_waiting_reason:
+      enabled: true
+      metrics_exclude:
+        - strict: "k8s.container.status.current_waiting_reason-val"
     k8s.container.status.last_terminated_reason:
       enabled: true
       metrics_exclude:

diff --git a/receiver/k8sclusterreceiver/metadata.yaml b/receiver/k8sclusterreceiver/metadata.yaml
@@ -623,6 +623,11 @@ resource_attributes:
     type: string
     enabled: true
 
+  k8s.container.status.current_waiting_reason:
+    description: Current waiting reason of the Container.
+    type: string
+    enabled: true
+
   k8s.daemonset.start_time:
     description: "The start time of the Daemonset."
     enabled: true