MON-4607: add zoneinfo to NodeExporterCollectorConfig CRD types

config/v1alpha1/types_cluster_monitoring.go

@@ -466,6 +466,14 @@ type NodeExporterCollectorConfig struct {
 	// Enable when you need visibility into kernel softirq processing across CPUs.
 	// +optional
 	Softirqs NodeExporterCollectorSoftirqsConfig `json:"softirqs,omitempty,omitzero"`
+	// zoneinfo configures the zoneinfo collector, which exposes per-zone memory page counts,
+	// watermarks, and protection thresholds from /proc/zoneinfo.
+	// zoneinfo is optional.
+	// When omitted, this means no opinion and the platform is left to choose a reasonable default,
+	// which is subject to change over time. The current default is disabled.
+	// Enable when you need visibility into kernel memory zone allocation and pressure.
+	// +optional
+	Zoneinfo NodeExporterCollectorZoneinfoConfig `json:"zoneinfo,omitempty,omitzero"`
 }
 
 // NodeExporterCollectorCpufreqConfig provides configuration for the cpufreq collector
@@ -689,6 +697,20 @@ type NodeExporterCollectorSoftirqsConfig struct {
 	CollectionPolicy NodeExporterCollectorCollectionPolicy `json:"collectionPolicy,omitempty"`
 }
 
+// NodeExporterCollectorZoneinfoConfig provides configuration for the zoneinfo collector
+// of the node-exporter agent. The zoneinfo collector exposes per-zone memory page counts,
+// watermarks, and protection thresholds from /proc/zoneinfo.
+// It is disabled by default.
+type NodeExporterCollectorZoneinfoConfig struct {
+	// collectionPolicy declares whether the zoneinfo collector collects metrics.
+	// This field is required.
+	// Valid values are "Collect" and "DoNotCollect".
+	// When set to "Collect", the zoneinfo collector is active and zone memory statistics are collected.
+	// When set to "DoNotCollect", the zoneinfo collector is inactive.
+	// +required
+	CollectionPolicy NodeExporterCollectorCollectionPolicy `json:"collectionPolicy,omitempty"`
+}
+
 // MonitoringPluginConfig provides configuration options for the monitoring plugin
 // that runs as a dynamic plugin of the OpenShift web console.
 // The monitoring plugin provides the monitoring UI in the OpenShift web console

config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings.crd.yaml

@@ -2436,6 +2436,29 @@ spec:
                         required:
                         - collectionPolicy
                         type: object
+                      zoneinfo:
+                        description: |-
+                          zoneinfo configures the zoneinfo collector, which exposes per-zone memory page counts,
+                          watermarks, and protection thresholds from /proc/zoneinfo.
+                          zoneinfo is optional.
+                          When omitted, this means no opinion and the platform is left to choose a reasonable default,
+                          which is subject to change over time. The current default is disabled.
+                          Enable when you need visibility into kernel memory zone allocation and pressure.
+                        properties:
+                          collectionPolicy:
+                            description: |-
+                              collectionPolicy declares whether the zoneinfo collector collects metrics.
+                              This field is required.
+                              Valid values are "Collect" and "DoNotCollect".
+                              When set to "Collect", the zoneinfo collector is active and zone memory statistics are collected.
+                              When set to "DoNotCollect", the zoneinfo collector is inactive.
+                            enum:
+                            - Collect
+                            - DoNotCollect
+                            type: string
+                        required:
+                        - collectionPolicy
+                        type: object
                     type: object
                   ignoredNetworkDevices:
                     description: |-

config/v1alpha1/zz_generated.featuregated-crd-manifests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml

@@ -2436,6 +2436,29 @@ spec:
                         required:
                         - collectionPolicy
                         type: object
+                      zoneinfo:
+                        description: |-
+                          zoneinfo configures the zoneinfo collector, which exposes per-zone memory page counts,
+                          watermarks, and protection thresholds from /proc/zoneinfo.
+                          zoneinfo is optional.
+                          When omitted, this means no opinion and the platform is left to choose a reasonable default,
+                          which is subject to change over time. The current default is disabled.
+                          Enable when you need visibility into kernel memory zone allocation and pressure.
+                        properties:
+                          collectionPolicy:
+                            description: |-
+                              collectionPolicy declares whether the zoneinfo collector collects metrics.
+                              This field is required.
+                              Valid values are "Collect" and "DoNotCollect".
+                              When set to "Collect", the zoneinfo collector is active and zone memory statistics are collected.
+                              When set to "DoNotCollect", the zoneinfo collector is inactive.
+                            enum:
+                            - Collect
+                            - DoNotCollect
+                            type: string
+                        required:
+                        - collectionPolicy
+                        type: object
                     type: object
                   ignoredNetworkDevices:
                     description: |-

openapi/openapi.json

@@ -13785,6 +13785,11 @@
           "description": "tcpStat configures the tcpstat collector, which collects TCP connection statistics. tcpStat is optional. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is disabled. Enable when debugging TCP connection behavior or capacity at the node level.",
           "default": {},
           "$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.NodeExporterCollectorTcpStatConfig"
+        },
+        "zoneinfo": {
+          "description": "zoneinfo configures the zoneinfo collector, which exposes per-zone memory page counts, watermarks, and protection thresholds from /proc/zoneinfo. zoneinfo is optional. When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time. The current default is disabled. Enable when you need visibility into kernel memory zone allocation and pressure.",
+          "default": {},
+          "$ref": "#/definitions/com.github.openshift.api.config.v1alpha1.NodeExporterCollectorZoneinfoConfig"
         }
       }
     },
@@ -14013,6 +14018,23 @@
         }
       }
     },
+    "com.github.openshift.api.config.v1alpha1.NodeExporterCollectorZoneinfoConfig": {
+      "description": "NodeExporterCollectorZoneinfoConfig provides configuration for the zoneinfo collector of the node-exporter agent. The zoneinfo collector exposes per-zone memory page counts, watermarks, and protection thresholds from /proc/zoneinfo. It is disabled by default.",
+      "type": "object",
+      "required": [
+        "collectionPolicy"
+      ],
+      "properties": {
+        "collectionPolicy": {
+          "description": "collectionPolicy declares whether the zoneinfo collector collects metrics. This field is required. Valid values are \"Collect\" and \"DoNotCollect\". When set to \"Collect\", the zoneinfo collector is active and zone memory statistics are collected. When set to \"DoNotCollect\", the zoneinfo collector is inactive.\n\nPossible enum values:\n - `\"Collect\"` means the collector is active and will produce metrics.\n - `\"DoNotCollect\"` means the collector is inactive and will not produce metrics.",
+          "type": "string",
+          "enum": [
+            "Collect",
+            "DoNotCollect"
+          ]
+        }
+      }
+    },
     "com.github.openshift.api.config.v1alpha1.NodeExporterConfig": {
       "description": "NodeExporterConfig provides configuration options for the node-exporter agent that runs as a DaemonSet in the `openshift-monitoring` namespace. The node-exporter agent collects hardware and OS-level metrics from every node in the cluster, including CPU, memory, disk, and network statistics. At least one field must be specified.",
       "type": "object",