Prepares exporter command for pg17 (#4004)

Prepares exporter command for pg17
CrunchyData · Sep 26, 2024 · 34a3eee · 34a3eee
1 parent 4d070ce
commit 34a3eee
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/internal/controller/postgrescluster/pgmonitor.go b/internal/controller/postgrescluster/pgmonitor.go
@@ -259,13 +259,34 @@ func addPGMonitorExporterToInstancePodSpec(
 	withBuiltInCollectors :=
 		!strings.EqualFold(cluster.Annotations[naming.PostgresExporterCollectorsAnnotation], "None")
 
+	var cmd []string
+	// PG 17 does not include some of the columns found in stat_bgwriter with older PGs.
+	// Selectively turn off the collector for stat_bgwriter in PG 17, unless the user
+	// requests all collectors to be turned off.
+	switch {
+	case cluster.Spec.PostgresVersion == 17 && withBuiltInCollectors && certSecret == nil:
+		cmd = pgmonitor.ExporterStartCommand(withBuiltInCollectors,
+			pgmonitor.ExporterDeactivateStatBGWriterFlag)
+	case cluster.Spec.PostgresVersion == 17 && withBuiltInCollectors && certSecret != nil:
+		cmd = pgmonitor.ExporterStartCommand(withBuiltInCollectors,
+			pgmonitor.ExporterWebConfigFileFlag,
+			pgmonitor.ExporterDeactivateStatBGWriterFlag)
+	// If you're turning off all built-in collectors, we don't care which
+	// version of PG you're using.
+	case certSecret != nil:
+		cmd = pgmonitor.ExporterStartCommand(withBuiltInCollectors,
+			pgmonitor.ExporterWebConfigFileFlag)
+	default:
+		cmd = pgmonitor.ExporterStartCommand(withBuiltInCollectors)
+	}
+
 	securityContext := initialize.RestrictedSecurityContext()
 	exporterContainer := corev1.Container{
 		Name:            naming.ContainerPGMonitorExporter,
 		Image:           config.PGExporterContainerImage(cluster),
 		ImagePullPolicy: cluster.Spec.ImagePullPolicy,
 		Resources:       cluster.Spec.Monitoring.PGMonitor.Exporter.Resources,
-		Command:         pgmonitor.ExporterStartCommand(withBuiltInCollectors),
+		Command:         cmd,
 		Env: []corev1.EnvVar{
 			{Name: "DATA_SOURCE_URI", Value: fmt.Sprintf("%s:%d/%s", pgmonitor.ExporterHost, *cluster.Spec.Port, pgmonitor.ExporterDB)},
 			{Name: "DATA_SOURCE_USER", Value: pgmonitor.MonitoringUser},
@@ -357,8 +378,6 @@ func addPGMonitorExporterToInstancePodSpec(
 		}}
 
 		exporterContainer.VolumeMounts = append(exporterContainer.VolumeMounts, mounts...)
-		exporterContainer.Command = pgmonitor.ExporterStartCommand(
-			withBuiltInCollectors, pgmonitor.ExporterWebConfigFileFlag)
 	}
 
 	template.Spec.Containers = append(template.Spec.Containers, exporterContainer)

diff --git a/internal/pgmonitor/exporter.go b/internal/pgmonitor/exporter.go
@@ -32,7 +32,8 @@ const (
 
 // postgres_exporter command flags
 var (
-	ExporterWebConfigFileFlag = "--web.config.file=/web-config/web-config.yml"
+	ExporterWebConfigFileFlag          = "--web.config.file=/web-config/web-config.yml"
+	ExporterDeactivateStatBGWriterFlag = "--no-collector.stat_bgwriter"
 )
 
 // Defaults for certain values used in queries.yml