From 58fc3e0f1b19d77e384f0e392e4a6d5a1aeac95b Mon Sep 17 00:00:00 2001
From: Ethan Wood-Thomas <ethan.woodthomas@datadoghq.com>
Date: Mon, 5 Aug 2024 10:46:53 -0400
Subject: [PATCH] Updated all container waiting statuses to use most recent
 metric with a reason tag (#18176)

---
 datadog_operator/assets/dashboards/operator_overview.json | 2 +-
 kubernetes/assets/dashboards/kubernetes_clusters.json     | 8 ++++----
 kubernetes/assets/dashboards/kubernetes_dashboard.json    | 4 ++--
 kubernetes/assets/dashboards/kubernetes_pods.json         | 4 ++--
 .../assets/dashboards/vmware_vsphere_tkg_-_overview.json  | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/datadog_operator/assets/dashboards/operator_overview.json b/datadog_operator/assets/dashboards/operator_overview.json
index 90a66515f8865..7a6f39a206c21 100644
--- a/datadog_operator/assets/dashboards/operator_overview.json
+++ b/datadog_operator/assets/dashboards/operator_overview.json
@@ -708,7 +708,7 @@
                                     "response_format": "scalar",
                                     "queries": [
                                         {
-                                            "query": "sum:kubernetes.containers.state.waiting{$scope,$cluster,kube_app_name:datadog-operator,reason:crashloopbackoff} by {kube_cluster_name,image_tag}",
+                                            "query": "sum:kubernetes_state.container.status_report.count.waiting{$scope,$cluster,kube_app_name:datadog-operator,reason:crashloopbackoff} by {kube_cluster_name,image_tag}",
                                             "data_source": "metrics",
                                             "name": "query1",
                                             "aggregator": "last"
diff --git a/kubernetes/assets/dashboards/kubernetes_clusters.json b/kubernetes/assets/dashboards/kubernetes_clusters.json
index a6c85b77bcd6c..a1d301d209060 100644
--- a/kubernetes/assets/dashboards/kubernetes_clusters.json
+++ b/kubernetes/assets/dashboards/kubernetes_clusters.json
@@ -3173,7 +3173,7 @@
                             "requests": [
                                 {
                                     "display_type": "bars",
-                                    "q": "sum:kubernetes_state.container.waiting{$cluster,reason:crashloopbackoff,*,$scope} by {pod_name}",
+                                    "q": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,reason:crashloopbackoff,*,$scope} by {pod_name}",
                                     "style": {
                                         "line_type": "solid",
                                         "line_width": "normal",
@@ -3551,10 +3551,10 @@
                                         },
                                         {
                                             "alias_name": "waiting",
-                                            "expression": "sum:kubernetes_state.container.waiting{$cluster,$scope}"
+                                            "expression": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$scope}"
                                         }
                                     ],
-                                    "q": "sum:kubernetes_state.container.ready{$cluster,$scope}, sum:kubernetes_state.container.running{$cluster,$scope}, sum:kubernetes_state.container.terminated{$cluster,$scope}, sum:kubernetes_state.container.waiting{$cluster,$scope}",
+                                    "q": "sum:kubernetes_state.container.ready{$cluster,$scope}, sum:kubernetes_state.container.running{$cluster,$scope}, sum:kubernetes_state.container.terminated{$cluster,$scope}, sum:kubernetes_state.container.status_report.count.waiting{$cluster,$scope}",
                                     "style": {
                                         "line_type": "solid",
                                         "line_width": "normal",
@@ -3650,7 +3650,7 @@
                                         {
                                             "data_source": "metrics",
                                             "name": "query1",
-                                            "query": "sum:kubernetes.containers.state.waiting{$cluster,reason:crashloopbackoff,$scope} by {pod_name}"
+                                            "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,reason:crashloopbackoff,$scope} by {pod_name}"
                                         }
                                     ],
                                     "response_format": "timeseries",
diff --git a/kubernetes/assets/dashboards/kubernetes_dashboard.json b/kubernetes/assets/dashboards/kubernetes_dashboard.json
index 6322a75360671..cfdfaa972f6bd 100644
--- a/kubernetes/assets/dashboards/kubernetes_dashboard.json
+++ b/kubernetes/assets/dashboards/kubernetes_dashboard.json
@@ -731,7 +731,7 @@
                                         {
                                             "data_source": "metrics",
                                             "name": "query1",
-                                            "query": "sum:kubernetes_state.container.waiting{$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,reason:crashloopbackoff,$scope,$daemonset,$label,$node,$service} by {pod_name}"
+                                            "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,$statefulset,$replicaset,$daemonset,reason:crashloopbackoff,$scope,$daemonset,$label,$node,$service} by {pod_name}"
                                         }
                                     ],
                                     "style": {
@@ -1462,7 +1462,7 @@
                                         {
                                             "data_source": "metrics",
                                             "name": "query1",
-                                            "query": "sum:kubernetes_state.container.waiting{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}"
+                                            "query": "sum:kubernetes_state.container.status_report.count.waiting{$scope,$deployment,$statefulset,$replicaset,$daemonset,$service,$namespace,$label,$cluster,$node}"
                                         }
                                     ],
                                     "response_format": "timeseries",
diff --git a/kubernetes/assets/dashboards/kubernetes_pods.json b/kubernetes/assets/dashboards/kubernetes_pods.json
index ba0c5f1555aaa..2f104204de0b6 100644
--- a/kubernetes/assets/dashboards/kubernetes_pods.json
+++ b/kubernetes/assets/dashboards/kubernetes_pods.json
@@ -542,7 +542,7 @@
                         "name": "query3"
                       },
                       {
-                        "query": "sum:kubernetes_state.container.waiting{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job}",
+                        "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,$scope,$statefulset,$daemonset,$job}",
                         "data_source": "metrics",
                         "name": "query4"
                       }
