feat: add command mamonsu zabbix version to show version of zabbix and add test for this (PGPRO-4586)

Author: alexander popov

Makefile.tests

@@ -101,7 +101,6 @@ run_local_test_pg13: clean_local_test_pg13
 	docker rm pg13
 
 run_zabbix: clean_zabbix
-	docker network create --driver=bridge --subnet=172.18.0.0/16 network-local-tests
 	$(WORKDIR)/tests/local_start_zabbix.sh
 
 clean_local_test_pg9.5:

mamonsu.py

@@ -64,10 +64,12 @@
     {prog} agent metric-get <metric key>
 Options:
     -c, --config <file>
+"""
 
+zabbix_msg= """
 Zabbix API toolbox:
-Command: zabbix
-Usage:
+Command: %prog zabbix [--url] [--user] [--password] [--log-level] commands
+commands:
     {prog} zabbix template list
     {prog} zabbix template show <template name>
     {prog} zabbix template id <template name>
@@ -90,11 +92,16 @@
     {prog} zabbix item error <host name>
     {prog} zabbix item lastvalue <host name>
     {prog} zabbix item lastclock <host name>
+    {prog} zabbix version
+
 Options:
     --url=http://zabbix/web/face
     --user=WebUser
-    --password=WebPassword
-    
+    --password=WebPassword"""
+
+usage_msg += zabbix_msg + '\n'
+
+usage_msg += """
 Export metrics to zabbix server
 Command: upload
 Example:

mamonsu/lib/parser.py

@@ -149,11 +149,13 @@ def run_deploy():
     args = Args()
 
     if not args.try_configure_connect_to_pg():
+        sys.stderr.write(str(args.args) + '\n')
         sys.exit(1)
 
     if not Pooler.is_superuser():
         sys.stderr.write(
             "ERROR: Bootstrap must be run by PostgreSQL superuser\n")
+        sys.stderr.write(str(args.args) + '\n')
         sys.exit(1)
 
     try:

mamonsu/tools/bootstrap/start.py

@@ -4,45 +4,19 @@
 import sys
 import json
 from mamonsu.tools.zabbix_cli.request import Request
+from mamonsu.lib.parser import zabbix_msg
 
 
 class Operations(object):
 
-    _help_msg = """
-Arguments must be:
-
-mamonsu zabbix template list
-mamonsu zabbix template show <template name>
-mamonsu zabbix template id <template name>
-mamonsu zabbix template delete <template id>
-mamonsu zabbix template export <file>
-
-mamonsu zabbix host list
-mamonsu zabbix host show <host name>
-mamonsu zabbix host id <host name>
-mamonsu zabbix host delete <host id>
-mamonsu zabbix host create <host name> <hostgroup id> <template id> <ip>
-mamonsu zabbix host info templates <host id>
-mamonsu zabbix host info hostgroups <host id>
-mamonsu zabbix host info graphs <host id>
-mamonsu zabbix host info items <host id>
-
-mamonsu zabbix hostgroup list
-mamonsu zabbix hostgroup show <hostgroup name>
-mamonsu zabbix hostgroup id <hostgroup name>
-mamonsu zabbix hostgroup delete <hostgroup id>
-mamonsu zabbix hostgroup create <hostgroup name>
-
-mamonsu zabbix item error <host name>
-mamonsu zabbix item lastvalue <host name>
-mamonsu zabbix item lastclock <host name>
-"""
+    _help_msg = zabbix_msg
 
     def __init__(self, arg):
-
         self.arg = arg
+
         if len(self.arg.commands) < 2:
