Skip to content

Support log shipping extension (default: csv/log) #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nithyashree675 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

Support log shipping extension (default: csv/log) #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ENVIRONMENT.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ Environment Configuration Settings
- **LOG_S3_TAGS**: map of key value pairs to be used for tagging files uploaded to S3. Values should be referencing existing environment variables e.g. ``{"ClusterName": "SCOPE", "Namespace": "POD_NAMESPACE"}``
- **LOG_SHIP_HOURLY**: if true, log rotation in Postgres is set to 1h incl. foreign tables for every hour (schedule `1 */1 * * *`)
- **LOG_SHIP_SCHEDULE**: cron schedule for shipping compressed logs from ``pg_log`` (``1 0 * * *`` by default)
- **LOG_FILE_EXTENSION**: (optional) extension of the files in PGDATA/pgroot/pg_log to be shipped to S3 (csv by default)
- **LOG_ENV_DIR**: directory to store environment variables necessary for log shipping
- **LOG_TMPDIR**: directory to store temporary compressed daily log files. PGROOT/../tmp by default.
- **LOG_S3_ENDPOINT**: (optional) S3 Endpoint to use with Boto3
Expand Down
4 changes: 3 additions & 1 deletion postgres-appliance/scripts/configure_spilo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,7 @@ def get_placeholders(provider):
placeholders.setdefault('LOG_GROUP_BY_DATE', False)
placeholders.setdefault('LOG_SHIP_HOURLY', '')
placeholders.setdefault('LOG_SHIP_SCHEDULE', '1 0 * * *')
placeholders.setdefault('LOG_FILE_EXTENSION', 'csv')
placeholders.setdefault('LOG_S3_BUCKET', '')
placeholders.setdefault('LOG_S3_ENDPOINT', '')
placeholders.setdefault('LOG_S3_TAGS', '{}')
Expand Down Expand Up @@ -802,7 +803,8 @@ def write_log_environment(placeholders):
'LOG_S3_KEY',
'LOG_S3_BUCKET',
'LOG_S3_TAGS',
'PGLOG'):
'PGLOG',
'LOG_FILE_EXTENSION'):
write_file(log_env[var], os.path.join(log_env['LOG_ENV_DIR'], var), True)


Expand Down
4 changes: 2 additions & 2 deletions postgres-appliance/scripts/upload_pg_log_to_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ def get_file_names():
prev_interval_number = prev_interval.strftime('%u-%H')
upload_filename = prev_interval.strftime('%F-%H')

log_file = os.path.join(os.getenv('PGLOG'), 'postgresql-' + prev_interval_number + '.csv')
archived_log_file = os.path.join(os.getenv('LOG_TMPDIR'), upload_filename + '.csv.gz')
log_file = os.path.join(os.getenv('PGLOG'), 'postgresql-' + prev_interval_number + '.' + os.getenv('LOG_FILE_EXTENSION'))
archived_log_file = os.path.join(os.getenv('LOG_TMPDIR'), upload_filename + '.' + os.getenv('LOG_FILE_EXTENSION') + '.gz')

return log_file, archived_log_file

Expand Down