Merge branch 'dev'

Author: mstyushin

.github/workflows/mamonsu-tests-dev.yml

@@ -80,7 +80,7 @@ jobs:
           echo "zabbix_address=$(hostname -I | awk '{print $1}')" >> $GITHUB_OUTPUT
         id: zabbix_address
       - name: Edit Zabbix address in agent.conf
-        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.8.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.9.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

.github/workflows/mamonsu-tests-master.yml

@@ -91,7 +91,7 @@ jobs:
           echo "zabbix_address=$(hostname -I | awk '{print $1}')" >> $GITHUB_OUTPUT
         id: zabbix_address
       - name: Edit Zabbix address in agent.conf
-        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.8.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.9.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

github-actions-tests/mamonsu_build.sh

@@ -41,7 +41,7 @@ if [ "${OS%:*}" = "centos" ]; then
     python3 setup.py build && python3 setup.py install
     make rpm
     sudo rpm -i ./mamonsu*.rpm
-    cat /mamonsu/github-actions-tests/sources/agent_3.5.8.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.5.9.conf > /etc/mamonsu/agent.conf
     systemctl daemon-reload
     systemctl restart mamonsu
     sleep 5
@@ -64,7 +64,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
     python3 setup.py build && python3 setup.py install
     make deb
     sudo dpkg -i ./mamonsu*.deb
-    cat /mamonsu/github-actions-tests/sources/agent_3.5.8.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.5.9.conf > /etc/mamonsu/agent.conf
     service mamonsu restart
     sleep 5
     echo && echo && echo "mamonsu version:"

github-actions-tests/sources/agent_3.5.8.conf renamed to github-actions-tests/sources/agent_3.5.9.conf

@@ -69,7 +69,7 @@ REPO
     eval "${PACKAGE_MANAGER_INSTALL} wget"
     eval "${PACKAGE_MANAGER_INSTALL} bc"
     eval "${PACKAGE_MANAGER_INSTALL} unzip"
-    eval "${PACKAGE_MANAGER_INSTALL} https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+    eval "${PACKAGE_MANAGER_INSTALL} https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
     REPO=${PACKAGE_MANAGER_INSTALL}" https://download.postgresql.org/pub/repos/yum/reporpms/EL-"$(echo ${OS} | sed -r 's/^[^0-9]*([0-9]+).*/\1/')"-x86_64/pgdg-redhat-repo-latest.noarch.rpm"\
 
     # run tests

github-actions-tests/tests.sh

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

mamonsu/__init__.py

@@ -2,12 +2,16 @@
 from collections import defaultdict, deque
 from datetime import datetime as Datetime
 from decimal import Decimal
-from pkg_resources import packaging
 from hashlib import md5
 from itertools import count, islice
 from struct import Struct
 from warnings import warn
 
+try:
+    from pkg_resources import packaging
+except ImportError:
+    import packaging.version
+
 from mamonsu.plugins.pgsql.driver.pg8000 import converters
 from .exceptions import (
     ArrayContentNotSupportedError, DatabaseError, Error, IntegrityError,

mamonsu/plugins/pgsql/driver/pg8000/core.py

@@ -1,6 +1,9 @@
-from pkg_resources import packaging
 from .connection import Connection, ConnectionInfo
 
+try:
+    from pkg_resources import packaging
+except ImportError:
+    import packaging.version
 
 class Pool(object):
     ExcludeDBs = ["template0", "template1"]

mamonsu/plugins/pgsql/driver/pool.py

@@ -4,10 +4,13 @@
 import os
 from .pool import Pooler
 import re
-from pkg_resources import packaging
 import mamonsu.lib.platform as platform
 import posix
 
+try:
+    from pkg_resources import packaging
+except ImportError:
+    import packaging.version
 
 class MemoryLeakDiagnostic(Plugin):
     DEFAULT_CONFIG = {

mamonsu/plugins/pgsql/memory_leak_diagnostic.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
 from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
-from pkg_resources import packaging
 from .pool import Pooler
 from mamonsu.lib.zbx_template import ZbxTemplate
 
+try:
+    from pkg_resources import packaging
+except ImportError:
+    import packaging.version
+
 NUMBER_NON_ACTIVE_SLOTS = 0