Merge pull request #219 from postgrespro/MMNS-43_fixes

fix(statements): index out of range during export.

Author: Kmortyk

mamonsu/lib/runner.py

@@ -15,7 +15,7 @@
 from mamonsu.lib.zbx_template import ZbxTemplate
 from mamonsu.lib.get_keys import GetKeys
 
-if platform.LINUX:
+if platform.LINUX or platform.DARWIN:
     from mamonsu.plugins.system.linux.scripts import Scripts
 
 
@@ -224,7 +224,7 @@ def is_any_equal(array):
 #  extract pg version from input
 def define_pg_version(version_args):
     if len(version_args) < 4:
-        if version_args in ["9.5", "9.6", "10", "11", "12", "13", "14", "15", "16", "17"]:
+        if version_args in ["9.5", "9.6", "10", "11", "12", "13", "14", "15", "16", "17", "18"]:
             version_number = version_args[0].split('.')
             for num in version_number:
                 if not num.isdigit():

mamonsu/plugins/pgsql/statements.py

@@ -293,7 +293,11 @@ def keys_and_queries(self, template_zabbix):
             if Pooler.server_version_less("12"):
                 self.Items[5][1] = self.Items[5][1].format("total_time")
             else:
-                self.Items[5][1] = self.Items[5][1].format("total_exec_time+total_plan_time")
+                if Pooler.server_version_greater("17"):
+                    self.Items[5][1] = self.Items[5][1].format("total_exec_time+total_plan_time",
+                                                               "shared_blk_read_time-local_blk_read_time-temp_blk_read_time-shared_blk_write_time-local_blk_write_time-temp_blk_write_time")
+                else:
+                    self.Items[5][1] = self.Items[5][1].format("total_exec_time+total_plan_time", "blk_read_time-blk_write_time")
                 if Pooler.is_pgpro() or Pooler.is_pgpro_ee():
                     all_items += self.Items_pg_13
             if Pooler.server_version_greater("18"):