Merge branch 'dev'

cuprumtan · cuprumtan · commit f4cc989ccf18 · 2023-03-16T13:44:09.000+05:00
diff --git a/.github/workflows/mamonsu-tests-dev.yml b/.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.2.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.3.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/
diff --git a/.github/workflows/mamonsu-tests-master.yml b/.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.2.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.3.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/
diff --git a/github-actions-tests/mamonsu_build.sh b/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.2.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.5.3.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.2.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.5.3.conf > /etc/mamonsu/agent.conf
     service mamonsu restart
     sleep 5
     echo && echo && echo "mamonsu version:"
diff --git a/github-actions-tests/sources/agent_3.5.3.conf b/github-actions-tests/sources/agent_3.5.3.conf
diff --git a/mamonsu/__init__.py b/mamonsu/__init__.py
@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = 'info@postgrespro.ru'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '3.5.2'
+__version__ = '3.5.3'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'
diff --git a/packaging/conf/example_linux.conf b/packaging/conf/example_linux.conf
@@ -66,8 +66,8 @@ max_size_mb = 1024
 # specify logging settings for mamonsu
 
 [log]
-file = None
-level = INFO
+file = /var/log/mamonsu/mamonsu.log
+level = DEBUG
 format = [%(levelname)s] %(asctime)s - %(name)s	-	%(message)s
 
 #########  Individual Plugin Sections  ############
@@ -207,4 +207,4 @@ interval = 60
 interval = 2
 
 [zbxsender]
-interval = 10
+interval = 10
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+mamonsu (3.5.3-1) stable; urgency=low
+  * removed the owner check for the mamonsu agent.conf file (previously this was not flexible and only required the user "mamonsu");
+  * removed metrics that conflict with the native Zabbix agent metrics (only in agent mode, in regular mode it works as usual);
+  * added pg_stat_wal queries for native Zabbix agent;
+  * fixed native Zabbix agent queries;
+
 mamonsu (3.5.2-1) stable; urgency=low
   * fixed Statements plugin list of metrics creation;
   * fixed Zabbix API requests to fit new Dashboard Template section rules;
diff --git a/packaging/rpm/SPECS/mamonsu.spec b/packaging/rpm/SPECS/mamonsu.spec
@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        3.5.2
+Version:        3.5.3
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -73,6 +73,12 @@ chown -R mamonsu.mamonsu /var/log/mamonsu
 chown -R mamonsu.mamonsu /etc/mamonsu
 
 %changelog
+* Thu Mar 16 2023 Alexandra Kuznetsova <a.kuznetsova@postgrespro.ru>  - 3.5.3-1
+  - removed the owner check for the mamonsu agent.conf file (previously this was not flexible and only required the user "mamonsu");
+  - removed metrics that conflict with the native Zabbix agent metrics (only in agent mode, in regular mode it works as usual);
+  - added pg_stat_wal queries for native Zabbix agent;
+  - fixed native Zabbix agent queries;
+
 * Tue Aug 16 2022 Alexandra Kuznetsova <a.kuznetsova@postgrespro.ru>  - 3.5.2-1
   - fixed Statements plugin list of metrics creation;
   - fixed Zabbix API requests to fit new Dashboard Template section rules;
diff --git a/packaging/win/mamonsu.def.nsh b/packaging/win/mamonsu.def.nsh
@@ -1,5 +1,5 @@
 !define NAME Mamonsu
-!define VERSION 3.5.2
+!define VERSION 3.5.3
 !define MAMONSU_REG_PATH "Software\PostgresPro\Mamonsu"
 !define MAMONSU_REG_UNINSTALLER_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall"
 !define EDB_REG "SOFTWARE\Postgresql"
