Merge branch 'dev'

Author: casperr0

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 -v "$(WORKDIR)":/var/tmp centos:7 /bin/bash -ex "/var/tmp/tests/check.sh"

README.rst

@@ -46,20 +46,20 @@ Install from git:
 
 .. code-block:: bash
 
-    $ git clone ... && cd mamonsu && python setup.py build && python setup.py install
+    $ git clone ... && cd mamonsu && python3 setup.py build && python3 setup.py install
 
 Build deb:
 
 .. code-block:: bash
 
-    $ apt-get install make dpkg-dev debhelper python-dev python-setuptools
+    $ apt-get install make dpkg-dev debhelper python3-dev python3-setuptools
     $ git clone ... && cd mamonsu && make deb && dpkg -i mamonsu*.deb
 
 Build rpm:
 
 .. code-block:: bash
 
-    $ yum install make rpm-build python2-devel python-setuptools
+    $ yum install make rpm-build python3-devel python3-setuptools
     $ git clone ... && cd mamonsu && make rpm && rpm -i mamonsu*.rpm
 
 Build repository, `./packaging/repo/gnupg` and `./packaging/repo/rpmmacros` must be provided by caller:

examples/pg_stat_activity.py

@@ -83,7 +83,6 @@ def run(self, zbx):
         # send a resulting value to zabbix
         for idx, item in enumerate(self.Items):
             key, zbxkey, val, delta = item[0], item[1], 0, item[4]
-            #self.log.info('{0}[{1}] '.format(zbxkey, key)+str(idx))
             for row in result:
                 if key.endswith(row[0]):
                     val = row[item[5]]

mamonsu/__init__.py

@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = 'info@postgrespro.ru'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '2.4.5'
+__version__ = '2.5.0'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'
@@ -12,7 +12,6 @@
     'Operating System :: POSIX :: Linux',
     'Operating System :: Microsoft :: Windows',
     'License :: OSI Approved :: BSD License',
-    'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 3',
     'Topic :: System :: Monitoring'
 ]

mamonsu/lib/config.py

@@ -10,10 +10,8 @@
 from mamonsu.plugins.pgsql.driver.checks import is_conn_to_db
 from mamonsu.lib.default_config import DefaultConfig
 
-if platform.PY2:
-    import ConfigParser as configparser
-else:
-    import configparser
+
+import configparser
 
 
 class Config(DefaultConfig):
@@ -76,7 +74,7 @@ def __init__(self, cfg_file=None, plugin_directories=None):
             sys.exit(1)
         else:
             if cfg_file is not None:
-                self.config.readfp(open(cfg_file))
+                self.config.read_file(open(cfg_file))
 
         plugins = self.fetch('plugins', 'directory', str)
         if plugins is not None:

mamonsu/lib/const.py

@@ -1,7 +1,6 @@
 from collections import namedtuple
 
 from mamonsu import __version__
-import mamonsu.lib.platform as platform
 
 
 class _template(object):
@@ -27,20 +26,11 @@ class _template(object):
 
 class _api(object):
 
-    if platform.PY2:
-        UNKNOWN_VERSION = 'UNKNOWN_API_VERSION\n'
-    else:
-        UNKNOWN_VERSION = b'UNKNOWN_API_VERSION\n'
+    UNKNOWN_VERSION = b'UNKNOWN_API_VERSION\n'
 
-    if platform.PY2:
-        METRIC_NOT_FOUND = 'METRIC_NOT_FOUND\n'
-    else:
-        METRIC_NOT_FOUND = b'METRIC_NOT_FOUND\n'
+    METRIC_NOT_FOUND = b'METRIC_NOT_FOUND\n'
 
-    if platform.PY2:
-        VERSION = '{0}'.format(__version__)
-    else:
-        VERSION = bytearray('{0}'.format(__version__), 'utf-8')
+    VERSION = bytearray('{0}'.format(__version__), 'utf-8')
 
     METRIC_LIST_URLS = ['/list', '/list/']
     METRIC_GET_URLS = ['/get', '/get/']

mamonsu/lib/get_keys.py

@@ -5,11 +5,11 @@
 class GetKeys(object):
     plg_type = 'all'
 
-    def txt(self, type, plugins=None):
+    def txt(self, plg_type, plugins=None):
         # sort plugins!
         if plugins is None:
             plugins = []
-        self.plg_type = type
+        self.plg_type = plg_type
         plugins.sort(key=lambda x: x.__class__.__name__)
         # create template
         template_data = self._get_all('keys_and_queries', plugins)  # get data from all plugins

mamonsu/lib/platform.py

@@ -4,11 +4,4 @@
 WINDOWS = (sys.platform == 'win32' or sys.platform == 'win64')
 FREEBSD = ('freebsd' in sys.platform)
 UNIX = LINUX or FREEBSD
-
-PY2 = (sys.version_info[0] == 2)
-PY3 = (sys.version_info[0] == 3)
-
-if PY2:
-    INTEGER_TYPES = (int, long)
-if PY3:
-    INTEGER_TYPES = int,
+INTEGER_TYPES = int,

mamonsu/lib/plugin.py

@@ -33,7 +33,7 @@ class Plugin(object):
     Interval = 60
 
     # plugin config
-    DEFAULT_CONFIG = {}  # type: dict[str, str]
+    DEFAULT_CONFIG = {}  # type
 
     _thread = None  # type: Thread
     _sender = False

mamonsu/lib/runner.py

@@ -13,7 +13,6 @@
 from mamonsu.lib.plugin import Plugin
 from mamonsu.lib.zbx_template import ZbxTemplate
 from mamonsu.lib.get_keys import GetKeys
