Merge remote-tracking branch 'origin' into dev

Author: dmpgpro

Makefile.pkg

@@ -45,10 +45,10 @@ build/all: build/pkg_debian build/pkg_ubuntu build/pkg_centos
 	@echo Build for all platform: done
 	touch build/all
 
-build/pkg_debian: build/pkg_debian_7 build/pkg_debian_8
+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: build/pkg_ubuntu_14_04 build/pkg_ubuntu_16_04 build/pkg_ubuntu_17_10
 	@echo Ubuntu: done
 
 build/pkg_centos: build/pkg_centos_6 build/pkg_centos_7
@@ -79,6 +79,10 @@ build/pkg_debian_8:
 	$(call build_deb,debian,jessie)
 	touch build/pkg_debian_8
 
+build/pkg_debian_9:
+	$(call build_deb,debian,stretch)
+	touch build/pkg_debian_9
+
 build/pkg_ubuntu_14_04:
 	$(call build_deb,ubuntu,trusty)
 	touch build/pkg_ubuntu_14_04
@@ -87,6 +91,10 @@ build/pkg_ubuntu_16_04:
 	$(call build_deb,ubuntu,xenial)
 	touch build/pkg_ubuntu_16_04
 
+build/pkg_ubuntu_17_10:
+	$(call build_deb,ubuntu,artful)
+	touch build/pkg_ubuntu_17_10
+
 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.2'
+__version__ = '2.3.3'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'

mamonsu/lib/parser.py

@@ -9,7 +9,7 @@
     -a, --add-plugins  <directory>
     -c, --config       <file>
     -p, --pid          <pid-file>
-    -d                 run in foreground
+    -d                 daemonize
 
 Export example config with default variables:
 Command: export

mamonsu/plugins/pgsql/driver/pool.py

@@ -21,6 +21,10 @@ class Pool(object):
             "select count(*) from pg_catalog.pg_ls_dir('pg_xlog')",
             'select public.mamonsu_count_xlog_files()'
         ),
