Merge pull request #1 from postgrespro/master

Sync fork from original repository

Author: nikolaev-rd

README.rst

@@ -220,7 +220,7 @@ Metrics:  PostgreSQL
     'PostgreSQL locks: Locks from application': pgsql.pg_locks[sharerowexclusive]
     'PostgreSQL locks: Locks from application or some operation on system catalogs': pgsql.pg_locks[exclusive]
     'PostgreSQL locks: ALTER TABLE, DROP TABLE, TRUNCATE, REINDEX, CLUSTER, VACUUM FULL, LOCK TABLE': pgsql.pg_locks[accessexclusive]
-    'PostgreSQL oldest query running time': pgsql.oldest[query_time]
+    'PostgreSQL oldest transaction running time': pgsql.oldest[transaction_time]
     'PostgreSQL age of oldest xid': pgsql.oldest[xid_age]
     'PostgreSQL waits: Lightweight locks': pgsql.all_lock[lwlock]
     'PostgreSQL waits: Heavyweight locks': pgsql.all_lock[hwlock]

mamonsu/plugins/pgsql/health.py

@@ -13,7 +13,7 @@ def run(self, zbx):
 
         start_time = time.time()
         Pooler.query('select 1 as health')
-        zbx.send('pgsql.ping[]', (time.time() - start_time) * 100)
+        zbx.send('pgsql.ping[]', (time.time() - start_time) * 1000)
 
         result = Pooler.query("select \
             date_part('epoch', now() - pg_postmaster_start_time())")

mamonsu/plugins/pgsql/oldest.py

@@ -17,9 +17,17 @@ class Oldest(Plugin):
 """
 
     OldestQuerySql = """
-select
-    extract(epoch from max(now() - xact_start))
-from pg_catalog.pg_stat_activity;
+SELECT 
+  CASE WHEN extract(epoch from max(now() - xact_start)) IS NOT null 
+        AND extract(epoch from max(now() - xact_start))>0
+    THEN extract(epoch from max(now() - xact_start)) 
+    ELSE 0 
+  END 
+FROM pg_catalog.pg_stat_activity 
+WHERE 
+  pid NOT IN(select pid from pg_stat_replication) AND 
+  pid <> pg_backend_pid() AND 
+  query NOT ilike '%%VACUUM%%';
 """
 
     OldestQuerySql_bootstrap = """
@@ -28,7 +36,7 @@ class Oldest(Plugin):
 
     DEFAULT_CONFIG = {
         'max_xid_age': str(5000 * 60 * 60),
-        'max_query_time': str(5 * 60 * 60)
+        'max_transaction_time': str(5 * 60 * 60)
     }
 
     def run(self, zbx):
@@ -40,13 +48,13 @@ def run(self, zbx):
             query = Pooler.query(self.OldestQuerySql)[0][0]
 
         zbx.send('pgsql.oldest[xid_age]', xid)
-        zbx.send('pgsql.oldest[query_time]', query)
+        zbx.send('pgsql.oldest[transaction_time]', query)
 
     def graphs(self, template):
         result = template.graph({
-            'name': 'PostgreSQL oldest query running time',
+            'name': 'PostgreSQL oldest transaction running time',
             'items': [{
-                'key': 'pgsql.oldest[query_time]',
+                'key': 'pgsql.oldest[transaction_time]',
                 'color': '00CC00'
             }]
         })
@@ -65,8 +73,8 @@ def items(self, template):
             'name': 'PostgreSQL: age of oldest xid',
             'value_type': Plugin.VALUE_TYPE.numeric_unsigned
         }) + template.item({
-            'key': 'pgsql.oldest[query_time]',
-            'name': 'PostgreSQL: oldest query running time in sec',
+            'key': 'pgsql.oldest[transaction_time]',
+            'name': 'PostgreSQL: oldest transaction running time in sec',
             'units': Plugin.UNITS.s
         })
 
@@ -76,7 +84,7 @@ def triggers(self, template):
             'expression': '{#TEMPLATE:pgsql.oldest[xid_age]'
             '.last()}&gt;' + self.plugin_config('max_xid_age')
         }) + template.trigger({
-            'name': 'PostgreSQL query running is too old on {HOSTNAME}',
-            'expression': '{#TEMPLATE:pgsql.oldest[query_time]'
-            '.last()}&gt;' + self.plugin_config('max_query_time')
+            'name': 'PostgreSQL transaction running is too old on {HOSTNAME}',
+            'expression': '{#TEMPLATE:pgsql.oldest[transaction_time]'
+            '.last()}&gt;' + self.plugin_config('max_transaction_time')
         })

mamonsu/tools/bootstrap/sql.py

@@ -67,9 +67,17 @@
 
 CREATE or REPLACE FUNCTION public.mamonsu_get_oldest_query()
 RETURNS DOUBLE PRECISION AS $$
-    SELECT
-        extract(epoch from max(now() - xact_start))
-    FROM pg_catalog.pg_stat_activity
+    SELECT 
+        CASE WHEN extract(epoch from max(now() - xact_start)) IS NOT null 
+              AND extract(epoch from max(now() - xact_start))>0
+            THEN extract(epoch from max(now() - xact_start)) 
+            ELSE 0 
+        END 
+    FROM pg_catalog.pg_stat_activity 
+    WHERE 
+        pid NOT IN(select pid from pg_stat_replication) AND 
+        pid <> pg_backend_pid() AND 
+        query NOT ilike '%%VACUUM%%'
 $$ LANGUAGE SQL SECURITY DEFINER;
 
 CREATE OR REPLACE FUNCTION public.mamonsu_count_{3}_files()