Merge branch 'dev'

Author: cuprumtan

mamonsu/plugins/pgsql/health.py

@@ -59,8 +59,8 @@ def items(self, template, dashboard=False):
             "type": Plugin.TYPE.CALCULATED,
             "params": "last(//{blocks_hit})*100/(last(//{blocks_hit})+last(//{blocks_read}))".format(
                 # TODO: hardcoded params
-                blocks_hit=self.right_type("pgsql.blocks.hit{0}"),
-                blocks_read=self.right_type("pgsql.blocks.read{0}"))
+                blocks_hit=self.right_type("pgsql.blocks{0}", "hit"),
+                blocks_read=self.right_type("pgsql.blocks{0}", "read"))
         }) + template.item({
             "name": "PostgreSQL Health: Service Uptime",
             "key": self.right_type(self.key_uptime),
@@ -106,19 +106,22 @@ def macros(self, template, dashboard=False):
             return []
 
     def triggers(self, template, dashboard=False):
-        result = template.trigger({
-            "name": "PostgreSQL Health: service has been restarted on {HOSTNAME} (uptime={ITEM.LASTVALUE})",
-            "expression": "{#TEMPLATE:" + self.right_type(self.key_uptime) + ".change()}>" +
-                          self.plugin_macros["pg_uptime"][0][1]
-        }) + template.trigger({
-            "name": "PostgreSQL Health: cache hit ratio too low on {HOSTNAME} ({ITEM.LASTVALUE})",
-            "expression": "{#TEMPLATE:" + self.right_type(self.key_cache, "hit") + ".last()}<" +
-                          self.plugin_macros["cache_hit_ratio_percent"][0][1]
-        }) + template.trigger({
-            "name": "PostgreSQL Health: no ping from PostgreSQL for 3 minutes on {HOSTNAME}",
-            "expression": "{#TEMPLATE:" + self.right_type(self.key_ping) + ".nodata(180)}=1"
-        })
-        return result
+        if self.Type == 'mamonsu':
+            result = template.trigger({
+                "name": "PostgreSQL Health: service has been restarted on {HOSTNAME} (uptime={ITEM.LASTVALUE})",
+                "expression": "{#TEMPLATE:" + self.right_type(self.key_uptime) + ".change()}>" +
+                              self.plugin_macros["pg_uptime"][0][1]
+            }) + template.trigger({
+                "name": "PostgreSQL Health: cache hit ratio too low on {HOSTNAME} ({ITEM.LASTVALUE})",
+                "expression": "{#TEMPLATE:" + self.right_type(self.key_cache, "hit") + ".last()}<" +
+                              self.plugin_macros["cache_hit_ratio_percent"][0][1]
+            }) + template.trigger({
+                "name": "PostgreSQL Health: no ping from PostgreSQL for 3 minutes on {HOSTNAME}",
+                "expression": "{#TEMPLATE:" + self.right_type(self.key_ping) + ".nodata(180)}=1"
+            })
+            return result
+        else:
+            return ""
 
     def keys_and_queries(self, template_zabbix):
         # TODO: define another metric key because it duplicates native zabbix agents keys

mamonsu/plugins/pgsql/statements.py

@@ -213,25 +213,26 @@ def keys_and_queries(self, template_zabbix):
 
             for i, item in enumerate(all_items):
                 keys = item[0].split("[")
-                result.append("{0}[*],$2 $1 -c \"{1}\"".format("{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
-                                                                  self.query[self.extension + "_bootstrap"].format(
-                                                                      columns=", ".join(
-                                                                          [x[0][x[0].find("[") + 1:x[0].find("]")] for x
-                                                                           in
-                                                                           all_items]), metrics=(", ".join(columns)),
-                                                                      extension_schema=extension_schema) if Pooler.is_bootstraped() else
-                                                                  self.query[self.extension].format(
-                                                                      metrics=(", ".join(columns)),
-                                                                      extension_schema=extension_schema)))
+                result.append("{0}[*],$2 $1 -c \"{1}\" | awk -F  '|' '{{print ${2}}}'".format(
+                    "{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
+                    self.query[self.extension + "_bootstrap"].format(
+                        columns=", ".join([x[0][x[0].find("[") + 1:x[0].find("]")] for x in all_items]),
+                        metrics=(", ".join(columns)),
+                        extension_schema=extension_schema) if Pooler.is_bootstraped() else
+                    self.query[self.extension].format(
+                        metrics=(", ".join(columns)),
+                        extension_schema=extension_schema),
+                    i + 1))
 
             if Pooler.server_version_greater("14"):
                 if self.extension == "pg_stat_statements":
                     for i, item in enumerate(self.Items_pg_14):
                         keys = item[0].split("[")
                         result.append(
-                            "{0}[*],$2 $1 -c \"{1}\"".format("{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
-                                                                self.query_info.format(metrics=(item[1]),
-                                                                                       extension_schema=extension_schema)))
+                            "{0}[*],$2 $1 -c \"{1}\" | awk -F  '|' '{{print ${2}}}'".format(
+                                "{0}{1}.{2}".format(self.key, keys[0], keys[1][:-1]),
+                                self.query_info.format(metrics=(item[1]), extension_schema=extension_schema),
+                            i + 1))
             return template_zabbix.key_and_query(result)
         else:
             return