kube: revert to kube_{cpu,memory}_resources_v1

relrod · relrod · commit b87e2d11abd2 · 2026-04-15T16:42:59.000+02:00
With some Pydantic magic, we can make this correctly handle the new and
old format in one section without needing to increment it at all.

Also add a test proving that we can parse the old format.

Change-Id: I3876975d5c7358ff1841015dc6e0d9af9d5f3529
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_based/kube_cpu.py b/packages/cmk-plugins/cmk/plugins/kube/agent_based/kube_cpu.py
@@ -84,8 +84,8 @@ def _check_kube_cpu(
 )
 
 
-agent_section_kube_cpu_resources_v2 = AgentSection(
-    name="kube_cpu_resources_v2",
+agent_section_kube_cpu_resources_v1 = AgentSection(
+    name="kube_cpu_resources_v1",
     parsed_section_name="kube_cpu_resources",
     parse_function=parse_resources,
 )
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_based/kube_memory.py b/packages/cmk-plugins/cmk/plugins/kube/agent_based/kube_memory.py
@@ -22,8 +22,8 @@
 )
 from cmk.plugins.kube.schemata.section import AllocatableResource, PerformanceUsage, Resources
 
-agent_section_kube_memory_resources_v2 = AgentSection(
-    name="kube_memory_resources_v2",
+agent_section_kube_memory_resources_v1 = AgentSection(
+    name="kube_memory_resources_v1",
     parse_function=parse_resources,
     parsed_section_name="kube_memory_resources",
 )
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/cluster_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/cluster_handler.py
@@ -42,12 +42,12 @@ def create_api_sections(api_cluster: Cluster, cluster_name: str) -> Iterator[Wri
         ),
         WriteableSection(
             piggyback_name="",
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=_memory_resources(api_cluster),
         ),
         WriteableSection(
             piggyback_name="",
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=_cpu_resources(api_cluster),
         ),
         WriteableSection(
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/cronjob_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/cronjob_handler.py
@@ -52,12 +52,12 @@ def create_api_sections(
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=collect_memory_resources_from_api_pods(cronjob_pods),
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=collect_cpu_resources_from_api_pods(cronjob_pods),
         ),
     )
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/daemonset_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/daemonset_handler.py
@@ -31,12 +31,12 @@ def create_api_sections(
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=api_daemonset.memory_resources(),
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=api_daemonset.cpu_resources(),
         ),
         WriteableSection(
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/deployment_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/deployment_handler.py
@@ -42,12 +42,12 @@ def create_api_sections(
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=api_deployment.memory_resources(),
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=api_deployment.cpu_resources(),
         ),
         WriteableSection(
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/namespace_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/namespace_handler.py
@@ -44,12 +44,12 @@ def create_namespace_api_sections(
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=collect_memory_resources_from_api_pods(namespace_api_pods),
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=collect_cpu_resources_from_api_pods(namespace_api_pods),
         ),
     )
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/node_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/node_handler.py
@@ -72,12 +72,12 @@ def create_api_sections(
             piggyback_name=piggyback_name,
         ),
         WriteableSection(
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=api_node.cpu_resources(),
             piggyback_name=piggyback_name,
         ),
         WriteableSection(
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=api_node.memory_resources(),
             piggyback_name=piggyback_name,
         ),
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/pod_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/pod_handler.py
@@ -44,12 +44,12 @@ def create_api_sections(
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=collect_cpu_resources_from_api_pods([pod]),
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=collect_memory_resources_from_api_pods([pod]),
         ),
         WriteableSection(
diff --git a/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/statefulset_handler.py b/packages/cmk-plugins/cmk/plugins/kube/agent_handlers/statefulset_handler.py
@@ -33,12 +33,12 @@ def create_api_sections(
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_memory_resources_v2"),
+            section_name=SectionName("kube_memory_resources_v1"),
             section=api_statefulset.memory_resources(),
         ),
         WriteableSection(
             piggyback_name=piggyback_name,
-            section_name=SectionName("kube_cpu_resources_v2"),
+            section_name=SectionName("kube_cpu_resources_v1"),
             section=api_statefulset.cpu_resources(),
         ),
         WriteableSection(
diff --git a/packages/cmk-plugins/cmk/plugins/kube/schemata/section.py b/packages/cmk-plugins/cmk/plugins/kube/schemata/section.py
@@ -15,7 +15,7 @@
 from typing import assert_never, Literal, NewType
 
 import requests
-from pydantic import BaseModel, ConfigDict, Field, ValidationError
+from pydantic import BaseModel, computed_field, ConfigDict, Field, model_validator, ValidationError
 
 from cmk.plugins.kube import prometheus_api, query
 from cmk.plugins.kube.schemata import api
@@ -196,21 +196,45 @@ class CollectorProcessingLogs(Section):
 # choosing a name, other section BaseModel names like AllocatableResource and PerformanceUsage
 # be taken into account
 class Resources(Section):
-    """sections: "[kube_memory_resources_v2, kube_cpu_resources_v2]"""
+    """sections: [kube_memory_resources_v1, kube_cpu_resources_v1]"""
 
     request: float
     limit: float
 
     # requests
     count_unspecified_requests: int
     count_total_requests: int
-    count_pods_pod_level_request: int
+    count_pods_pod_level_request: int = 0
 
     # limits
     count_unspecified_limits: int
     count_zeroed_limits: int
     count_total_limits: int
-    count_pods_pod_level_limit: int
+    count_pods_pod_level_limit: int = 0
+
+    @computed_field(repr=False)  # type: ignore[prop-decorator]
+    @property
+    def count_total(self) -> int:
+        """Backwards-compatible field for old Checkmk installations.
+
+        Old agents emitted a single count_total used for both requests and limits display.
+        New agents emit count_total_requests and count_total_limits separately. This field
+        allows old Checkmk servers to parse new agent output without crashing. It only affects
+        the display string (e.g. "2/2 containers with requests") - never emitted as a metric.
+        """
+        return self.count_total_requests
+
+    @model_validator(mode="before")
+    @classmethod
+    def _handle_legacy_count_total(cls, data: object) -> object:
+        """Support old agent output that used count_total instead of separate request/limit totals."""
+        if isinstance(data, dict) and "count_total" in data:
+            count_total = data["count_total"]
+            if "count_total_requests" not in data:
+                data = {**data, "count_total_requests": count_total}
+            if "count_total_limits" not in data:
+                data = {**data, "count_total_limits": count_total}
+        return data
 
 
 class AllocatableResource(Section):
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_based/test_kube_memory.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_based/test_kube_memory.py
@@ -412,3 +412,17 @@ def test_count_overview_pod_level(
     expected: str,
 ) -> None:
     assert count_overview(resources, requirement) == expected
+
+
+def test_parse_resources_legacy_v1_format() -> None:
+    """Old agent output used count_total instead of count_total_requests/count_total_limits."""
+    old_json = (
+        '{"request": 13120704.0, "limit": 28120704.0,'
+        ' "count_unspecified_requests": 0, "count_total": 2,'
+        ' "count_unspecified_limits": 0, "count_zeroed_limits": 0}'
+    )
+    resources = Resources.model_validate_json(old_json)
+    assert resources.count_total_requests == 2
+    assert resources.count_total_limits == 2
+    assert resources.count_pods_pod_level_request == 0
+    assert resources.count_pods_pod_level_limit == 0
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_cluster.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_cluster.py
@@ -52,8 +52,8 @@ def cluster_api_sections() -> set[str]:
         "kube_allocatable_pods_v1",
         "kube_node_count_v1",
         "kube_cluster_details_v1",
-        "kube_memory_resources_v2",
-        "kube_cpu_resources_v2",
+        "kube_memory_resources_v1",
+        "kube_cpu_resources_v1",
         "kube_allocatable_memory_resource_v1",
         "kube_allocatable_cpu_resource_v1",
         "kube_cluster_info_v1",
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_daemon_set.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_daemon_set.py
@@ -18,8 +18,8 @@
 def daemon_sets_api_sections() -> set[str]:
     return {
         "kube_pod_resources_v1",
-        "kube_memory_resources_v2",
-        "kube_cpu_resources_v2",
+        "kube_memory_resources_v1",
+        "kube_cpu_resources_v1",
         "kube_daemonset_info_v1",
         "kube_update_strategy_v1",
         "kube_daemonset_replicas_v1",
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_deployment.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_deployment.py
@@ -30,10 +30,10 @@ class DeploymentConditionFactory(ModelFactory):
 def deployments_api_sections() -> set[str]:
     return {
         "kube_pod_resources_v1",
-        "kube_memory_resources_v2",
+        "kube_memory_resources_v1",
         "kube_deployment_info_v1",
         "kube_deployment_conditions_v1",
-        "kube_cpu_resources_v2",
+        "kube_cpu_resources_v1",
         "kube_update_strategy_v1",
         "kube_deployment_replicas_v1",
         "kube_controller_spec_v1",
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_namespace.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_namespace.py
@@ -39,8 +39,8 @@ def test_namespace_create_api_sections() -> None:
     assert {s.section_name for s in sections} == {
         "kube_namespace_info_v1",
         "kube_pod_resources_v1",
-        "kube_memory_resources_v2",
-        "kube_cpu_resources_v2",
+        "kube_memory_resources_v1",
+        "kube_cpu_resources_v1",
     }
 
 
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_node.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_node.py
@@ -35,8 +35,8 @@ def api_nodes_api_sections() -> set[str]:
         "kube_pod_resources_v1",
         "kube_allocatable_pods_v1",
         "kube_node_info_v1",
-        "kube_cpu_resources_v2",
-        "kube_memory_resources_v2",
+        "kube_cpu_resources_v1",
+        "kube_memory_resources_v1",
         "kube_allocatable_cpu_resource_v1",
         "kube_allocatable_memory_resource_v1",
         "kube_node_conditions_v2",
diff --git a/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_statefulset.py b/packages/cmk-plugins/tests/cmk/plugins/kube/agent_kube/test_statefulset.py
@@ -20,8 +20,8 @@
 def statefulsets_api_sections() -> set[str]:
     return {
         "kube_pod_resources_v1",
-        "kube_memory_resources_v2",
-        "kube_cpu_resources_v2",
+        "kube_memory_resources_v1",
+        "kube_cpu_resources_v1",
         "kube_statefulset_info_v1",
         "kube_update_strategy_v1",
         "kube_statefulset_replicas_v1",

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ def _check_kube_cpu(`
`84`	`84`	`)`
`85`	`85`
`86`	`86`
`87`		`-agent_section_kube_cpu_resources_v2 = AgentSection(`
`88`		`- name="kube_cpu_resources_v2",`
	`87`	`+agent_section_kube_cpu_resources_v1 = AgentSection(`
	`88`	`+ name="kube_cpu_resources_v1",`
`89`	`89`	`parsed_section_name="kube_cpu_resources",`
`90`	`90`	`parse_function=parse_resources,`
`91`	`91`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`)`
`23`	`23`	`from cmk.plugins.kube.schemata.section import AllocatableResource, PerformanceUsage, Resources`
`24`	`24`
`25`		`-agent_section_kube_memory_resources_v2 = AgentSection(`
`26`		`- name="kube_memory_resources_v2",`
	`25`	`+agent_section_kube_memory_resources_v1 = AgentSection(`
	`26`	`+ name="kube_memory_resources_v1",`
`27`	`27`	`parse_function=parse_resources,`
`28`	`28`	`parsed_section_name="kube_memory_resources",`
`29`	`29`	`)`