Suggestions from code review

to-bar · Nov 27, 2020 · 746eb1e · 746eb1e
1 parent 2f3e42f
commit 746eb1e
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 386 deletions.
diff --git a/CHANGELOG-0.9.md b/CHANGELOG-0.9.md
@@ -4,6 +4,8 @@
 
 ### Added
 
+- [#921](https://github.com/epiphany-platform/epiphany/issues/921) - Implement log rotation for PgBouncer
+
 ### Fixed
 
 - [#1273](https://github.com/epiphany-platform/epiphany/issues/1273) - PostgreSQL replication with repmgr: hot_standby not set in config file

diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/filebeat/tasks/configure-filebeat.yml b/core/src/epicli/data/common/ansible/playbooks/roles/filebeat/tasks/configure-filebeat.yml
@@ -1,6 +1,12 @@
 ---
 # This file is meant to be also used by upgrade playbook
 
+- name: Load defaults from postgresql role
+  include_vars:
+    file: roles/postgresql/defaults/main.yml
+    name: postgresql_defaults
+  when: "'postgresql' in group_names"
+
 - name: Copy configuration file (filebeat.yml)
   template:
     dest: /etc/filebeat/filebeat.yml

diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/filebeat/templates/filebeat.yml.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/filebeat/templates/filebeat.yml.j2
@@ -97,7 +97,7 @@ filebeat.inputs:
 - type: log
   enabled: true
   paths:
-    - /var/log/pgbouncer/pgbouncer.log
+    - {{ postgresql_defaults.pgbouncer.logfile[ansible_os_family] }}*
   exclude_files: [".gz$"]
 {% endif %}
 

diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/postgresql/defaults/main.yml b/core/src/epicli/data/common/ansible/playbooks/roles/postgresql/defaults/main.yml
@@ -29,4 +29,18 @@ repmgr_service_name:
 
 repmgr_config_dir:
   RedHat: /etc/repmgr/10
-  Debian: /etc/postgresql/10/main
+  Debian: /etc/postgresql/10/main
+
+pgbouncer:
+  logfile:
+    RedHat: /var/log/pgbouncer/pgbouncer.log
+    Debian: /var/log/postgresql/pgbouncer.log
+  pidfile:
+    RedHat: /var/run/pgbouncer/pgbouncer.pid
+    Debian: /var/run/postgresql/pgbouncer.pid
+  user:
+    RedHat: pgbouncer
+    Debian: postgres
+  group:
+    RedHat: pgbouncer
+    Debian: postgres