fix: change option -M, change help if this option is not specified

Author: alexander popov

mamonsu/lib/parser.py

@@ -37,7 +37,9 @@
     --old-zabbix
 HINT: By default, mamonsu exports the template for Zabbix 4.4 or higher.
 To export a template for older Zabbix versions, use the --old-zabbix option.
+"""
 
+usage_msg_bootstrap = """
 Bootstrap DDL for monitoring:
 Command: bootstrap
 Examples:
@@ -48,8 +50,12 @@
     -W <PGPASSWORD>
     -d, --dbname <DBNAME>
     -U, --username <USERNAME>
-    --host <PGHOST>
-   
+    -h, --host <PGHOST>
+"""
+
+usage_msg += usage_msg_bootstrap
+
+usage_msg += """
 Information about working mamonsu:
 Command: agent
 Examples:
@@ -219,6 +225,9 @@ def print_help(self, **kwargs):
 """)
         sys.exit(2)
 
+    def print_bootstrap_help(self, **kwargs):
+        print(usage_msg_bootstrap.format(prog=sys.argv[0]))
+
     def _process_long_opt(self, rargs, values):
         try:
             OptionParser._process_long_opt(self, rargs, values)

mamonsu/tools/bootstrap/start.py

@@ -59,7 +59,6 @@ def __init__(self):
         bootstrap_group.add_option(
             '-M', '--mamonsu-username',
             dest='mamonsu_username',
-            default=self.default_user(),
             help='database non-privileged user for mamonsu')
         parser.add_option_group(group)
         parser.add_option_group(bootstrap_group)
@@ -73,7 +72,7 @@ def __init__(self):
                 sys.exit(1)
         if self.args.mamonsu_username is None:
             sys.stderr.write("ERROR: Database non-privileged username for mamonsu is not specified\n")
-            parser.print_help()
+            parser.print_bootstrap_help()
             sys.exit(1)
 
         if not self.args.dbname: