postgres

Author: benjaminjb

internal/collector/pgbackrest_test.go

@@ -39,7 +39,7 @@ exporters:
     verbosity: detailed
 extensions:
   file_storage/pgbackrest_logs:
-    create_directory: true
+    create_directory: false
     directory: /pgbackrest/repo1/log/receiver
     fsync: true
 processors:
@@ -131,7 +131,7 @@ exporters:
     project: google-project-name
 extensions:
   file_storage/pgbackrest_logs:
-    create_directory: true
+    create_directory: false
     directory: /pgbackrest/repo1/log/receiver
     fsync: true
 processors:

internal/collector/postgres.go

@@ -220,10 +220,9 @@ func EnablePostgresLogging(
 		}
 
 		// pgBackRest pipeline
-		// TODO(log-rotation): Create this directory during Collector startup.
 		outConfig.Extensions["file_storage/pgbackrest_logs"] = map[string]any{
 			"directory":        naming.PGBackRestPGDataLogPath + "/receiver",
-			"create_directory": true,
+			"create_directory": false,
 			"fsync":            true,
 		}
 

internal/collector/postgres_test.go

@@ -40,7 +40,7 @@ exporters:
     verbosity: detailed
 extensions:
   file_storage/pgbackrest_logs:
-    create_directory: true
+    create_directory: false
     directory: /pgdata/pgbackrest/log/receiver
     fsync: true
   file_storage/postgres_logs:
@@ -272,7 +272,7 @@ exporters:
     project: google-project-name
 extensions:
   file_storage/pgbackrest_logs:
-    create_directory: true
+    create_directory: false
     directory: /pgdata/pgbackrest/log/receiver
     fsync: true
   file_storage/postgres_logs:

internal/controller/postgrescluster/instance.go

@@ -1168,7 +1168,7 @@ func (r *Reconciler) reconcileInstance(
 	)
 
 	if err == nil {
-		instanceConfigMap, err = r.reconcileInstanceConfigMap(ctx, cluster, spec, instance, otelConfig)
+		instanceConfigMap, err = r.reconcileInstanceConfigMap(ctx, cluster, spec, instance, otelConfig, backupsSpecFound)
 	}
 	if err == nil {
 		instanceCertificates, err = r.reconcileInstanceCertificates(
@@ -1407,7 +1407,7 @@ func addPGBackRestToInstancePodSpec(
 // files (etc) that apply to instance of cluster.
 func (r *Reconciler) reconcileInstanceConfigMap(
 	ctx context.Context, cluster *v1beta1.PostgresCluster, spec *v1beta1.PostgresInstanceSetSpec,
-	instance *appsv1.StatefulSet, otelConfig *collector.Config,
+	instance *appsv1.StatefulSet, otelConfig *collector.Config, backupSpecFound bool,
 ) (*corev1.ConfigMap, error) {
 	instanceConfigMap := &corev1.ConfigMap{ObjectMeta: naming.InstanceConfigMap(instance)}
 	instanceConfigMap.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("ConfigMap"))
@@ -1430,6 +1430,13 @@ func (r *Reconciler) reconcileInstanceConfigMap(
 	// If OTel logging or metrics is enabled, add collector config
 	if err == nil && (feature.Enabled(ctx, feature.OpenTelemetryLogs) || feature.Enabled(ctx, feature.OpenTelemetryMetrics)) {
 		err = collector.AddToConfigMap(ctx, otelConfig, instanceConfigMap)
+
+		// Add pgbackrest logrotate if OpenTelemetryLogs is enabled and backupSpecFound
+		if err == nil && feature.Enabled(ctx, feature.OpenTelemetryLogs) &&
+			backupSpecFound && cluster.Spec.Instrumentation != nil {
+			err = collector.AddLogrotateConfig(ctx, cluster.Spec.Instrumentation,
+				instanceConfigMap, naming.PGBackRestPGDataLogPath, "")
+		}
 	}
 	if err == nil {
 		err = patroni.InstanceConfigMap(ctx, cluster, spec, instanceConfigMap)