sets up pg log rotation

Author: arosenkranz

docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /proc/:/host/proc/:ro
       - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
-      - ./services/postgres/data/pg_log:/var/log/pg_log
+      - postgres_logs:/var/log/pg_log:ro
   frontend:
     build:
       context: ./services/frontend
@@ -104,7 +104,7 @@ services:
       - dd-agent
     volumes:
       # save postgres logs to a volume for datadog to collect
-      - './services/postgres/data/pg_log:/var/log/pg_log'
+      - postgres_logs:/var/log/pg_log:rw
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
       - POSTGRES_USER
@@ -169,7 +169,7 @@ services:
         "enabled": true
         }
         }]'
-      com.datadoghq.ad.logs: '[{"source": "postgresql", "service": "postgres", "auto_multi_line_detection":true, "path": "/var/log/pg_log/postgresql_logs.json", "type": "file"}]'
+      com.datadoghq.ad.logs: '[{"source": "postgresql", "service": "postgres", "auto_multi_line_detection":true, "path": "/var/log/pg_log/postgresql*.json", "type": "file"}]'
       my.custom.label.team: 'database'
   redis:
     image: redis:6.2-alpine

services/postgres/Dockerfile

@@ -1,9 +1,26 @@
 FROM postgres:15-alpine
+
+# Install dcron and su-exec for user switching
+RUN apk update && apk add --no-cache dcron su-exec
+
+# Copy SQL dump and PostgreSQL configuration
 COPY ./scripts/restore-2024-04-25-22-06-17.sql /docker-entrypoint-initdb.d/
-COPY ./postgresql.conf /postgresql.conf
-# create log file for postgres and give read write permission to all users
+COPY ./scripts/postgresql.conf /postgresql.conf
+
+# Create log directory and set permissions
 RUN mkdir -p /var/log/pg_log && \
   chown -R postgres:postgres /var/log/pg_log && \
   chmod -R 755 /var/log/pg_log
 
-CMD ["postgres", "-c", "config_file=/postgresql.conf"]
+# Copy the cron job file
+COPY ./scripts/cleanup-cron /etc/crontabs/root
+
+# Copy and set the entrypoint script
+COPY ./scripts/start-services.sh /usr/local/bin/start-services.sh
+RUN chmod +x /usr/local/bin/start-services.sh
+
+# Use the custom entrypoint script
+ENTRYPOINT ["/usr/local/bin/start-services.sh"]
+
+# Default command
+CMD ["postgres", "-c", "config_file=/postgresql.conf"]

services/postgres/scripts/cleanup-cron

@@ -0,0 +1 @@
+*/1 * * * * /usr/bin/find /var/log/pg_log/ -type f -name "*" -mmin +5 -delete >> /var/log/cron.log 2>&1

services/postgres/postgresql.conf services/postgres/scripts/postgresql.confservices/postgres/postgresql.conf renamed to services/postgres/scripts/postgresql.conf

@@ -437,7 +437,7 @@ logging_collector = on                   # Enable capturing of stderr and  csvlo
 # These are only used if logging_collector is on:
 log_directory = '/var/log/pg_log'                  # directory where log files are written,
                                         # can be absolute or relative to PGDATA
-log_filename = 'postgresql_logs'        # log file name pattern,
+log_filename = 'postgresql-%Y-%m-%d_%H-%M'  # log file name pattern,
                                         # can include strftime() escapes
 log_file_mode = 0644                   # creation mode for log files,
                                         # begin with 0 to use octal notation
@@ -449,7 +449,7 @@ log_truncate_on_rotation = on         # If on, an existing log file with the
                                         # or size-driven rotation.  Default is
                                         # off, meaning append to existing files
                                         # in all cases.
-log_rotation_age = '2min'                  # Automatic rotation of logfiles will
+log_rotation_age = '4min'                  # Automatic rotation of logfiles will
                                         # happen after that time.  0 disables.
 log_rotation_size = 0               # Automatic rotation of logfiles will
                                         # happen after that much log output.
@@ -524,7 +524,7 @@ log_min_duration_statement = 0       # -1 is disabled, 0 logs all statements
 #log_checkpoints = off
 #log_connections = off
 #log_disconnections = off
-log_duration = on
+# log_duration = on
 #log_error_verbosity = default          # terse, default, or verbose messages
 #log_hostname = off
 log_line_prefix= '%m [%p] %d %a %u %h %c '           # special values:
@@ -556,7 +556,7 @@ log_line_prefix= '%m [%p] %d %a %u %h %c '           # special values:
 #log_parameter_max_length_on_error = 0  # when logging an error, limit logged
                                         # bind-parameter values to N bytes;
                                         # -1 means print in full, 0 disables
-log_statement = 'all'                   # none, ddl, mod, all
+#log_statement = 'all'                   # none, ddl, mod, all
 #log_replication_commands = off
 #log_temp_files = -1                    # log temporary files equal or larger
                                         # than the specified size in kilobytes;

services/postgres/scripts/start-services.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Start cron as root
+crond -f &
+
+# Ensure data directory has correct permissions
+chown -R postgres:postgres /var/lib/postgresql/data
+chmod -R 0700 /var/lib/postgresql/data
+
+# Switch to the postgres user and start PostgreSQL using the original entrypoint
+exec su-exec postgres docker-entrypoint.sh "$@"