diff --git a/kube_apiserver_metrics/changelog.d/19415.added b/kube_apiserver_metrics/changelog.d/19415.added index 87c66ecc5b526..a4ca397128e22 100644 --- a/kube_apiserver_metrics/changelog.d/19415.added +++ b/kube_apiserver_metrics/changelog.d/19415.added @@ -1 +1 @@ -Add process_cpu_seconds_total to kube_apiserver_metrics check +Add process_cpu_total to kube_apiserver_metrics check diff --git a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/kube_apiserver_metrics.py b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/kube_apiserver_metrics.py index 1eaec1bdc1b6f..197424dfc1aa4 100644 --- a/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/kube_apiserver_metrics.py +++ b/kube_apiserver_metrics/datadog_checks/kube_apiserver_metrics/kube_apiserver_metrics.py @@ -24,7 +24,7 @@ 'apiserver_request_duration_seconds': 'request_duration_seconds', 'apiserver_request_latencies': 'request_latencies', 'apiserver_request_latency_seconds': 'request_latencies', - 'process_cpu_seconds_total': 'process_cpu_seconds_total', + 'process_cpu_seconds_total': 'process_cpu_total', 'process_resident_memory_bytes': 'process_resident_memory_bytes', 'process_virtual_memory_bytes': 'process_virtual_memory_bytes', 'grpc_client_started_total': 'grpc_client_started_total', diff --git a/kube_apiserver_metrics/metadata.csv b/kube_apiserver_metrics/metadata.csv index a2752727b617e..efbb3298cd81f 100644 --- a/kube_apiserver_metrics/metadata.csv +++ b/kube_apiserver_metrics/metadata.csv @@ -51,7 +51,7 @@ kube_apiserver.http_requests_total,gauge,,request,,The accumulated number of HTT kube_apiserver.http_requests_total.count,count,,request,,The monotonic count of the number of HTTP requests made,0,kubernetes_api_server_metrics,total count of requests, kube_apiserver.kubernetes_feature_enabled,gauge,,,,"Whether a Kubernetes feature gate is enabled or not, identified by name and stage (alpha; Kubernetes 1.26+)",0,kubernetes_api_server_metrics,kubernetes feature enabled, kube_apiserver.longrunning_gauge,gauge,,request,,"The gauge of all active long-running apiserver requests broken out by verb, group, version, resource, scope, and component. Not all requests are tracked this way.",-1,kubernetes_api_server_metrics,long running gauges, -kube_apiserver.process_cpu_seconds_total,count,,second,,"Total user and system CPU time spent in seconds.",0,kubernetes_api_server_metrics,process cpu seconds total, +kube_apiserver.process_cpu_total,count,,second,,"Total user and system CPU time spent in seconds.",0,kubernetes_api_server_metrics,process cpu total, kube_apiserver.process_resident_memory_bytes,gauge,,byte,,The resident memory size in bytes,0,kubernetes_api_server_metrics,process rss, kube_apiserver.process_virtual_memory_bytes,gauge,,byte,,The virtual memory size in bytes,0,kubernetes_api_server_metrics,process virtual memory, kube_apiserver.registered_watchers,gauge,,object,,The number of currently registered watchers for a given resource,0,kubernetes_api_server_metrics,number of watchers, diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics.py index 89b9d482c0c62..178e74409fda0 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics.py @@ -66,7 +66,7 @@ class TestKubeAPIServerMetrics: 'admission_controller_admission_duration_seconds.count', 'request_latencies.sum', 'request_latencies.count', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', ] diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_15.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_15.py index f68bfef5a4647..5ad840e0c2bb8 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_15.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_15.py @@ -53,7 +53,7 @@ class TestKubeAPIServerMetrics: 'request_duration_seconds.sum', 'request_duration_seconds.count', 'registered_watchers', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd_request_duration_seconds.sum', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_19.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_19.py index b9f74721e872c..644bb3064dda2 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_19.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_19.py @@ -49,7 +49,7 @@ class TestKubeAPIServerMetrics: 'request_duration_seconds.sum', 'request_duration_seconds.count', 'registered_watchers', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd_request_duration_seconds.sum', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_23.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_23.py index a4245975911e9..c08e75f8bfc15 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_23.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_23.py @@ -49,7 +49,7 @@ class TestKubeAPIServerMetrics: 'request_duration_seconds.sum', 'request_duration_seconds.count', 'registered_watchers', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd_request_duration_seconds.sum', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_24.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_24.py index e7a49ed12e655..8c59b18354d2d 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_24.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_24.py @@ -47,7 +47,7 @@ class TestKubeAPIServerMetrics: 'admission_controller_admission_duration_seconds.count', 'request_duration_seconds.sum', 'request_duration_seconds.count', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd_request_duration_seconds.sum', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_25.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_25.py index 2049033d008cd..afec1846bb1d5 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_25.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_25.py @@ -66,7 +66,7 @@ class TestKubeAPIServerMetrics: NAMESPACE + '.admission_controller_admission_duration_seconds.count', NAMESPACE + '.request_duration_seconds.sum', NAMESPACE + '.request_duration_seconds.count', - NAMESPACE + '.process_cpu_seconds_total', + NAMESPACE + '.process_cpu_total', NAMESPACE + '.process_resident_memory_bytes', NAMESPACE + '.process_virtual_memory_bytes', NAMESPACE + '.etcd_request_duration_seconds.sum', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_26.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_26.py index 3db29816a71fe..2c4ee47139d24 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_26.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_26.py @@ -47,7 +47,7 @@ class TestKubeAPIServerMetrics: 'admission_controller_admission_duration_seconds.count', 'request_duration_seconds.sum', 'request_duration_seconds.count', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd.db.total_size', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_27.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_27.py index 00b15a31851ee..64c88ff34e4c9 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_27.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_27.py @@ -47,7 +47,7 @@ class TestKubeAPIServerMetrics: 'admission_controller_admission_duration_seconds.count', 'request_duration_seconds.sum', 'request_duration_seconds.count', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd.db.total_size', diff --git a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_28.py b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_28.py index 276ea18a33157..4f8ece7dfd899 100644 --- a/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_28.py +++ b/kube_apiserver_metrics/tests/test_kube_apiserver_metrics_1_28.py @@ -47,7 +47,7 @@ class TestKubeAPIServerMetrics: 'admission_controller_admission_duration_seconds.count', 'request_duration_seconds.sum', 'request_duration_seconds.count', - 'process_cpu_seconds_total', + 'process_cpu_total', 'process_resident_memory_bytes', 'process_virtual_memory_bytes', 'etcd.db.total_size',