Merge branch 'dev'

Author: cuprumtan

mamonsu/plugins/pgsql/health.py

@@ -96,7 +96,7 @@ def items(self, template, dashboard=False):
     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()}<" + str(
+            "expression": "{#TEMPLATE:" + self.right_type(self.key_uptime) + ".change()}>" + str(
                 self.plugin_config("uptime"))
         }) + template.trigger({
             "name": "PostgreSQL Health: cache hit ratio too low on {HOSTNAME} ({ITEM.LASTVALUE})",

mamonsu/plugins/system/linux/memory.py

@@ -51,8 +51,9 @@ def run(self, zbx):
             zbx_key, meminfo_key = item[0], item[1]
             if meminfo_key is not None:
                 result[zbx_key] = meminfo.get(meminfo_key) or 0
-        result["used"] = meminfo["MemTotal"] - result["unused"] - result["buffers"] - result["cached"] - result[
-            "slab"] - result["page_tables"] - result["swap_cache"]
+        used = meminfo["MemTotal"] - result["unused"] - result["buffers"] - result["cached"] - result["slab"] - result[
+            "page_tables"] - result["swap_cache"]
+        result["used"] = used if used > 0 else 0
         result["swap"] = (meminfo.get("SwapTotal") or 0) - (meminfo.get("SwapFree") or 0)
 
         for key in result: