Merge branch 'master' into dev_zabbix-agent

Author: casperr0

.travis.yml

@@ -6,7 +6,7 @@ services:
 before_install:
 - docker pull centos:6
 - docker pull centos:7
-- docker pull debian:7
+- docker pull debian:9
 
 script:
 - make test

Makefile.tests

@@ -5,4 +5,4 @@ run_builds:
 	docker run --rm -v "$(WORKDIR)":/var/tmp debian:9 /bin/bash -ex "/var/tmp/tests/build_deb.sh"
 
 run_functional_tests:
-	docker run --rm -v "$(WORKDIR)":/var/tmp centos:6 /bin/bash -ex "/var/tmp/tests/check.sh"
+	docker run --rm -v "$(WORKDIR)":/var/tmp centos:6 /bin/bash -ex "/var/tmp/tests/check.sh"

README.rst

@@ -280,7 +280,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

@@ -21,8 +21,7 @@ def run(self, zbx):
 
         start_time = time.time()
         Pooler.query(self.query_health)
-        zbx.send(self.key_ping.format('[]'), (time.time() - start_time) * 100)
-
+        zbx.send(self.key_ping.format('[]'), (time.time() - start_time) * 1000)
         result = Pooler.query(self.query_uptime)
         zbx.send(self.key_uptime.format('[]'), int(result[0][0]))
 

mamonsu/plugins/pgsql/oldest.py

@@ -10,20 +10,21 @@ class Oldest(Plugin):
     OldestXidSql = "select greatest(max(age(backend_xmin)), max(age(backend_xid))) from pg_catalog.pg_stat_activity;"
 
     OldestXidSql_bootstrap = "select public.mamonsu_get_oldest_xid();"
-    OldestQuerySql = "select case when extract(epoch from max(now() - xact_start)) is not null 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%%'; "
 
     # OldestQuery = " SELECT query FROM pg_catalog.pg_stat_activity WHERE extract(epoch FROM (now() - query_start))=(SELECT " \
     #               "extract(epoch from max(now() - query_start)) FROM pg_catalog.pg_stat_activity) and pid not " \
     #               "in (select pid from pg_stat_replication) AND pid <> pg_backend_pid() AND query not ilike '%%VACUUM%%';"
-
-    OldestQuerySql_bootstrap = "select public.mamonsu_get_oldest_query();"
+    OldestQuerySql = "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(); "
+    OldestQuerySql_bootstrap = """
+select public.mamonsu_get_oldest_query();
+"""
 
     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):
@@ -35,13 +36,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': self.right_type(self.key, 'query_time'),
+                'key': self.right_type(self.key, 'transaction_time'),
                 'color': '00CC00'
             }]
         })
@@ -61,8 +62,9 @@ def items(self, template):
             'delay': self.plugin_config('interval'),
             'value_type': Plugin.VALUE_TYPE.numeric_unsigned
         }) + template.item({
-            'key': self.right_type(self.key, 'query_time'),
-            'name': 'PostgreSQL: oldest query running time in sec',
+
+            'key': self.right_type(self.key, 'transaction_time'),
+            'name': 'PostgreSQL: oldest transaction running time in sec',
             'delay': self.plugin_config('interval'),
             'units': Plugin.UNITS.s
         })
@@ -74,8 +76,8 @@ def triggers(self, template):
                           '.last()}&gt;' + self.plugin_config('max_xid_age')
         }) + template.trigger({
             'name': 'PostgreSQL query running is too old on {HOSTNAME}',
-            'expression': '{#TEMPLATE:' + self.right_type(self.key, 'query_time') +
-                          '.last()}&gt;' + self.plugin_config('max_query_time')
+            'expression': '{#TEMPLATE:' + self.right_type(self.key, 'transaction_time') +
+                          '.last()}&gt;' + self.plugin_config('max_transaction_time')
         })
 
     def keys_and_queries(self, template_zabbix):

mamonsu/plugins/system/linux/disk_sizes.py

@@ -26,8 +26,8 @@ class DiskSizes(Plugin):
         'pstore', 'devtmpfs', 'autofs',
         'cgroup', 'configfs', 'devpts',
         'efivarfs', 'fusectl', 'fuse.gvfsd-fuse',
-        'hugetlbfs', 'mqueue',
-        'nfsd', 'proc', 'pstore',
+        'hugetlbfs', 'mqueue', 'binfmt_misc',
+        'nfsd', 'proc', 'pstore', 'selinuxfs'
         'rpc_pipefs', 'securityfs', 'sysfs',
         'nsfs', 'tmpfs', 'tracefs']
 

mamonsu/tools/bootstrap/sql.py

@@ -68,15 +68,17 @@
 
 CREATE or REPLACE FUNCTION public.mamonsu_get_oldest_query()
 RETURNS DOUBLE PRECISION AS $$
-    SELECT
-        CASE 
-        WHEN extract(epoch from max(now() - xact_start)) IS NOT NULL 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%%'   
+    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()