Merge branch 'dev'

Author: cuprumtan

Diff for: .github/workflows/mamonsu-tests-dev.yml

@@ -51,7 +51,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.1.2.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.2.0.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

Diff for: .github/workflows/mamonsu-tests-master.yml

@@ -55,7 +55,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.1.2.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.2.0.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

Diff for: 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.1.2.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.2.0.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.1.2.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.2.0.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo apt-get -y install ./mamonsu*.deb
     service mamonsu restart

Diff for: github-actions-tests/sources/agent_3.1.2.conf renamed to github-actions-tests/sources/agent_3.2.0.conf

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

Diff for: mamonsu/__init__.py

@@ -41,10 +41,10 @@ def items(self, template, dashboard=False):
         }) + template.item({
             'name': 'PostgreSQL: cache hit ratio',
             'key': self.right_type(self.key_cache, "hit"),
-            'value_type': value_type,
+            'value_type': Plugin.VALUE_TYPE.numeric_float,
             'units': Plugin.UNITS.percent,
             'type': Plugin.TYPE.CALCULATED,
-            'params': "last(//pgsql.blocks[hit])*100/(last(//pgsql.blocks[hit])+last(//pgsql.blocks[read]))"
+            'params': "last(pgsql.blocks[hit])*100/(last(pgsql.blocks[hit])+last(pgsql.blocks[read]))"
         }) + template.item({
             'name': 'PostgreSQL: service uptime',
             'key': self.right_type(self.key_uptime),

Diff for: mamonsu/plugins/pgsql/health.py

@@ -40,22 +40,22 @@ def extension_schema(self, extension, db=None):
     def disable_and_exit_if_extension_is_not_installed(self, ext, db=None):
         if not self.extension_installed(ext, db=db, silent=True):
             self.disable()
-            raise PluginDisableException("""Disable plugin and exit, because '{0}'
+            raise PluginDisableException("""Disable plugin and exit, because '{0}' \
 extension is not installed. Enable it in PostgreSQL instance: '{1}',
 if needed and restart.""".format(ext, Pooler.connection_string(db)))
 
     def disable_and_exit_if_not_pgpro_ee(self, db=None):
         if not Pooler.is_pgpro_ee(db):
             self.disable()
-            raise PluginDisableException("""Disable plugin and exit, because
+            raise PluginDisableException("""Disable plugin and exit, because \
 PostgresPro Enterprise Edition is not detected [instance: '{0}']
 """.format(Pooler.connection_string(db)))
 
     def disable_and_exit_if_archive_mode_is_not_on(self, db=None):
         param = Pooler.get_sys_param('archive_mode', db=db)
         if param != 'on' and param != 'always':
             self.disable()
-            raise PluginDisableException("""Disable plugin and exit, because '{0}'
-parameter is neither 'on' nor 'always'. Enable it "{1}" or "{2}" in PostgreSQL instance,
+            raise PluginDisableException("""Disable plugin and exit, because '{0}' \
+parameter is neither 'on' nor 'always'. Enable it "{1}" or "{2}" in PostgreSQL instance, \
 if needed and restart.""".format('archive_mode', 'alter system set archive_mode = on;',
                                  'alter system set archive_mode = always;'))

Diff for: mamonsu/plugins/pgsql/plugin.py

@@ -182,7 +182,7 @@ def items(self, template, dashboard=False):
             'value_type': Plugin.VALUE_TYPE.numeric_float,
             'units': Plugin.UNITS.percent,
             'type': Plugin.TYPE.CALCULATED,
-            'params': "last(//" + self.key_wal_sync_time + ")/10/" + self.plugin_config('interval')
+            'params': "last(" + self.key_wal_sync_time + ")/10/" + self.plugin_config('interval')
         })
         if not dashboard:
             return result

Diff for: mamonsu/plugins/pgsql/xlog.py

@@ -1,3 +1,10 @@
+mamonsu (3.2.0-1) stable; urgency=low
+  * added new Invalid Indexes metric and trigger to Databases discovery rule;
+  * added version number output to log;
+  * fixed template syntax;
+  * fixed Archive plugin to fit PostgreSQL 10 or lower;
+  * fixed Cache Hit Ratio and Sync Duty Zabbix item formula;
+
 mamonsu (3.1.2-1) stable; urgency=low
   * fixed Files Need To Archivee and Size Of Files Need To Archive evaluation;
 

Diff for: packaging/debian/changelog

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        3.1.2
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,6 +70,13 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Fri Nov 26 2021 Alexandra Kuznetsova <[email protected]>  - 3.2.0-1
+  - added new Invalid Indexes metric and trigger to Databases discovery rule;
+  - added version number output to log;
+  - fixed template syntax;
+  - fixed Archive plugin to fit PostgreSQL 10 or lower;
+  - fixed Cache Hit Ratio and Sync Duty Zabbix item formula;
+
 * Mon Nov 8 2021 Alexandra Kuznetsova <[email protected]>  - 3.1.2-1
   - fixed Files Need To Archivee and Size Of Files Need To Archive evaluation;
 

Diff for: packaging/rpm/SPECS/mamonsu.spec

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