Skip to content

Add a size based roll over of artemis and audit log files #210

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ warn_list:
- var-naming[no-role-prefix]
- deprecated-command-syntax
- name[casing]
- no_unspecified_argument

skip_list:
- vars_should_not_be_used
Expand Down
2 changes: 2 additions & 0 deletions molecule/mask_passwords/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
activemq_cors_strict_checking: False
activemq_audit_log_absolute_path: "/var/log/amq/audit.log"
activemq_main_log_absolute_path: "/var/log/amq/artemis.log"
activemq_logger_max_file_size: 104857600 # 100MB in bytes
activemq_logger_audit_max_file_size: 52428800 # 50MB in bytes
activemq_users:
- user: amq
password: amqbrokerpass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ appender.log_file.policies.type = Policies
appender.log_file.policies.cron.type = CronTriggeringPolicy
appender.log_file.policies.cron.schedule = 0 0 0 * * ?
appender.log_file.policies.cron.evaluateOnStartup = true
appender.log_file.policies.size.type = SizeBasedTriggeringPolicy
appender.log_file.policies.size.size = {{ activemq_logger_max_file_size }}
appender.log_file.strategy.type=DefaultRolloverStrategy
appender.log_file.strategy.max={{ activemq_logger_rollover_files }}

Expand All @@ -100,5 +102,7 @@ appender.audit_log_file.policies.type = Policies
appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
appender.audit_log_file.policies.cron.evaluateOnStartup = true
appender.audit_log_file.policies.size.type = SizeBasedTriggeringPolicy
appender.audit_log_file.policies.size.size = {{ activemq_logger_audit_max_file_size }}
appender.audit_log_file.strategy.type=DefaultRolloverStrategy
appender.audit_log_file.strategy.max={{ activemq_logger_audit_rollover_files }}
2 changes: 2 additions & 0 deletions roles/activemq/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@
activemq_logger_rollover_files: 5
activemq_logger_audit_rollover_files: 5
activemq_logger_filepath: /log/artemis.log
activemq_logger_max_file_size: 104857600 # 100MB in bytes

Check warning on line 244 in roles/activemq/defaults/main.yml

View workflow job for this annotation

GitHub Actions / ci / linter (3.11, 2.16)

All role parameters must have a specification: activemq_logger_max_file_size
activemq_logger_audit_max_file_size: 52428800 # 50MB in bytes

Check warning on line 245 in roles/activemq/defaults/main.yml

View workflow job for this annotation

GitHub Actions / ci / linter (3.11, 2.16)

All role parameters must have a specification: activemq_logger_audit_max_file_size

# Metrics
activemq_jmx_exporter_port: 18080
Expand Down
8 changes: 8 additions & 0 deletions roles/activemq/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,14 @@ argument_specs:
default: "{{ activemq_port }}"
type: 'int'
description: "The port number to wait for when activemq_systemd_wait_for_port is true"
activemq_logger_max_file_size:
description: "Maximum size of each regular log file before rollover"
default: 104857600 # 100MB in bytes
type: 'int'
activemq_logger_audit_max_file_size:
description: "Maximum size of each audit log file before rollover"
default: 52428800 # 50MB in bytes
type: 'int'
downstream:
options:
amq_broker_version:
Expand Down
12 changes: 8 additions & 4 deletions roles/activemq/templates/log4j2.properties.j2
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ appender.log_file.policies.type = Policies
appender.log_file.policies.cron.type = CronTriggeringPolicy
appender.log_file.policies.cron.schedule = 0 0 0 * * ?
appender.log_file.policies.cron.evaluateOnStartup = true
appender.log_file.strategy.type=DefaultRolloverStrategy
appender.log_file.strategy.max={{ activemq_logger_rollover_files }}
appender.log_file.policies.size.type = SizeBasedTriggeringPolicy
appender.log_file.policies.size.size = {{ activemq_logger_max_file_size }}
appender.log_file.strategy.type = DefaultRolloverStrategy
appender.log_file.strategy.max = {{ activemq_logger_rollover_files }}

# Audit log file appender
appender.audit_log_file.type = RollingFile
Expand All @@ -99,5 +101,7 @@ appender.audit_log_file.policies.type = Policies
appender.audit_log_file.policies.cron.type = CronTriggeringPolicy
appender.audit_log_file.policies.cron.schedule = 0 0 0 * * ?
appender.audit_log_file.policies.cron.evaluateOnStartup = true
appender.audit_log_file.strategy.type=DefaultRolloverStrategy
appender.audit_log_file.strategy.max={{ activemq_logger_audit_rollover_files }}
appender.audit_log_file.policies.size.type = SizeBasedTriggeringPolicy
appender.audit_log_file.policies.size.size = {{ activemq_logger_audit_max_file_size }}
appender.audit_log_file.strategy.type = DefaultRolloverStrategy
appender.audit_log_file.strategy.max = {{ activemq_logger_audit_rollover_files }}