v2.2.0: change default item type to 'Zabbix trapper'

Author: vadv

mamonsu/__init__.py

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

mamonsu/lib/zbx_template.py

@@ -38,7 +38,7 @@ class ZbxTemplate(object):
 
 # https://www.zabbix.com/documentation/2.0/manual/appendix/api/item/definitions
     item_defaults = [
-        ('name', None), ('type', 7), ('snmp_community', None),
+        ('name', None), ('type', 2), ('snmp_community', None),
         ('multiplier', 0), ('inventory_link', 0),
         ('key', None), ('snmp_oid', None), ('history', 7),
         ('trends', 365), ('status', 0), ('delay', 60),
@@ -83,7 +83,7 @@ class ZbxTemplate(object):
     ]
 
     discovery_defaults = [
-        ('name', None), ('type', 7), ('snmp_community', None),
+        ('name', None), ('type', 2), ('snmp_community', None),
         ('snmp_oid', None), ('delay', 60), ('status', 0),
         ('allowed_hosts', None), ('snmpv3_contextname', None),
         ('snmpv3_securityname', None), ('snmpv3_securitylevel', 0),

mamonsu/plugins/pgsql/driver/pool.py

@@ -43,6 +43,7 @@ def __init__(self):
         self.all_connections = {}
         self._server_version = {}
         self._mamonsu_bootstrap = {}
+        self._mamonsu_bootstrap_cache = 0
         self._in_recovery = {}
         self._in_recovery_cache = 0
 
@@ -83,16 +84,19 @@ def server_version_less(self, version, db=None):
         return self.server_version(db) <= LooseVersion(version)
 
     def mamonsu_bootstrap(self, db=None):
-        if db in self._mamonsu_bootstrap:
+        if (db in self._mamonsu_bootstrap) and (self._mamonsu_bootstrap_cache < 10):
+            self._mamonsu_bootstrap_cache += 1
             return self._mamonsu_bootstrap[db]
+        self._mamonsu_bootstrap_cache = 0
         sql = """select count(*) from pg_catalog.pg_class
             where relname = 'mamonsu_config'"""
         result = int(self.query(sql, db)[0][0])
         self._mamonsu_bootstrap[db] = (result == 1)
         if self._mamonsu_bootstrap[db]:
-            self.all_connections[db].log.info("Detect mamonsu bootstrap")
+            self.all_connections[db].log.info("Found mamonsu bootstrap")
         else:
-            self.all_connections[db].log.info("Can't detect mamonsu bootstrap")
+            self.all_connections[db].log.info("Can't found mamonsu bootstrap")
+            self.all_connections[db].log.info("hint: run `mamonsu bootstrap` if you want to run without superuser rights")
         return self._mamonsu_bootstrap[db]
 
     def extension_installed(self, ext, db=None):