-            self._print_help()
+            if len(self.arg.commands) ==0 or self.arg.commands[0] != 'version':
+                self._print_help()
 
         self.req = Request(
             url='{0}/api_jsonrpc.php'.format(arg.zabbix_url),
@@ -57,6 +31,8 @@ def __init__(self, arg):
             return self.host(self.arg.commands[1:])
         elif self.arg.commands[0] == 'item':
             return self.item(self.arg.commands[1:])
+        elif self.arg.commands[0] == 'version':
+            return self.version(self.arg.commands[1:])
         else:
             self._print_help()
 
@@ -313,3 +289,16 @@ def item(self, args):
         except Exception as e:
             sys.stderr.write('Error find: {0}\n'.format(e))
             sys.exit(3)
+    
+    def version(self, args):
+        if len(args) != 0:
+            return self._print_help()
+        try:
+            self.req.set_user(None)
+            self.req.set_passwd(None)
+
+            version = self.req.post(method='apiinfo.version', params=[])
+            print(str(version))
+        except Exception as e:
+            sys.stderr.write('Error find: {0}\n'.format(e))
+            sys.exit(3)

mamonsu/tools/zabbix_cli/operations.py

@@ -13,9 +13,17 @@ class Request(object):
     def __init__(self, url, user, passwd):
         self._url, self._user, self._passwd = url, user, passwd
         self._id, self._auth_tocken = 0, None
-
+    
+    def set_user(self, user):
+        self._user=user
+        
+    def set_passwd(self, passwd):
+        self._passwd=passwd
+        
     def _auth(self):
         if self._auth_tocken is None:
+            if not self._user:
+                return None
             self._auth_tocken = self.post(
                 'user.login',
                 {'user': self._user, 'password': self._passwd})

mamonsu/tools/zabbix_cli/request.py

@@ -7,15 +7,16 @@
 from mamonsu import __version__
 from mamonsu.lib.default_config import DefaultConfig
 from mamonsu.tools.zabbix_cli.operations import Operations
+from mamonsu.lib.parser import zabbix_msg
 
 
 class Args(DefaultConfig):
 
     def __init__(self):
 
         parser = optparse.OptionParser(
-            usage='%prog zabbix [--url] [--user] '
-            '[--password] [--log-level] commands',
+            #usage='%prog zabbix [--url] [--user] [--password] [--log-level] commands',
+            usage = zabbix_msg,
             version='%prog zabbix cli tools {0}'.format(__version__),
             description='Zabbix CLI tools')
         group = optparse.OptionGroup(

mamonsu/tools/zabbix_cli/start.py

@@ -2,7 +2,8 @@
 
 if [ ! -v ZABBIX_DOCKER_VERSIONS ];
 then
-    export ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0"
+    #export ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0"
+    export ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.2 3.0"
 fi
 # !!!! zabbix 4.4 имеет порт 80, остальные 8080
 #ZABBIX_DOCKER_VERSIONS="4.4"

tests/local_start_zabbix.sh

@@ -6,7 +6,8 @@
 ###### test mamonsu zabbix *
 mkdir /etc/mamonsu/
 cp /var/tmp/mamonsu/packaging/conf/example.conf /etc/mamonsu/agent.conf
-ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0"
+#ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.4 3.2 3.0"
+ZABBIX_DOCKER_VERSIONS="5.2 5.0 4.4 4.2 4.0 3.2 3.0"
 for VER in $ZABBIX_DOCKER_VERSIONS
 do
   IFS='.' read -ra VER_ARRAY <<<$VER

tests/local_tests.sh

@@ -58,7 +58,7 @@ mamonsu zabbix template show PostgresPro-Linux $OPTIONS | grep PostgresPro-Linux
 mamonsu zabbix template id PostgresPro-Linux $OPTIONS | grep -x -E "[[:digit:]]+" || exit 11
 TEMPLATE_ID=`mamonsu zabbix template id PostgresPro-Linux $OPTIONS`
 mamonsu zabbix template delete $TEMPLATE_ID $OPTIONS | grep "templateids.*$TEMPLATE_ID" || exit 11
-
+mamonsu zabbix version  $OPTIONS
 # test 2 mamonsu zabbix - Environment variables
 
 export ZABBIX_URL=$Z_URL
@@ -73,5 +73,6 @@ mamonsu zabbix template show PostgresPro-Linux  | grep PostgresPro-Linux || exit
 mamonsu zabbix template id PostgresPro-Linux  | grep -x -E "[[:digit:]]+" || exit 11
 TEMPLATE_ID=`mamonsu zabbix template id PostgresPro-Linux`
 mamonsu zabbix template delete $TEMPLATE_ID | grep "templateids.*$TEMPLATE_ID" || exit 11
+mamonsu zabbix version
 
 exit 0