@@ -625,7 +625,7 @@
                     "on_right_yaxis": false,
                     "queries": [
                       {
-                        "query": "sum:kubernetes.containers.state.waiting{$cluster,$namespace,$deployment,reason:crashloopbackoff,$scope,$statefulset,$daemonset,$job} by {pod_name}",
+                        "query": "sum:kubernetes_state.container.status_report.count.waiting{$cluster,$namespace,$deployment,reason:crashloopbackoff,$scope,$statefulset,$daemonset,$job} by {pod_name}",
                         "data_source": "metrics",
                         "name": "query1"
                       }
diff --git a/vsphere/assets/dashboards/vmware_vsphere_tkg_-_overview.json b/vsphere/assets/dashboards/vmware_vsphere_tkg_-_overview.json
index 532621185fdfe..90b6a1b1871b3 100644
--- a/vsphere/assets/dashboards/vmware_vsphere_tkg_-_overview.json
+++ b/vsphere/assets/dashboards/vmware_vsphere_tkg_-_overview.json
@@ -1014,7 +1014,7 @@
                                         {
                                             "data_source": "metrics",
                                             "name": "query4",
-                                            "query": "sum:kubernetes_state.container.waiting{$namespace,$scope,$vsphere_cluster,$vsphere_host,$vsphere_vcenter,$pod_name,$kube_container_name}"
+                                            "query": "sum:kubernetes_state.container.status_report.count.waiting{$namespace,$scope,$vsphere_cluster,$vsphere_host,$vsphere_vcenter,$pod_name,$kube_container_name}"
                                         }
                                     ],
                                     "response_format": "timeseries",
@@ -1123,7 +1123,7 @@
                                         {
                                             "data_source": "metrics",
                                             "name": "query1",
-                                            "query": "sum:kubernetes.containers.state.waiting{$namespace,$deployment,reason:crashloopbackoff,$scope,$statefulset,$daemonset,$job,$vsphere_cluster,$vsphere_host,$vsphere_vcenter,$pod_name,$kube_container_name} by {pod_name}"
+                                            "query": "sum:kubernetes_state.container.status_report.count.waiting{$namespace,$deployment,reason:crashloopbackoff,$scope,$statefulset,$daemonset,$job,$vsphere_cluster,$vsphere_host,$vsphere_vcenter,$pod_name,$kube_container_name} by {pod_name}"
                                         }
                                     ],
                                     "response_format": "timeseries",