Merge branch 'master' of https://github.com/postgrespro/mamonsu

Author: dmpgpro

Makefile.pkg

@@ -48,7 +48,7 @@ build/all: build/pkg_debian build/pkg_ubuntu build/pkg_centos
 build/pkg_debian: build/pkg_debian_7 build/pkg_debian_8 build/pkg_debian_9
 	@echo Debian: done
 
-build/pkg_ubuntu: build/pkg_ubuntu_14_04 build/pkg_ubuntu_16_04 build/pkg_ubuntu_17_10
+build/pkg_ubuntu: build/pkg_ubuntu_14_04 build/pkg_ubuntu_16_04 build/pkg_ubuntu_17_10 build/pkg_ubuntu_18_04
 	@echo Ubuntu: done
 
 build/pkg_centos: build/pkg_centos_6 build/pkg_centos_7
@@ -95,6 +95,10 @@ build/pkg_ubuntu_17_10:
 	$(call build_deb,ubuntu,artful)
 	touch build/pkg_ubuntu_17_10
 
+build/pkg_ubuntu_18_04:
+	$(call build_deb,ubuntu,bionic)
+	touch build/pkg_ubuntu_18_04
+
 build/pkg_centos_6:
 	$(call build_rpm,centos,6)
 	touch build/pkg_centos_6

mamonsu/__init__.py

@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = '[email protected]'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '2.3.3'
+__version__ = '2.3.4'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'

mamonsu/plugins/pgsql/cfs.py

@@ -20,7 +20,7 @@ class Cfs(Plugin):
     pg_catalog.pg_class as c
     left join pg_catalog.pg_namespace n on n.oid = c.relnamespace
 where c.reltablespace in (select oid from pg_catalog.pg_tablespace where spcoptions::text ~ 'compression')
-    and c.relkind IN ('r','v','m','S','f','')
+    and c.relkind IN ('r','v','m','S','f','p','')
     and cfs_compression_ratio(c.oid::regclass) <> 'NaN'
 
 union all
@@ -33,7 +33,7 @@ class Cfs(Plugin):
     pg_catalog.pg_class as c
     left join pg_catalog.pg_namespace n on n.oid = c.relnamespace
 where c.reltablespace in (select oid from pg_catalog.pg_tablespace where spcoptions::text ~ 'compression')
