v2.2.9: fix password auth, fix #78

Author: vadv

mamonsu/__init__.py

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

mamonsu/plugins/pgsql/driver/connection.py

@@ -29,7 +29,7 @@ def get_hash(self):
             'host': self.host,
             'port': self.port,
             'user': self.user,
-            'passwd': self.user,
+            'passwd': self.passwd,
             'db': self.db,
             'timeout': self.timeout,
             'appname': self.appname

packaging/debian/changelog

@@ -1,3 +1,9 @@
+mamonsu (2.2.9-1) stable; urgency=low
+
+  * fix password auth.
+
+ -- PostgresPro DBA <[email protected]>  Wed, 30 Nov 2016 18:00:00 +0300
+
 mamonsu (2.2.8-1) stable; urgency=low
 
   * fix double connection.

packaging/rpm/SPECS/mamonsu.spec

@@ -1,5 +1,5 @@
 Name:           mamonsu
-Version:        2.2.8
+Version:        2.2.9
 Release:        1%{?dist}
 Summary:        Monitoring agent for PostgreSQL
 Group:          Applications/Internet
@@ -70,6 +70,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
 /sbin/chkconfig --del mamonsu
 
 %changelog
+* Wed Nov 30 2016 Dmitry Vasilyev <[email protected]> - 2.2.9-1
+- fix password auth
+
 * Mon Nov 28 2016 Dmitry Vasilyev <[email protected]> - 2.2.8-1
 - fix double connection
 

tests/check.sh

@@ -40,8 +40,8 @@ class DefConfTest(Plugin):
         'config': 'external_plugin_config',
     }
 
-    def run(self, zbx):
-        self.log.error(self.plugin_config('config'))
+    def run(cls, zbx):
+        cls.log.error(cls.plugin_config('config'))
         os.system("touch /tmp/extenal_plugin_is_called")
 EOF
 mamonsu export config /tmp/config
@@ -96,12 +96,12 @@ cat <<EOF > /usr/share/zabbix/conf/zabbix.conf.php
 <?php
 global \$DB;
 \$DB["TYPE"]      = 'POSTGRESQL';
-\$DB["SERVER"]    = 'localhost';
+\$DB["SERVER"]    = '127.0.0.1';
 \$DB["PORT"]      = '5432';
 \$DB["DATABASE"]  = 'zabbix';
 \$DB["USER"]      = 'zabbix';
 \$DB["SCHEMA"]    = '';
-\$ZBX_SERVER      = 'localhost';
+\$ZBX_SERVER      = '127.0.0.1';
 \$ZBX_SERVER_PORT = '10051';
 \$ZBX_SERVER_NAME = '';
 \$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG;
@@ -118,13 +118,22 @@ hostgroup_id=$(mamonsu zabbix hostgroup id 'Linux servers')
 mamonsu zabbix host create $ZABBIX_CLIENT_HOST $hostgroup_id $template_id 127.0.0.1
 
 su postgres -c 'createdb mamonsu'
-su postgres -c 'createuser mamonsu'
+su postgres -c "/usr/pgsql-9.5/bin/psql -Atc \"CREATE USER mamonsu WITH password 'supersecret'\""
+cat <<EOF > /var/lib/pgsql/9.5/data/pg_hba.conf
+local   all             all                                     trust
+host    zabbix          zabbix          127.0.0.1/32            trust
+host    zabbix          zabbix          ::1/128                 trust
+host    all             all             127.0.0.1/32            md5
+EOF
+su postgres -c '/usr/pgsql-9.5/bin/pg_ctl reload -D /var/lib/pgsql/9.5/data'
+
 # start mamonsu and sleep
 cat <<EOF > /etc/mamonsu/agent.conf
 [postgres]
-host = auto
+host = 127.0.0.1
 user = mamonsu
 database = mamonsu
+password = supersecret
 
 [zabbix]
 enabled = True