+        'count_wal_files': (
+            "select count(*) from pg_catalog.pg_ls_dir('pg_wal')",
+            'select public.mamonsu_count_wal_files()'
+        ),
         'count_autovacuum': (
             """select count(*) from pg_catalog.pg_stat_activity where
 query like '%%autovacuum%%' and state <> 'idle'
@@ -77,7 +81,8 @@ def server_version_greater(self, version, db=None, bootstrap=False):
             db = self._normalize_db(db)
             return self.server_version(db) >= LooseVersion(version)
         else:
-            return str(self._cache['bootstrap']['version']) >= LooseVersion(version)
+            return str(
+                self._cache['bootstrap']['version']) >= LooseVersion(version)
 
     def server_version_less(self, version, db=None, bootstrap=False):
         if not bootstrap:

mamonsu/plugins/pgsql/xlog.py

@@ -17,12 +17,23 @@ def run(self, zbx):
         else:
             Pooler.run_sql_type('replication_lag_master_query')
             # xlog location
-            result = Pooler.query("""
-                select pg_catalog.pg_xlog_location_diff
-                    (pg_catalog.pg_current_xlog_location(),'0/00000000')""")
-            zbx.send('pgsql.wal.write[]', float(result[0][0]), self.DELTA_SPEED)
+            if Pooler.server_version_greater('10.0'):
+                result = Pooler.query("""
+                    select pg_catalog.pg_wal_lsn_diff
+                    (pg_catalog.pg_current_wal_lsn(), '0/00000000')""")
+            else:
+                result = Pooler.query("""
+                    select pg_catalog.pg_xlog_location_diff
+                    (pg_catalog.pg_current_xlog_location(), '0/00000000')""")
+            zbx.send(
+                'pgsql.wal.write[]',
+                float(result[0][0]),
+                self.DELTA_SPEED)
         # count of xlog files
-        result = Pooler.run_sql_type('count_xlog_files')
+        if Pooler.server_version_greater('10.0'):
+            result = Pooler.run_sql_type('count_wal_files')
+        else:
+            result = Pooler.run_sql_type('count_xlog_files')
         zbx.send('pgsql.wal.count[]', int(result[0][0]))
 
     def items(self, template):

mamonsu/tools/bootstrap/sql.py

@@ -26,7 +26,7 @@
 RETURNS void AS $$
   UPDATE public.mamonsu_timestamp_master_{1} SET
     ts = extract(epoch from now() at time zone 'utc')::double precision,
-    lsn = pg_catalog.pg_current_xlog_location()
+    lsn = pg_catalog.pg_current_{4}()
   WHERE
     id = 1;
 $$ LANGUAGE SQL SECURITY DEFINER;
@@ -65,9 +65,9 @@
     FROM pg_catalog.pg_stat_activity
 $$ LANGUAGE SQL SECURITY DEFINER;
 
-CREATE OR REPLACE FUNCTION public.mamonsu_count_xlog_files()
+CREATE OR REPLACE FUNCTION public.mamonsu_count_{3}_files()
 RETURNS BIGINT AS $$
-WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_xlog'))
+WITH list(filename) as (SELECT * FROM pg_catalog.pg_ls_dir('pg_{3}'))
 SELECT
     COUNT(*)::BIGINT
 FROM
@@ -85,9 +85,7 @@
    SUM(CASE isdirty WHEN true THEN 1 ELSE 0 END) * 8 * 1024
 FROM public.pg_buffercache
 $$ LANGUAGE SQL SECURITY DEFINER;
-""".format(
-    mamonsu_version,
-    mamonsu_version.replace('.', '_'), '[0-9A-F]{24}')
+"""
 
 GrantsOnSchemaSQL = """
 ALTER TABLE public.mamonsu_config OWNER TO {1};
@@ -104,7 +102,7 @@
 
 GRANT EXECUTE ON FUNCTION public.mamonsu_get_oldest_query() TO {1};
 
-GRANT EXECUTE ON FUNCTION public.mamonsu_count_xlog_files() TO {1};
+GRANT EXECUTE ON FUNCTION public.mamonsu_count_{2}_files() TO {1};
 
 GRANT EXECUTE ON FUNCTION public.mamonsu_buffer_cache() TO {1};
 """

mamonsu/tools/bootstrap/start.py

@@ -146,11 +146,18 @@ def run_deploy():
         sys.exit(1)
 
     if not Pooler.is_superuser():
-        sys.stderr.write("ERROR: Bootstrap must be run by PostgreSQL superuser\n")
+        sys.stderr.write(
+            "ERROR: Bootstrap must be run by PostgreSQL superuser\n")
         sys.exit(1)
 
     try:
-        for sql in CreateSchemaSQL.split(QuerySplit):
+        for sql in CreateSchemaSQL.format(
+                mamonsu_version,
+                mamonsu_version.replace('.', '_'),
+                '[0-9A-F]{24}',
+                'wal' if Pooler.server_version_greater('10.0') else 'xlog',
+                'wal_lsn' if Pooler.server_version_greater('10.0') else 'xlog_location'
+                ).split(QuerySplit):
             if args.args.verbose:
                 sys.stdout.write("\nExecuting query:\n{0}\n".format(sql))
             Pooler.query(sql)
@@ -160,7 +167,10 @@ def run_deploy():
 
     try:
         for sql in GrantsOnSchemaSQL.format(
-            mamonsu_version.replace('.', '_'), args.args.mamonsu_username).split(QuerySplit):
+                mamonsu_version.replace('.', '_'),
+                args.args.mamonsu_username,
+                'wal' if Pooler.server_version_greater('10.0') else 'xlog'
+                ).split(QuerySplit):
             if args.args.verbose:
                 sys.stdout.write("\nExecuting query:\n{0}\n".format(sql))
             Pooler.query(sql)

packaging/debian/changelog

@@ -1,3 +1,9 @@
+mamonsu (2.3.3-1) stable; urgency=low
+
+  * PostgreSQL 10 support
+
+ -- PostgresPro DBA <[email protected]>  Fri, 19 Jan 2017 11:00:00 +0300
+
 mamonsu (2.3.2-1) stable; urgency=low
 
   * bootstrap fixes

packaging/rpm/SPECS/mamonsu.spec

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        2.3.2
+Version:        2.3.3
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,6 +70,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Tue Dec 12 2017 Grigory Smolkin <[email protected]> - 2.3.2-1
+- PostgreSQL 10 support
+
 * Tue Dec 12 2017 Grigory Smolkin <[email protected]> - 2.3.2-1
 - bootstrap fixes
 

packaging/win/mamonsu.def.nsh

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