MON-4558: enable zoneinfo node-exporter collector via config

midu16 · midu16 · commit c8db500ee18c · 2026-07-23T19:14:14.000+02:00
Add optional nodeExporter.collectors.zoneinfo toggle (disabled by default). Wire --collector.zoneinfo/--no-collector.zoneinfo in updateNodeExporterArgs, extend unit/e2e tests, and add zoneinfo to telemeter collector success matcher. Update jsonnet/versions.yaml to match upstream component versions. CRD merge (config_merge.go) will be added once openshift/api#2948 merges and the vendor is updated with the NodeExporterCollectorZoneinfoConfig type.
diff --git a/Documentation/api.md b/Documentation/api.md
@@ -38,6 +38,7 @@ Configuring Cluster Monitoring is optional. If the config does not exist or is e
 * [NodeExporterCollectorSoftirqsConfig](#nodeexportercollectorsoftirqsconfig)
 * [NodeExporterCollectorSystemdConfig](#nodeexportercollectorsystemdconfig)
 * [NodeExporterCollectorTcpStatConfig](#nodeexportercollectortcpstatconfig)
+* [NodeExporterCollectorZoneinfoConfig](#nodeexportercollectorzoneinfoconfig)
 * [NodeExporterConfig](#nodeexporterconfig)
 * [OpenShiftStateMetricsConfig](#openshiftstatemetricsconfig)
 * [PrometheusK8sConfig](#prometheusk8sconfig)
@@ -256,6 +257,7 @@ The `NodeExporterCollectorConfig` resource defines settings for individual colle
 | processes | [NodeExporterCollectorProcessesConfig](#nodeexportercollectorprocessesconfig) | Defines the configuration of the `processes` collector, which collects statistics from processes and threads running in the system. Disabled by default. |
 | systemd | [NodeExporterCollectorSystemdConfig](#nodeexportercollectorsystemdconfig) | Defines the configuration of the `systemd` collector, which collects statistics on the systemd daemon and its managed services. Disabled by default. |
 | softirqs | [NodeExporterCollectorSoftirqsConfig](#nodeexportercollectorsoftirqsconfig) | Defines the configuration of the `softirqs` collector, which exposes detailed softirq metrics from `/proc/softirqs`. Disabled by default. |
+| zoneinfo | [NodeExporterCollectorZoneinfoConfig](#nodeexportercollectorzoneinfoconfig) | Defines the configuration of the `zoneinfo` collector, which exposes detailed memory zone statistics from `/proc/zoneinfo`. Disabled by default. |
 
 [Back to TOC](#table-of-contents)
 
@@ -411,6 +413,21 @@ The `NodeExporterCollectorTcpStatConfig` resource works as an on/off switch for
 
 [Back to TOC](#table-of-contents)
 
+## NodeExporterCollectorZoneinfoConfig
+
+#### Description
+
+The `NodeExporterCollectorZoneinfoConfig` resource works as an on/off switch 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`. By default, the `zoneinfo` collector is disabled.
+
+
+<em>appears in: [NodeExporterCollectorConfig](#nodeexportercollectorconfig)</em>
+
+| Property | Type | Description |
+| -------- | ---- | ----------- |
+| enabled | bool | A Boolean flag that enables or disables the `zoneinfo` collector. |
+
+[Back to TOC](#table-of-contents)
+
 ## NodeExporterConfig
 
 #### Description
diff --git a/Documentation/data-collection.md b/Documentation/data-collection.md
@@ -670,7 +670,7 @@ data:
     # owners: (@openshift/openshift-team-monitoring)
     #
     # collector:node_scrape_collector_success:avg reports the average success of optional node_exporter's collectors running in the cluster.
-    - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool|cpufreq|tcpstat|netdev|netclass|buddyinfo|mountstats|ksmd|processes|systemd|softirqs"}'
+    - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool|cpufreq|tcpstat|netdev|netclass|buddyinfo|mountstats|ksmd|processes|systemd|softirqs|zoneinfo"}'
     #
     # owners: (@openshift/openshift-team-monitoring)
     #
diff --git a/Documentation/openshiftdocs/index.adoc b/Documentation/openshiftdocs/index.adoc
@@ -58,6 +58,7 @@ The configuration file itself is always defined under the `config.yaml` key in t
 * link:modules/nodeexportercollectorsoftirqsconfig.adoc[NodeExporterCollectorSoftirqsConfig]
 * link:modules/nodeexportercollectorsystemdconfig.adoc[NodeExporterCollectorSystemdConfig]
 * link:modules/nodeexportercollectortcpstatconfig.adoc[NodeExporterCollectorTcpStatConfig]
+* link:modules/nodeexportercollectorzoneinfoconfig.adoc[NodeExporterCollectorZoneinfoConfig]
 * link:modules/nodeexporterconfig.adoc[NodeExporterConfig]
 * link:modules/openshiftstatemetricsconfig.adoc[OpenShiftStateMetricsConfig]
 * link:modules/prometheusk8sconfig.adoc[PrometheusK8sConfig]
diff --git a/Documentation/openshiftdocs/modules/nodeexportercollectorconfig.adoc b/Documentation/openshiftdocs/modules/nodeexportercollectorconfig.adoc
@@ -40,6 +40,8 @@ Appears in: link:nodeexporterconfig.adoc[NodeExporterConfig]
 
 |softirqs|link:nodeexportercollectorsoftirqsconfig.adoc[NodeExporterCollectorSoftirqsConfig]|Defines the configuration of the `softirqs` collector, which exposes detailed softirq metrics from `/proc/softirqs`. Disabled by default.
 
+|zoneinfo|link:nodeexportercollectorzoneinfoconfig.adoc[NodeExporterCollectorZoneinfoConfig]|Defines the configuration of the `zoneinfo` collector, which exposes detailed memory zone statistics from `/proc/zoneinfo`. Disabled by default.
+
 |===
 
 link:../index.adoc[Back to TOC]
diff --git a/Documentation/openshiftdocs/modules/nodeexportercollectorzoneinfoconfig.adoc b/Documentation/openshiftdocs/modules/nodeexportercollectorzoneinfoconfig.adoc
@@ -0,0 +1,25 @@
+// DO NOT EDIT THE CONTENT IN THIS FILE. It is automatically generated from the 
+	// source code for the Cluster Monitoring Operator. Any changes made to this 
+	// file will be overwritten when the content is re-generated. If you wish to 
+	// make edits, read the docgen utility instructions in the source code for the 
+	// CMO.
+	:_content-type: ASSEMBLY
+
+== NodeExporterCollectorZoneinfoConfig
+
+=== Description
+
+The `NodeExporterCollectorZoneinfoConfig` resource works as an on/off switch 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`. By default, the `zoneinfo` collector is disabled.
+
+
+
+Appears in: link:nodeexportercollectorconfig.adoc[NodeExporterCollectorConfig]
+
+[options="header"]
+|===
+| Property | Type | Description 
+|enabled|bool|A Boolean flag that enables or disables the `zoneinfo` collector.
+
+|===
+
+link:../index.adoc[Back to TOC]
diff --git a/Documentation/sample-metrics.md b/Documentation/sample-metrics.md
diff --git a/Documentation/telemetry/telemeter_query b/Documentation/telemetry/telemeter_query
diff --git a/jsonnet/versions.yaml b/jsonnet/versions.yaml
@@ -14,13 +14,13 @@ repos:
     prometheusOperator: openshift/prometheus-operator
     thanos: openshift/thanos
 versions:
-    alertmanager: 0.33.0
+    alertmanager: 0.33.1
     kubeRbacProxy: 0.21.1
     kubeStateMetrics: 2.19.1
     kubernetesMetricsServer: 0.8.1
     monitoringPlugin: 1.0.0
-    nodeExporter: 1.11.1
+    nodeExporter: 1.12.1
     promLabelProxy: 0.14.0
-    prometheus: 3.12.0
+    prometheus: 3.13.1
     prometheusOperator: 0.91.0
-    thanos: 0.41.0
+    thanos: 0.42.2
diff --git a/manifests/0000_50_cluster-monitoring-operator_04-config.yaml b/manifests/0000_50_cluster-monitoring-operator_04-config.yaml
@@ -662,7 +662,7 @@ data:
     # owners: (@openshift/openshift-team-monitoring)
     #
     # collector:node_scrape_collector_success:avg reports the average success of optional node_exporter's collectors running in the cluster.
-    - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool|cpufreq|tcpstat|netdev|netclass|buddyinfo|mountstats|ksmd|processes|systemd|softirqs"}'
+    - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool|cpufreq|tcpstat|netdev|netclass|buddyinfo|mountstats|ksmd|processes|systemd|softirqs|zoneinfo"}'
     #
     # owners: (@openshift/openshift-team-monitoring)
     #
diff --git a/pkg/manifests/manifests.go b/pkg/manifests/manifests.go
@@ -976,6 +976,12 @@ func (f *Factory) updateNodeExporterArgs(args []string) ([]string, error) {
 		args = setArg(args, "--no-collector.softirqs", "")
 	}
 
+	if f.config.ClusterMonitoringConfiguration.NodeExporterConfig.Collectors.Zoneinfo.Enabled {
+		args = setArg(args, "--collector.zoneinfo", "")
+	} else {
+		args = setArg(args, "--no-collector.zoneinfo", "")
+	}
+
 	if f.config.ClusterMonitoringConfiguration.NodeExporterConfig.Collectors.BuddyInfo.Enabled {
 		args = setArg(args, "--collector.buddyinfo", "")
 	} else {
diff --git a/pkg/manifests/manifests_test.go b/pkg/manifests/manifests_test.go
@@ -3412,6 +3412,7 @@ func TestNodeExporterCollectorSettings(t *testing.T) {
 				"--no-collector.tcpstat",
 				"--no-collector.ethtool",
 				"--no-collector.softirqs",
+				"--no-collector.zoneinfo",
 				"--collector.netdev",
 				"--collector.netclass",
 				"--collector.netclass.netlink",
@@ -3426,6 +3427,7 @@ func TestNodeExporterCollectorSettings(t *testing.T) {
 				"--collector.tcpstat",
 				"--collector.ethtool",
 				"--collector.softirqs",
+				"--collector.zoneinfo",
 				"--no-collector.netdev",
 				"--no-collector.netclass",
 				"--collector.buddyinfo",
@@ -3490,6 +3492,17 @@ nodeExporter:
 			argsPresent: []string{"--collector.softirqs"},
 			argsAbsent:  []string{"--no-collector.softirqs"},
 		},
+		{
+			name: "enable zoneinfo collector",
+			config: `
+nodeExporter:
+  collectors:
+    zoneinfo:
+      enabled: true
+`,
+			argsPresent: []string{"--collector.zoneinfo"},
+			argsAbsent:  []string{"--no-collector.zoneinfo"},
+		},
 		{
 			name: "disable netdev collector",
 			config: `
diff --git a/pkg/manifests/types.go b/pkg/manifests/types.go
@@ -415,6 +415,9 @@ type NodeExporterCollectorConfig struct {
 	// Defines the configuration of the `softirqs` collector, which exposes detailed softirq metrics from `/proc/softirqs`.
 	// Disabled by default.
 	Softirqs NodeExporterCollectorSoftirqsConfig `json:"softirqs,omitempty"`
+	// Defines the configuration of the `zoneinfo` collector, which exposes detailed memory zone statistics from `/proc/zoneinfo`.
+	// Disabled by default.
+	Zoneinfo NodeExporterCollectorZoneinfoConfig `json:"zoneinfo,omitempty"`
 }
 
 // The `NodeExporterCollectorCpufreqConfig` resource works as an on/off switch for
@@ -588,6 +591,16 @@ type NodeExporterCollectorSoftirqsConfig struct {
 	Enabled bool `json:"enabled,omitempty"`
 }
 
+// The `NodeExporterCollectorZoneinfoConfig` resource works as an on/off switch 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`.
+// By default, the `zoneinfo` collector is disabled.
+type NodeExporterCollectorZoneinfoConfig struct {
+	// A Boolean flag that enables or disables the `zoneinfo` collector.
+	Enabled bool `json:"enabled,omitempty"`
+}
+
 // The `UserWorkloadConfiguration` resource defines the settings
 // responsible for user-defined projects in the
 // `user-workload-monitoring-config` config map  in the
diff --git a/test/e2e/node_exporter_test.go b/test/e2e/node_exporter_test.go
@@ -59,6 +59,14 @@ nodeExporter:
 nodeExporter:
   collectors:
     softirqs:
+      enabled: true`,
+		},
+		{
+			nameCollector: "zoneinfo",
+			config: `
+nodeExporter:
+  collectors:
+    zoneinfo:
       enabled: true`,
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ data:`
`670`	`670`	`# owners: (@openshift/openshift-team-monitoring)`
`671`	`671`	`#`
`672`	`672`	`# collector:node_scrape_collector_success:avg reports the average success of optional node_exporter's collectors running in the cluster.`
`673`		`- - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool\|cpufreq\|tcpstat\|netdev\|netclass\|buddyinfo\|mountstats\|ksmd\|processes\|systemd\|softirqs"}'`
	`673`	`+ - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool\|cpufreq\|tcpstat\|netdev\|netclass\|buddyinfo\|mountstats\|ksmd\|processes\|systemd\|softirqs\|zoneinfo"}'`
`674`	`674`	`#`
`675`	`675`	`# owners: (@openshift/openshift-team-monitoring)`
`676`	`676`	`#`
Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ data:`
`662`	`662`	`# owners: (@openshift/openshift-team-monitoring)`
`663`	`663`	`#`
`664`	`664`	`# collector:node_scrape_collector_success:avg reports the average success of optional node_exporter's collectors running in the cluster.`
`665`		`- - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool\|cpufreq\|tcpstat\|netdev\|netclass\|buddyinfo\|mountstats\|ksmd\|processes\|systemd\|softirqs"}'`
	`665`	`+ - '{__name__="collector:node_scrape_collector_success:avg",collector=~"ethtool\|cpufreq\|tcpstat\|netdev\|netclass\|buddyinfo\|mountstats\|ksmd\|processes\|systemd\|softirqs\|zoneinfo"}'`
`666`	`666`	`#`
`667`	`667`	`# owners: (@openshift/openshift-team-monitoring)`
`668`	`668`	`#`