fix, help, PGPRO-3797

Author: alexander popov

mamonsu/lib/config.py

@@ -70,7 +70,7 @@ def __init__(self, cfg_file=None, plugin_directories=[]):
         self._apply_default_config()
 
         if cfg_file and not os.path.isfile(cfg_file):
-            sys.stderr.write('Can\'t found file: {0}'.format(cfg_file))
+            sys.stderr.write('Can\'t found file: {0}\n'.format(cfg_file))
             sys.exit(1)
         else:
             if cfg_file is not None:

mamonsu/lib/parser.py

@@ -204,7 +204,9 @@ def print_help(self):
     --template-name <template name> by default PostgresPro-<platform name>
     --application <application name in template> by default App-PostgresPro-<platform name>
     --add-plugins <directory>
-
+    --pg-version <pg_version> by default 10
+HINT: default pg-version is vanilla, but with PGEE or PGPRO before version number it can be changed (PGEE_10). Supported version
+numbers are 12, 10, 11, 9.6, 9.5, PGEE_9.6, PGEE_10, PGEE_11, PGEE_12, PGPRO_9.6, PGPRO_10, PGPRO_11, PGPRO_12
 
 Export zabbix keys for native zabbix-agent:
 Command: export zabbix-parameters
@@ -215,7 +217,7 @@ def print_help(self):
     --config <file>
     --add-plugins <directory>
 HINT: default pg-version is vanilla, but with PGEE or PGPRO before version number it can be changed (PGEE_10). Supported version
-numbers are 12, 10, 11, 9.6, 9.5
+numbers are 12, 10, 11, 9.6, 9.5, PGEE_9.6, PGEE_10, PGEE_11, PGEE_12, PGPRO_9.6, PGPRO_10, PGPRO_11, PGPRO_12
 
         
 Export template for native zabbix agent:
@@ -254,7 +256,7 @@ def parse_args():
         usage=usage_msg,
         version='%prog {0}'.format(__version__))
     parser.add_option(
-        '-c', '--config', dest='config_file', default=None)
+        '-c', '--config', dest='config_file', default='/etc/mamonsu/agent.conf')
     # pid
     parser.add_option(
         '-p', '--pid', dest='pid', default=None)

mamonsu/lib/runner.py

@@ -141,7 +141,6 @@ def quit_handler(_signo=None, _stack_frame=None):
                 plugins = []
                 if len(commands) == 2:
                     commands.append('postgrespro.xml')
-                    print('Template for mamonsu have been saved in postgrespro.conf file')
                 for klass in Plugin.only_child_subclasses():
                     if klass.__name__ == "PgWaitSampling" or klass.__name__ == "Cfs" :  # check if plugin is for EE
                         if Plugin.VersionPG['type'] == 'PGEE':
@@ -155,6 +154,7 @@ def quit_handler(_signo=None, _stack_frame=None):
                 with codecs.open(commands[2], 'w', 'utf-8') as f:
                     #   template for mamonsu (zabbix-trapper) is generated for all available plugins
                     f.write(template.xml("all", plugins))  # set type to 'all' for mamonsu
+                    print('Configuration file for mamonsu have been saved in {file} file'.format(file=commands[2]))
                     sys.exit(0)
             elif commands[1] == 'zabbix-template':
                 Plugin.Type = 'agent'  # change plugin type for template generator

mamonsu/tools/agent/start.py

@@ -35,7 +35,7 @@ def print_help():
         usage=usage_msg,
         version='%prog agent {0}'.format(__version__))
     parser.add_option(
-        '-c', '--config', dest='config',
+        '-c', '--config', dest='config', default='/etc/mamonsu/agent.conf',
         help=optparse.SUPPRESS_HELP)
     args, commands = parser.parse_args()