Merge branch 'dev'

Author: cuprumtan

mamonsu/plugins/pgsql/driver/pool.py

@@ -210,7 +210,7 @@ def extension_installed(self, ext, db=None):
         result = self.query("""
         SELECT count(*) 
         FROM pg_catalog.pg_extension 
-        WHERE extname = '{0}';
+        WHERE lower(extname) = lower('{0}');
         """.format(ext), db)
         return (int(result[0][0])) == 1
 

mamonsu/plugins/pgsql/pg_buffercache.py

@@ -30,8 +30,8 @@ class PgBufferCache(Plugin):
     graph_name = "PostgreSQL pg_buffercache: Shared Buffer"
 
     def run(self, zbx):
-        if not self.extension_installed("pg_buffercache"):
-            return
+        if not Pooler.extension_installed("pg_buffercache"):
+            self.disable_and_exit_if_extension_is_not_installed("pg_buffercache")
         result = Pooler.run_sql_type("buffer_cache", extension="pg_buffercache")[0]
         for i, value in enumerate(result):
             zbx.send("pgsql.buffers[{0}]".format(self.Items[i][0]), value)
@@ -65,7 +65,7 @@ def graphs(self, template, dashboard=False):
             return []
 
     def keys_and_queries(self, template_zabbix):
-        if self.extension_installed("pg_buffercache"):
+        if Pooler.extension_installed("pg_buffercache"):
             result = []
             for i, item in enumerate(self.Items):
                 result.append("{0}[*],$2 $1 -c \"{1}\"".format(self.key.format("." + item[0]), self.query[i].format(

mamonsu/plugins/pgsql/plugin.py

@@ -34,13 +34,14 @@ def check(self, extension):
             check(self, ext)
         self._ext_check_count += 1
 
+        # TODO: reason to create cache-like variable for extension???
         return self._ext_installed
 
     def extension_schema(self, extension, db=None):
         return Pooler.extension_schema(extension, db)
 
     def disable_and_exit_if_extension_is_not_installed(self, ext, db=None):
-        if not self.extension_installed(ext, db=db, silent=True):
+        if not Pooler.extension_installed(ext, db=db):
             self.disable()
             raise PluginDisableException("""Disable plugin and exit, because '{0}' \
 extension is not installed. Enable it in PostgreSQL instance: '{1}',

mamonsu/plugins/pgsql/statements.py

@@ -95,14 +95,21 @@ class Statements(Plugin):
         ("PostgreSQL Statements: Spend Time", 1),
         ("PostgreSQL Statements: WAL Statistics", None)]
 
+    # pgpro_stats работает только для PGPRO 12+ в режиме bootstrap и/или если в конфиге указан суперпользователь mamonsu
     def run(self, zbx):
-        if not self.extension_installed("pg_stat_statements") or not self.extension_installed("pgpro_stats"):
-            self.disable_and_exit_if_extension_is_not_installed(ext="pg_stat_statements/pgpro_stats")
+        extension = ""
         if (Pooler.is_pgpro() or Pooler.is_pgpro_ee()) and Pooler.server_version_greater("12"):
-            if not Pooler.is_bootstraped():
-                self.disable_and_exit_if_not_superuser()
-            extension = "pgpro_stats"
+            if Pooler.extension_installed("pgpro_stats"):
+                if not Pooler.is_bootstraped():
+                    self.disable_and_exit_if_not_superuser()
+                extension = "pgpro_stats"
+            elif Pooler.extension_installed("pg_stat_statements"):
+                extension = "pg_stat_statements"
+            else:
+                self.disable_and_exit_if_extension_is_not_installed(ext="pgpro_stats")
         else:
+            if not Pooler.extension_installed("pg_stat_statements"):
+                self.disable_and_exit_if_extension_is_not_installed(ext="pg_stat_statements")
             extension = "pg_stat_statements"
 
         extension_schema = self.extension_schema(extension=extension)
@@ -184,13 +191,16 @@ def graphs(self, template, dashboard=False):
             return []
 
     def keys_and_queries(self, template_zabbix):
-        if self.extension_installed("pg_stat_statements") or not self.extension_installed("pgpro_stats"):
-            if (Pooler.is_pgpro() or Pooler.is_pgpro_ee()) and Pooler.server_version_greater("12"):
-                if not Pooler.is_bootstraped():
-                    self.disable_and_exit_if_not_superuser()
+        if (Pooler.is_pgpro() or Pooler.is_pgpro_ee()) and Pooler.server_version_greater("12"):
+            if Pooler.extension_installed("pgpro_stats"):
                 extension = "pgpro_stats"
-            else:
+            elif Pooler.extension_installed("pg_stat_statements"):
                 extension = "pg_stat_statements"
+        else:
+            if Pooler.extension_installed("pg_stat_statements"):
+                extension = "pg_stat_statements"
+
+        if Pooler.extension_installed("pgpro_stats") or Pooler.extension_installed("pg_stat_statements"):
 
             extension_schema = self.extension_schema(extension=extension)
 

mamonsu/plugins/pgsql/wait_sampling.py

@@ -244,26 +244,35 @@ def find_and_send(where, what, zbx):
                         "pgsql.{0}".format(item[1]),
                         float(0), Plugin.DELTA.speed_per_second)
 
-        if not self.extension_installed("pg_wait_sampling") or not self.extension_installed("pgpro_stats"):
-            self.disable_and_exit_if_extension_is_not_installed(ext="pg_wait_sampling/pgpro_stats")
+        extension = ""
         if Pooler.is_pgpro() or Pooler.is_pgpro_ee():
-            if not Pooler.is_bootstraped():
-                self.disable_and_exit_if_not_superuser()
-            extension = "pgpro_stats"
+            if Pooler.extension_installed("pgpro_stats"):
+                if not Pooler.is_bootstraped():
+                    self.disable_and_exit_if_not_superuser()
+                extension = "pgpro_stats"
+            elif Pooler.extension_installed("pg_wait_sampling"):
+                extension = "pg_wait_sampling"
+            else:
+                self.disable_and_exit_if_extension_is_not_installed(ext="pgpro_stats")
         else:
+            if not Pooler.extension_installed("pg_wait_sampling"):
+                self.disable_and_exit_if_extension_is_not_installed(ext="pg_wait_sampling")
             extension = "pg_wait_sampling"
 
         extension_schema = self.extension_schema(extension=extension)
 
         find_and_send(Pooler.query(
-            self.AllLockQuery[extension + "_bootstrap"] if Pooler.is_bootstraped() else self.AllLockQuery[
-                extension].format(extension_schema=extension_schema)), self.AllLockItems, zbx)
+            self.AllLockQuery[extension + "_bootstrap"].format(
+                extension_schema=extension_schema) if Pooler.is_bootstraped() else self.AllLockQuery[extension].format(
+                extension_schema=extension_schema)), self.AllLockItems, zbx)
         find_and_send(Pooler.query(
-            self.HWLockQuery[extension + "_bootstrap"] if Pooler.is_bootstraped() else self.HWLockQuery[
-                extension].format(extension_schema=extension_schema)), self.HWLockItems, zbx)
+            self.HWLockQuery[extension + "_bootstrap"].format(
+                extension_schema=extension_schema) if Pooler.is_bootstraped() else self.HWLockQuery[extension].format(
+                extension_schema=extension_schema)), self.HWLockItems, zbx)
         find_and_send(Pooler.query(
-            self.LWLockQuery[extension + "_bootstrap"] if Pooler.is_bootstraped() else self.LWLockQuery[
-                extension].format(extension_schema=extension_schema)), self.LWLockItems, zbx)
+            self.LWLockQuery[extension + "_bootstrap"].format(
+                extension_schema=extension_schema) if Pooler.is_bootstraped() else self.LWLockQuery[extension].format(
+                extension_schema=extension_schema)), self.LWLockItems, zbx)
 
     def items(self, template, dashboard=False):
         result = ""

packaging/conf/example_win.conf

@@ -54,19 +54,19 @@ port = 10052
 
 [plugins]
 enabled = False
-directory = c:\Program Files\PostgresPro\Mamonsu\2.5.1\plugins
+directory = c:\Program Files\PostgresPro\Mamonsu\3.4.0\plugins
 
 # enable storing the collected metric data in text files locally.
 
 [metric_log]
 enabled = False
-directory = c:\Program Files\PostgresPro\Mamonsu\2.5.1\logs
+directory = c:\Program Files\PostgresPro\Mamonsu\3.4.0\logs
 max_size_mb = 1024
 
 # specify logging settings for mamonsu
 
 [log]
-file = C:\Program Files\PostgresPro\Mamonsu\2.5.1\logs\mamonsu.log
+file = C:\Program Files\PostgresPro\Mamonsu\3.4.0\logs\mamonsu.log
 level = INFO
 format = [%(levelname)s] %(asctime)s - %(name)s	-	%(message)s