-    and c.relkind = 'i' and n.nspname <> 'pg_toast'
+    and c.relkind = 'i'
     and cfs_compression_ratio(c.oid::regclass) <> 'NaN';
 """
 
@@ -52,6 +52,7 @@ def run(self, zbx):
         if self.plugin_config('force_enable') == 'False':
             self.disable_and_exit_if_not_pgpro_ee()
 
+        # tick every 100 seconds
         if self.ratioCounter == self.ratioInterval:
             relations, compressed_size, non_compressed_size = [], 0, 0
             for db in Pooler.databases():
@@ -62,7 +63,15 @@ def run(self, zbx):
                     non_compressed_size += row[2] * row[1]
                     zbx.send('pgsql.cfs.compress_ratio[{0}]'.format(relation_name), row[1])
             zbx.send('pgsql.cfs.discovery_compressed_relations[]', zbx.json({'data': relations}))
-            zbx.send('pgsql.cfs.activity[total_compress_ratio]', non_compressed_size / compressed_size)
+            if compressed_size > 0:
+                zbx.send(
+                    'pgsql.cfs.activity[total_compress_ratio]',
+                    non_compressed_size / compressed_size)
+            else:
+                zbx.send(
+                    'pgsql.cfs.activity[total_compress_ratio]',
+                    0.0)
+
             del(relations, compressed_size, non_compressed_size)
             self.ratioCounter = 0
         self.ratioCounter += 1

mamonsu/plugins/pgsql/connections.py

@@ -16,8 +16,14 @@ class Connections(Plugin):
 
     def run(self, zbx):
 
-        result = Pooler.query('select state, count(*) \
-            from pg_catalog.pg_stat_activity group by state')
+        if Pooler.is_bootstraped() and Pooler.bootstrap_version_greater('2.3.4'):
+            result = Pooler.query(
+                'select state, count(*) '
+                'from mamonsu_get_connections_states() group by state')
+        else:
+            result = Pooler.query(
+                'select state, count(*) '
+                'from pg_catalog.pg_stat_activity group by state')
         for item in self.Items:
             state, key, val = item[0], item[1], 0
             for row in result:
@@ -28,13 +34,27 @@ def run(self, zbx):
                     break
             zbx.send('pgsql.connections[{0}]'.format(key), float(val))
 
-        result = Pooler.query('select count(*) \
-            from pg_catalog.pg_stat_activity')
+        if Pooler.is_bootstraped() and Pooler.bootstrap_version_greater('2.3.4'):
+            result = Pooler.query(
+                'select count(*) '
+                'from mamonsu_get_connections_states()')
+        else:
+            result = Pooler.query(
+                'select count(*) '
+                'from pg_catalog.pg_stat_activity')
+
         zbx.send('pgsql.connections[total]', int(result[0][0]))
 
         if Pooler.server_version_less('9.5.0'):
-            result = Pooler.query('select count(*) \
-                from pg_catalog.pg_stat_activity where waiting')
+            if Pooler.is_bootstraped() and Pooler.bootstrap_version_greater('2.3.4'):
+                result = Pooler.query(
+                    'select count(*) '
+                    'from mamonsu.mamonsu_get_connections_states() '
+                    'where waiting')
+            else:
+                result = Pooler.query(
+                    'select count(*) '
+                    'from pg_catalog.pg_stat_activity where waiting')
             zbx.send('pgsql.connections[waiting]', int(result[0][0]))
 
     def items(self, template):

mamonsu/plugins/pgsql/driver/pool.py

@@ -5,7 +5,7 @@
 
 class Pool(object):
 
-    ExcludeDBs = ['template0', 'template1', 'postgres']
+    ExcludeDBs = ['template0', 'template1']
 
     SQL = {
         # query type: ( 'if_not_installed', 'if_installed' )
@@ -76,21 +76,21 @@ def server_version(self, db=None):
             result.decode('ascii'))
         return self._cache['server_version']['storage'][db]
 
-    def server_version_greater(self, version, db=None, bootstrap=False):
-        if not bootstrap:
-            db = self._normalize_db(db)
-            return self.server_version(db) >= LooseVersion(version)
-        else:
-            return str(
-                self._cache['bootstrap']['version']) >= LooseVersion(version)
+    def server_version_greater(self, version, db=None):
+        db = self._normalize_db(db)
+        return self.server_version(db) >= LooseVersion(version)
 
-    def server_version_less(self, version, db=None, bootstrap=False):
-        if not bootstrap:
-            db = self._normalize_db(db)
-            return self.server_version(db) <= LooseVersion(version)
-        else:
-            print(self._cache['bootstrap']['version'])
-            return self._cache['bootstrap']['version'] <= LooseVersion(version)
+    def server_version_less(self, version, db=None):
+        db = self._normalize_db(db)
+        return self.server_version(db) <= LooseVersion(version)
+
+    def bootstrap_version_greater(self, version):
+        return str(
+            self._cache['bootstrap']['version']) >= LooseVersion(version)
+
+    def bootstrap_version_less(self, version):
+        return str(
+            self._cache['bootstrap']['version']) <= LooseVersion(version)
 
     def in_recovery(self, db=None):
         db = self._normalize_db(db)
@@ -159,13 +159,15 @@ def is_pgpro_ee(self, db=None):
 
     def extension_installed(self, ext, db=None):
         db = self._normalize_db(db)
-        result = self.query('select count(*) from pg_catalog.pg_extension\
-            where extname = \'{0}\''.format(ext), db)
+        result = self.query(
+            'select count(*) from pg_catalog.pg_extension '
+            'where extname = \'{0}\''.format(ext), db)
         return (int(result[0][0])) == 1
 
     def databases(self):
-        result, databases = self.query('select datname from \
-            pg_catalog.pg_database'), []
+        result, databases = self.query(
+            'select datname from '
+            'pg_catalog.pg_database'), []
         for row in result:
             if row[0] not in self.ExcludeDBs:
                 databases.append(row[0])

mamonsu/plugins/pgsql/oldest.py

@@ -32,7 +32,7 @@ class Oldest(Plugin):
     }
 
     def run(self, zbx):
-        if Pooler.is_bootstraped() and Pooler.server_version_greater('2.3.2', bootstrap=True):
+        if Pooler.is_bootstraped() and Pooler.bootstrap_version_greater('2.3.2'):
             xid = Pooler.query(self.OldestXidSql_bootstrap)[0][0]
             query = Pooler.query(self.OldestQuerySql_bootstrap)[0][0]
         else:

mamonsu/tools/bootstrap/sql.py

@@ -50,6 +50,13 @@
         and pid <> pg_catalog.pg_backend_pid()
 $$ LANGUAGE SQL SECURITY DEFINER;
 
+CREATE OR REPLACE FUNCTION public.mamonsu_get_connections_states()
+RETURNS TABLE(state text) AS $$
+    SELECT
+        state
+    FROM pg_catalog.pg_stat_activity
+$$ LANGUAGE SQL SECURITY DEFINER;
+
 CREATE or REPLACE FUNCTION public.mamonsu_get_oldest_xid()
 RETURNS BIGINT AS $$
     SELECT

mamonsu/tools/bootstrap/start.py

@@ -90,6 +90,9 @@ def try_configure_connect_to_pg(self):
                         "Can't connect as user postgres,"
                         " may be database settings wrong?\n")
                     return False
+                else:
+                    return True
+
             else:
                 sys.stderr.write(
                     "Can't connect with host=auto,"

mamonsu/tools/report/pgsql.py

@@ -308,8 +308,10 @@ def _collect_connections(self):
 
     def _collect_biggest(self):
         result, sizes, sorted_result = {}, {}, OrderedDict({})
-        for info_dbs in Pooler.query('select datname \
-                from pg_catalog.pg_database where datistemplate = false'):
+        for info_dbs in Pooler.query(
+                'select datname '
+                'from pg_catalog.pg_database where datistemplate = false'
+                ):
             try:
                 for info in Pooler.query(self.BigTableInfo[0], info_dbs[0]):
                     table_name = '{0}.{1}'.format(info_dbs[0], info[0])

packaging/debian/changelog

@@ -1,3 +1,9 @@
+mamonsu (2.3.4-1) stable; urgency=low
+
+  * Connections states fix, cfs compression ratio fix
+
+ -- PostgresPro DBA <[email protected]>  Thu, 15 Feb 2018 11:00:00 +0300
+
 mamonsu (2.3.3-1) stable; urgency=low
 
   * PostgreSQL 10 support

packaging/rpm/SPECS/mamonsu.spec

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        2.3.3
+Version:        2.3.4
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,7 +70,10 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
-* Fri Jan 19 2018 Grigory Smolkin <[email protected]> - 2.3.3-1
+* Thu Feb 15 2018 Grigory Smolkin <[email protected]> - 2.3.4-1
+- Connections states fix, cfs compression ratio fix
+
+* Tue Dec 12 2017 Grigory Smolkin <[email protected]> - 2.3.3-1
 - PostgreSQL 10 support
 
 * Tue Dec 12 2017 Grigory Smolkin <[email protected]> - 2.3.2-1

packaging/win/mamonsu.def.nsh

@@ -1,5 +1,5 @@
 !define NAME Mamonsu
-!define VERSION 2.3.3
+!define VERSION 2.3.4
 !define MAMONSU_REG_PATH "Software\PostgresPro\Mamonsu"
 !define MAMONSU_REG_UNINSTALLER_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall"
 !define EDB_REG "SOFTWARE\Postgresql"