Merge branch 'dev'

Author: cuprumtan

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

@@ -57,7 +57,7 @@ jobs:
           echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
         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.3.0.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.3.1.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

@@ -61,7 +61,7 @@ jobs:
           echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
         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.3.0.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.3.1.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

@@ -45,7 +45,7 @@ if [ "${OS%:*}" = "centos" ]; then
     chmod -R 777 /var/log/mamonsu/
     sudo mkdir -p /etc/mamonsu
     sudo touch /etc/mamonsu/agent.conf
-    cat /mamonsu/github-actions-tests/sources/agent_3.3.0.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.3.1.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo yum -y install ./mamonsu*.rpm
     systemctl daemon-reload
@@ -74,7 +74,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
     chmod -R 777 /var/log/mamonsu/
     sudo mkdir -p /etc/mamonsu
     sudo touch /etc/mamonsu/agent.conf
-    cat /mamonsu/github-actions-tests/sources/agent_3.3.0.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.3.1.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo apt-get -y install ./mamonsu*.deb
     service mamonsu restart

github-actions-tests/sources/agent_3.3.0.conf renamed to github-actions-tests/sources/agent_3.3.1.conf

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

mamonsu/__init__.py

@@ -1,3 +1,7 @@
+mamonsu (3.3.1-1) stable; urgency=low
+  * fixed logrotate script;
+  * added Server Mode metric and trigger;
+
 mamonsu (3.3.0-1) stable; urgency=low
   * fixed auxiliary extension schema search;
   * fixed WAL metrics definition for native Zabbix agent;

packaging/debian/changelog

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        3.3.0
+Version:        3.3.1
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,6 +70,10 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Wed Feb 2 2022 Alexandra Kuznetsova <[email protected]>  - 3.3.1-1
+  - fixed logrotate script;
+  - added Server Mode metric and trigger;
+
 * Mon Jan 17 2022 Alexandra Kuznetsova <[email protected]>  - 3.3.0-1
   - fixed auxiliary extension schema search;
   - fixed WAL metrics definition for native Zabbix agent;

packaging/rpm/SPECS/mamonsu.spec

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