From 33ba691a400f1d62ea731a635e2b86b75fc16c3e Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
Date: Jul 06 2023 22:12:47 +0000
Subject: Merge branch 'monitoring-mirrordb' into 'production'
Drop mb_opensuse2
See merge request infra/salt!661
---
diff --git a/pillar/role/postgresql.sls b/pillar/role/postgresql.sls
index ba4bdfb..306458a 100644
--- a/pillar/role/postgresql.sls
+++ b/pillar/role/postgresql.sls
@@ -2,8 +2,6 @@ profile:
monitoring:
checks:
check_postgres_backends: "/usr/lib/nagios/plugins/check_postgres_backends --warning='-50' --critical='-10'"
- check_postgres_bloat: "/usr/lib/nagios/plugins/check_postgres_bloat --db=mb_opensuse2 --warning='3000 M' --critical='5000 M'"
- check_postgres_last_autovacuum: "/usr/lib/nagios/plugins/check_postgres_last_autovacuum --warning='7d' --critical='14d' --db=mb_opensuse2"
check_postgres_locks: "/usr/lib/nagios/plugins/check_postgres_locks --warning='60' --critical='total=50:waiting=1:exclusive=20'"
check_postgres_wal_files: "/usr/lib/nagios/plugins/check_postgres_wal_files --critical='120' --warning='100'"
diff --git a/salt/profile/postgresql/files/postgresql/pg_hba.conf b/salt/profile/postgresql/files/postgresql/pg_hba.conf
index 0839e2e..d33860c 100644
--- a/salt/profile/postgresql/files/postgresql/pg_hba.conf
+++ b/salt/profile/postgresql/files/postgresql/pg_hba.conf
@@ -97,7 +97,6 @@ host replication postgres 192.168.47.26/32 trust
# mirrordb2
host replication postgres 192.168.47.27/32 trust
#
-local mb_opensuse2 mb password
local all all password
# IPv4 local connections:
host all all 127.0.0.1/32 password
@@ -105,20 +104,11 @@ host all all 127.0.0.1/32 password
host all all ::1/128 password
# remote connections:
-# monitor.infra.opensuse.org (direct for monitoring)
-host mb_opensuse2 mb 192.168.47.7/32 md5
# pgbouncer
host all pgbouncer 192.168.47.4/32 md5
host all pgbouncer 192.168.47.73/32 md5
host all pgbouncer 192.168.47.101/32 md5
host all pgbouncer 192.168.47.102/32 md5
-# pontifex2.infra.opensuse.org
-host mb_opensuse2 mb 192.168.47.73/32 md5
-host mb_opensuse2 mb 192.168.47.101/32 md5
-host mb_opensuse2 mb 192.168.47.102/32 md5
-# olaf.inra.opensuse.org
-host mb_opensuse2 mb 192.168.47.17/32 md5
-host mb_opensuse2 rsyncsize 192.168.47.17/32 md5
# gcc-stats.infra.opensuse.org
host gcc_stats gcc_stats 192.168.47.101/32 md5
host gcc_stats gcc_stats 192.168.47.102/32 md5