From ec687564beae4b0279c8e72cc7605a07aa05395d Mon Sep 17 00:00:00 2001
From: to-bar <46519524+to-bar@users.noreply.github.com>
Date: Fri, 13 Nov 2020 14:55:25 +0100
Subject: [PATCH] Revert "add logrotate config for pgbouncer and filebeat input
 #921 (#1823)" (#1852)

This reverts commit 58652e2a9eab294701054fa03cecf8e5988fc6e9.
---
 .../roles/filebeat/templates/filebeat.yml.j2        | 11 -----------
 .../common/defaults/configuration/postgresql.yml    | 13 -------------
 2 files changed, 24 deletions(-)

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
index c1b8b1974d..9c29b2dcd6 100644
--- 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
@@ -93,17 +93,6 @@ filebeat.inputs:
   {{ k }}: {{ v }}
   {% endfor %}
   {% endif %}
-- type: log
-  enabled: true
-  paths:
-    - /var/log/pgbouncer/*.log*
-  exclude_files: [".gz$"]
-  {% if specification.pgbouncer_input.multiline is defined -%}
-  multiline:
-  {% for k, v in specification.pgbouncer_input.multiline.items() %}
-  {{ k }}: {{ v }}
-  {% endfor %}
-  {% endif %}
 {% endif %}
 
 {% if 'kubernetes_master' in group_names or 'kubernetes_node' in group_names %}
diff --git a/core/src/epicli/data/common/defaults/configuration/postgresql.yml b/core/src/epicli/data/common/defaults/configuration/postgresql.yml
index c28dadca41..4a4b9215d3 100644
--- a/core/src/epicli/data/common/defaults/configuration/postgresql.yml
+++ b/core/src/epicli/data/common/defaults/configuration/postgresql.yml
@@ -121,16 +121,3 @@ specification:
       # to have multiple unique filenames per day when dateext option is set
           dateformat -%Y%m%dH%H
       }
-      /var/log/pgbouncer/pgbouncer.log {
-          missingok
-          notifempty
-          sharedscripts
-          copytruncate
-          size 10M
-          daily
-          create 0640 pgbouncer pgbouncer
-          nodateext
-          postrotate
-          /bin/kill -HUP cat /run/pgbouncer/pgbouncer.pid 2>/dev/null 2> /dev/null || true
-          endscript
-      }