-from distutils.version import LooseVersion
 from mamonsu.plugins.system.linux.scripts import Scripts
 
 
@@ -86,8 +85,8 @@ def quit_handler(_signo=None, _stack_frame=None):
                 if len(commands) == 2:
                     commands.append('postgrespro_agent.conf')
                 for klass in Plugin.only_child_subclasses():
-                    if klass.__name__ != "PgWaitSampling" and  klass.__name__ != "Cfs":
-                            plugins.append(klass(cfg))
+                    if klass.__name__ != "PgWaitSampling" and klass.__name__ != "Cfs":
+                        plugins.append(klass(cfg))
                 args.plugin_type = correct_plugin_type(args.plugin_type)
                 if args.plugin_type == 'pg' or args.plugin_type == 'sys' or args.plugin_type == 'all':
                     template = GetKeys()
@@ -111,7 +110,7 @@ def quit_handler(_signo=None, _stack_frame=None):
                         Plugin.PATH = path
                     # create directory for scripts along the path of conf file if needed
                     if not os.path.exists(path):
-                            os.makedirs(path)
+                        os.makedirs(path)
                     for key in Scripts.Bash:
                         with codecs.open(path + "/" + key + ".sh", 'w+', 'utf-8') as f:
                             #   configuration file for zabbix-agent is generated for selected plugin-type
@@ -139,7 +138,7 @@ def quit_handler(_signo=None, _stack_frame=None):
                 if len(commands) == 2:
                     commands.append('postgrespro.xml')
                 for klass in Plugin.only_child_subclasses():
-                        plugins.append(klass(cfg))
+                    plugins.append(klass(cfg))
                 template = ZbxTemplate(args.template, args.application)
                 try:
                     fd = codecs.open(commands[2], 'w', 'utf-8')
@@ -158,7 +157,7 @@ def quit_handler(_signo=None, _stack_frame=None):
                 if args.plugin_type == 'pg' or args.plugin_type == 'sys' or args.plugin_type == 'all':
                     for klass in Plugin.only_child_subclasses():
                         if klass.__name__ != "PgWaitSampling" and klass.__name__ != "Cfs":  # check if plugin is for EE
-                                plugins.append(klass(cfg))
+                            plugins.append(klass(cfg))
                     template = ZbxTemplate(args.template, args.application)
                     try:
                         fd = codecs.open(commands[2], 'w', 'utf-8')
@@ -243,7 +242,7 @@ def correct_plugin_type(plugin_type):
             print("Got equal plugin types. See help 'mamonsu -- help' ")
             sys.exit(2)
         # if plugin type name is wrong
-        if False in [type in valid_plugin_types for type in types]:
+        if False in [t in valid_plugin_types for t in types]:
             print("Got wrong plugin types. See help 'mamonsu -- help' ")
             sys.exit(2)
         else:

mamonsu/lib/sender.py

@@ -15,10 +15,10 @@ def __init__(self):
     def _hash(self, key, host=None):
         return '{0}_+_{1}'.format(host, key)
 
-    def _key_from_hash(self, hash, host=None):
-        result = hash.split('{0}_+_'.format(host))
+    def _key_from_hash(self, hash_string, host=None):
+        result = hash_string.split('{0}_+_'.format(host))
         if len(result) == 1:
-            return hash
+            return hash_string
         else:
             return result[1]
 

mamonsu/lib/senders/zbx.py

@@ -7,9 +7,7 @@
 import socket
 import json
 import logging
-import encodings.idna
 
-import mamonsu.lib.platform as platform
 from mamonsu.lib.plugin import Plugin
 from mamonsu.lib.queue import Queue
 from itertools import islice
@@ -102,10 +100,7 @@ def send_file_to_zabbix(self, path):
 
     def _send_data(self, data):
         data_len = struct.pack('<Q', len(data))
-        if platform.PY3:
-            packet = b'ZBXD\x01' + data_len + str.encode(data)
-        else:
-            packet = 'ZBXD\x01' + data_len + data
+        packet = b'ZBXD\x01' + data_len + str.encode(data)
         try:
             sock = socket.socket()
             sock.connect((self.host, self.port))

mamonsu/lib/zbx_template.py

@@ -117,12 +117,12 @@ def turn_agent_type(self, xml):
         xml = re.sub(r"<type>2", "<type>0", xml)
         return xml
 
-    def xml(self, type, plugins=None):
+    def xml(self, plg_type, plugins=None):
         # sort plugins!
         if plugins is None:
             plugins = []
         plugins.sort(key=lambda x: x.__class__.__name__)
-        self.plg_type = type
+        self.plg_type = plg_type
         # create template
         template_data = {'template': self.Template, 'application': self.Application}
         if Plugin.Type == 'agent':

mamonsu/plugins/pgsql/__init__.py

@@ -4,5 +4,7 @@
 __all__ += ['checkpoint', 'oldest', 'pg_locks']
 __all__ += ['cfs']
 __all__ += ['archive_command']
+__all__ += ['relations_size']
+__all__ += ['prepared_transaction']
 
 from . import *

mamonsu/plugins/pgsql/driver/connection.py

@@ -12,7 +12,7 @@ class ConnectionInfo(object):
     def __init__(self, connection_hash=None):
         if connection_hash is None:
             connection_hash = {}
-        self.host = connection_hash.get('host') or os.environ.get('PGHOST')
+        self.host = connection_hash.get('host') or (os.environ.get('PGHOST') or "localhost")
         self.port = connection_hash.get('port') or int(os.environ.get('PGPORT') or 5432)
         self.user = connection_hash.get('user') or os.environ.get('PGUSER')
         self.passwd = connection_hash.get('passwd') or os.environ.get('PGPASSWORD')