fix: added pooler custom parameters for XLOG plugin

Author: cuprumtan

mamonsu/plugins/pgsql/driver/pool.py

@@ -14,13 +14,9 @@ class Pool(object):
             "    END",
             'select mamonsu.timestamp_get()'
         ),
-        'count_xlog_files': (
-            "WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_xlog')) SELECT COUNT(*)::BIGINT FROM list WHERE filename similar to '[0-9A-F]{24}'",
-            'select mamonsu.count_xlog_files()'
-        ),
         'count_wal_files': (
-            "WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_wal')) SELECT COUNT(*)::BIGINT FROM list WHERE filename similar to '[0-9A-F]{24}'",
-            'select mamonsu.count_wal_files()'
+            "WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_{0}')) SELECT COUNT(*)::BIGINT FROM list WHERE filename similar to '[0-9A-F]{24}'",
+            'select mamonsu.count_{0}_files()'
         ),
         'count_autovacuum': (
             "select count(*) from pg_catalog.pg_stat_activity where "
@@ -37,19 +33,12 @@ class Pool(object):
         ),
         'wal_lag_lsn': (
             "SELECT application_name, " \
-            " flush_lag, replay_lag, write_lag, " \
-            " pg_wal_lsn_diff(pg_current_wal_lsn(), replay_lsn) AS total_lag " \
+            " {0} " \
+            " pg_{1}_{2}_diff(pg_current_{1}_{2}(), replay_{2}) AS total_lag " \
             " FROM pg_stat_replication;",
             " SELECT application_name, " \
-            " flush_lag, replay_lag, write_lag, total_lag " \
-            " FROM mamonsu.count_wal_lag_lsn()"
-        ),
-        'xlog_lag_lsn': (
-            "SELECT application_name, " \
-            "pg_xlog_location_diff(pg_current_xlog_location(), replay_location) AS total_lag  " \
-            "FROM pg_stat_replication;",
-            "SELECT application_name, total_lag "\
-            "FROM mamonsu.count_xlog_lag_lsn()"
+            " {0} total_lag " \
+            " FROM mamonsu.count_{1}_lag_lsn()"
         ),
     }
 

mamonsu/plugins/pgsql/xlog.py

@@ -67,7 +67,9 @@ def run(self, zbx):
         else:
             if Pooler.server_version_greater('10.0'):
                 result = Pooler.query(self.query_wal_lsn_diff)
-                result_lags = Pooler.run_sql_type('wal_lag_lsn')
+                result_lags = Pooler.run_sql_type('wal_lag_lsn', args=[' flush_lag, replay_lag, write_lag, ',
+                                                                       'wal',
+                                                                       'lsn'])
                 if result_lags:
                     lags = []
                     for info in result_lags:
@@ -84,7 +86,9 @@ def run(self, zbx):
                     del lags
             else:
                 result = Pooler.query(self.query_xlog_lsn_diff)
-                result_lags = Pooler.run_sql_type('xlog_lag_lsn')
+                result_lags = Pooler.run_sql_type('wal_lag_lsn', args=[' ',
+                                                                       'xlog',
+                                                                       'location'])
                 if result_lags:
                     lags = []
                     for info in result_lags:
@@ -99,9 +103,9 @@ def run(self, zbx):
 
         # count of xlog files
         if Pooler.server_version_greater('10.0'):
-            result = Pooler.run_sql_type('count_wal_files')
+            result = Pooler.run_sql_type('count_wal_files', args=['wal'])
         else:
-            result = Pooler.run_sql_type('count_xlog_files')
+            result = Pooler.run_sql_type('count_wal_files', args=['xlog'])
         zbx.send(self.key_count_wall.format("[]"), int(result[0][0]))
 
         non_active_slots = Pooler.query("""SELECT count(*) FROM pg_replication_slots WHERE active = 'false';""")