Merge branch 'dev'

Author: cuprumtan

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

@@ -61,7 +61,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.4.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.5.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

@@ -65,7 +65,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.4.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.5.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.4.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.5.5.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.4.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.5.5.conf > /etc/mamonsu/agent.conf
     service mamonsu restart
     sleep 5
     echo && echo && echo "mamonsu version:"

github-actions-tests/sources/agent_3.5.4.conf renamed to github-actions-tests/sources/agent_3.5.5.conf

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

mamonsu/__init__.py

@@ -1,3 +1,6 @@
+mamonsu (3.5.5-1) stable; urgency=low
+  * fixed types mismatch for pgpro_stats and pg_wait_sampling;
+
 mamonsu (3.5.4-1) stable; urgency=low
   * fixed privileges for mamonsu role created by bootstrap;
 

packaging/debian/changelog

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        3.5.4
+Version:        3.5.5
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -73,6 +73,9 @@ chown -R mamonsu.mamonsu /var/log/mamonsu
 chown -R mamonsu.mamonsu /etc/mamonsu
 
 %changelog
+* Tue Jun 13 2023 Alexandra Kuznetsova <[email protected]>  - 3.5.5-1
+  - fixed types mismatch for pgpro_stats and pg_wait_sampling;
+
 * Wed May 17 2023 Alexandra Kuznetsova <[email protected]>  - 3.5.4-1
   - fixed privileges for mamonsu role created by bootstrap;
 

packaging/rpm/SPECS/mamonsu.spec

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