mas-cli 22.0.2__tar.gz → 23.1.0__tar.gz

{mas_cli-22.0.2/python/src/mas_cli.egg-info → mas_cli-23.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 22.0.2
+Version: 23.1.0
 Summary: Python Admin CLI for Maximo Application Suite
 Author-email: David Parker <parkerda@uk.ibm.com>
 License-Expression: EPL-1.0

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/__init__.py

@@ -10,4 +10,4 @@
 
 from .cli import BaseApp  # noqa: F401
 
-__version__ = "22.0.2"  # Python module compatible semver
+__version__ = "23.1.0"  # Python module compatible semver

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/aiservice/install/app.py

@@ -173,12 +173,7 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
         # Dependencies
         self.configMongoDb()
-        self.setDB2DefaultChannel()
-        self.setDB2DefaultSettings()
-        self.printDescription(
-            ["Db2 Universal Operator for v12 onwards requires to add a License activation key", "If you don't have a license press enter to continue."]
-        )
-        self.db2LicenseFileLocal = self.promptForFile("Db2 License file", envVar="DB2_LICENSE_FILE", default="", mustExist=False)
+        self.configDatabase()
 
     @logMethodCall
     def nonInteractiveMode(self) -> None:
@@ -199,9 +194,6 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
             "approval_aiservice": {"id": "aiservice"},
         }
 
-        self.setDB2DefaultChannel()
-        self.setDB2DefaultSettings()
-
         for key, value in vars(self.args).items():
             # These fields we just pass straight through to the parameters and fail if they are not set
             if key in requiredParams:
@@ -286,6 +278,30 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
                 if value is not None and value != "":
                     self.aiserviceTenantSchedulingConfigFileLocal = value
 
+            elif key == "db2_action_aiservice":
+                # Check if external DB parameters are provided
+                externalDbParams = ["aiservice_db_jdbc_url", "aiservice_db_username", "aiservice_db_password"]
+                hasExternalDb = any(vars(self.args)[dbParam] is not None for dbParam in externalDbParams)
+
+                if hasExternalDb:
+                    # Using external database - validate all required parameters and ensure --db2-aiservice wasn't set
+                    if value == "install" and vars(self.args)["aiservice_db_jdbc_url"] is not None:
+                        self.fatalError(
+                            "Cannot use --db2-aiservice with external database parameters. Use either --db2-aiservice for in-cluster DB2 OR --aiservice-db-jdbc-url for external database (Oracle/SQL Server/DB2), not both."
+                        )
+
+                    self.setParam("install_db2", "false")
+                    self.setParam("db2_action_aiservice", "byo")
+                    for dbParam in externalDbParams:
+                        if vars(self.args)[dbParam] is None:
+                            self.fatalError(f"Parameter is required when using external database: --{dbParam.replace('_', '-')}")
+                elif value == "install":
+                    # Install DB2 in-cluster
+                    self.setParam("install_db2", "true")
+                    self.setParam("db2_action_aiservice", "install")
+                    self.setDB2DefaultChannel()
+                    self.setDB2DefaultSettings()
+
             elif key == "non_prod":
                 if not value:
                     self.operationalMode = 1
@@ -485,8 +501,8 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
 
         self.setParam("dro_action", "install")
 
-        # Install Db2 for AI Service
-        self.setParam("db2_action_aiservice", "install")
+        # DB2 action will be set by configDatabase() based on user choice
+        # Don't set db2_action_aiservice here - it should be determined by user selection
 
         # User must either provide the configuration via numerous command line arguments, or the interactive prompts
         if instanceId is None:
@@ -494,6 +510,37 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         else:
             self.nonInteractiveMode()
 
+            # Check if external database parameters were provided
+            if self.getParam("db2_action_aiservice") == "":
+                externalDbProvided = (
+                    vars(self.args).get("aiservice_db_jdbc_url") is not None
+                    or vars(self.args).get("aiservice_db_username") is not None
+                    or vars(self.args).get("aiservice_db_password") is not None
+                )
+
+                if externalDbProvided:
+                    # External database configuration provided
+                    self.setParam("install_db2", "false")
+                    self.setParam("db2_action_aiservice", "byo")
+
+                    # Validate required external DB parameters
+                    requiredDbParams = ["aiservice_db_jdbc_url", "aiservice_db_username", "aiservice_db_password"]
+                    for dbParam in requiredDbParams:
+                        if vars(self.args).get(dbParam) is None:
+                            self.fatalError(f"Parameter is required when using external database: --{dbParam.replace('_', '-')}")
+
+                    # Set the external DB parameters
+                    for dbParam in ["aiservice_db_jdbc_url", "aiservice_db_username", "aiservice_db_password", "aiservice_db_ca_cert"]:
+                        value = vars(self.args).get(dbParam)
+                        if value is not None:
+                            self.setParam(dbParam, value)
+                else:
+                    # No database configuration provided - default to installing DB2
+                    self.setParam("install_db2", "true")
+                    self.setParam("db2_action_aiservice", "install")
+                    self.setDB2DefaultChannel()
+                    self.setDB2DefaultSettings()
+
         # Set up the sls and db2 license file
         self.slsLicenseFile()
         self.db2LicenseFile()
@@ -547,7 +594,6 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
                     aiserviceConfig=self.aiserviceConfigSecret,
                     slack_token=self.getParam("slack_token"),
                     slack_channel=self.getParam("slack_channel"),
-                    ibm_entitlement_key=self.getParam("ibm_entitlement_key"),
                 )
 
                 self.setupApprovals(pipelinesNamespace)
@@ -694,6 +740,56 @@ class AiServiceInstallApp(BaseApp, aiServiceInstallArgBuilderMixin, aiServiceIns
         self.setParam("aiservice_s3_tenants_bucket", "km-tenants")
         self.setParam("aiservice_s3_templates_bucket", "km-templates")
 
+    @logMethodCall
+    def configDatabase(self) -> None:
+        """
+        Configure database for AI Service.
+        """
+        self.printH1("Database Configuration")
+        self.printDescription(
+            [
+                "By default, DB2 will be installed in-cluster (suitable for development and testing).",
+                "Alternatively, you can connect to an external Oracle or DB2 database (supported in AI Service 9.1.x only).",
+                # "Alternatively, you can connect to an external database (Oracle, SQL Server, or DB2).",
+                "",
+            ]
+        )
+
+        if self.yesOrNo("Do you want to use an external database"):
+            # Use external database
+            self.setParam("install_db2", "false")
+            self.setParam("db2_action_aiservice", "byo")
+
+            self.printH2("External Database Configuration")
+            self.printDescription(
+                [
+                    "Provide connection details for your external Oracle or DB2 database.",
+                    "",
+                    "<b>JDBC URL Example:</b>",
+                    "  Oracle:     jdbc:oracle:thin:@//hostname:1521/servicename",
+                    "  DB2:        jdbc:db2://hostname:50000/database",
+                    # "  SQL Server: jdbc:sqlserver://hostname:1433;databaseName=aiservice",
+                    "",
+                ]
+            )
+
+            self.promptForString("Database JDBC URL", "aiservice_db_jdbc_url")
+            self.promptForString("Database Username", "aiservice_db_username")
+            self.promptForString("Database Password", "aiservice_db_password", isPassword=True)
+
+            if self.yesOrNo("Does the database use SSL/TLS with a self-signed certificate"):
+                self.promptForString("Database CA Certificate (PEM format)", "aiservice_db_ca_cert")
+        else:
+            # Install DB2 in-cluster (default)
+            self.setParam("install_db2", "true")
+            self.setParam("db2_action_aiservice", "install")
+            self.setDB2DefaultChannel()
+            self.setDB2DefaultSettings()
+            self.printDescription(
+                ["Db2 Universal Operator for v12 onwards requires a License activation key", "If you don't have a license, press enter to continue."]
+            )
+            self.db2LicenseFileLocal = self.promptForFile("Db2 License file", envVar="DB2_LICENSE_FILE", default="", mustExist=False)
+
     def aiServiceIntegrations(self) -> None:
         self.printH1("WatsonX Integration")
         self.printDescription(

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/aiservice/install/argBuilder.py

@@ -178,10 +178,22 @@ class aiServiceInstallArgBuilderMixin:
         if self.getParam("rsl_ca_crt") != "":
             command += f"  --rsl-ca-crt \"{self.getParam('rsl_ca_crt')}\"{newline}"
 
-        if self.getParam("db2_channel") != "":
-            command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
-        if self.db2LicenseFileLocal:
-            command += f'  --db2-license-file "{self.db2LicenseFileLocal}"'
+        # Database Configuration
+        # -----------------------------------------------------------------------------
+        if self.getParam("db2_action_aiservice") == "install":
+            # In-cluster DB2 installation
+            command += f"  --db2-aiservice{newline}"
+            if self.getParam("db2_channel") != "":
+                command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
+            if self.db2LicenseFileLocal:
+                command += f'  --db2-license-file "{self.db2LicenseFileLocal}"{newline}'
+        elif self.getParam("aiservice_db_jdbc_url") != "":
+            # External database (Oracle/SQL Server/DB2)
+            command += f"  --aiservice-db-jdbc-url \"{self.getParam('aiservice_db_jdbc_url')}\"{newline}"
+            command += f"  --aiservice-db-username \"{self.getParam('aiservice_db_username')}\"{newline}"
+            command += f"  --aiservice-db-password \"{self.getParam('aiservice_db_password')}\"{newline}"
+            if self.getParam("aiservice_db_ca_cert") != "":
+                command += f"  --aiservice-db-ca-cert \"{self.getParam('aiservice_db_ca_cert')}\"{newline}"
 
         command += "  --accept-license --no-confirm"
         return command

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/aiservice/install/argParser.py

@@ -224,13 +224,38 @@ aiserviceAdvancedArgGroup.add_argument(
 )
 
 
-# IBM Db2 Universal Operator
+# Database Configuration
 # -----------------------------------------------------------------------------
-db2ArgGroup = aiServiceinstallArgParser.add_argument_group("IBM Db2 Universal Operator")
+databaseArgGroup = aiServiceinstallArgParser.add_argument_group(
+    "Database Configuration",
+    "Configure database for AI Service. By default, DB2 is installed in-cluster. Use --db-* parameters to connect to an external database (Oracle/SQL Server/DB2) instead.",
+)
 
-db2ArgGroup.add_argument("--db2-namespace", required=False, help="Change namespace where Db2u instances will be created")
-db2ArgGroup.add_argument("--db2-channel", required=False, help="Subscription channel for Db2u")
-db2ArgGroup.add_argument("--db2-license-file", required=False, help="Db2 License File for Db2")
+# Option 1: Install DB2 in-cluster (default)
+databaseArgGroup.add_argument(
+    "--db2-aiservice",
+    dest="db2_action_aiservice",
+    required=False,
+    help="Install DB2 in-cluster for AI Service (default behavior, mutually exclusive with --db-*)",
+    action="store_const",
+    const="install",
+)
+databaseArgGroup.add_argument("--db2-namespace", required=False, help="Change namespace where Db2u instances will be created")
+databaseArgGroup.add_argument("--db2-channel", required=False, help="Subscription channel for Db2u")
+databaseArgGroup.add_argument("--db2-license-file", required=False, help="Db2 License File for Db2")
+
+# Option 2: Use external database (Oracle/SQL Server/DB2)
+databaseArgGroup.add_argument(
+    "--aiservice-db-jdbc-url",
+    dest="aiservice_db_jdbc_url",
+    required=False,
+    help="JDBC URL for external database (e.g., jdbc:oracle:thin:@host:1521/service, jdbc:sqlserver://host:1433;databaseName=db, jdbc:db2://host:50000/db)",
+)
+databaseArgGroup.add_argument("--aiservice-db-username", dest="aiservice_db_username", required=False, help="Database username for AI Service")
+databaseArgGroup.add_argument("--aiservice-db-password", dest="aiservice_db_password", required=False, help="Database password for AI Service")
+databaseArgGroup.add_argument(
+    "--aiservice-db-ca-cert", dest="aiservice_db_ca_cert", required=False, help="Database CA certificate (PEM format, optional, only if using SSL/TLS)"
+)
 
 # Development Mode
 # -----------------------------------------------------------------------------

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/aiservice/install/params.py

@@ -32,7 +32,15 @@ optionalParams = [
     "sls_namespace",
     # DRO
     "dro_namespace",
-    # Db2
+    # Database - External (Oracle/SQL Server/DB2)
+    "aiservice_db_jdbc_url",
+    "aiservice_db_username",
+    "aiservice_db_password",
+    "aiservice_db_ca_cert",
+    # Database - Installation choice
+    "install_db2",
+    "db2_action_aiservice",
+    # Db2 - In-cluster installation
     "db2_action_system",
     "db2_action_manage",
     "db2_action_facilities",

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/aiservice/install/summarizer.py

@@ -78,10 +78,37 @@ class aiServiceInstallSummarizerMixin:
         self.printParamSummary("Project ID", "aiservice_watsonxai_project_id")
 
     def db2Summary(self) -> None:
-        self.printH2("IBM Db2 Univeral Operator Configuration")
-        self.printParamSummary("Action", "db2_action_aiservice")
-        self.printParamSummary("Install Namespace", "db2_namespace")
-        self.printParamSummary("Subscription Channel", "db2_channel")
+        self.printH2("Database Configuration")
+
+        db2_action = self.getParam("db2_action_aiservice")
+
+        if db2_action == "byo":
+            # External database
+            jdbc_url = self.getParam("aiservice_db_jdbc_url")
+            if jdbc_url:
+                # Determine database type from JDBC URL
+                if "oracle" in jdbc_url.lower():
+                    db_type = "External Database (Oracle)"
+                # elif "sqlserver" in jdbc_url.lower():
+                #     db_type = "External Database (SQL Server)"
+                # elif "db2" in jdbc_url.lower():
+                #     db_type = "External Database (DB2)"
+                else:
+                    db_type = "External Database"
+
+                self.printSummary("Database Type", db_type)
+                self.printParamSummary("JDBC URL", "aiservice_db_jdbc_url")
+                self.printParamSummary("Username", "aiservice_db_username")
+                # Don't print password for security
+                if self.getParam("aiservice_db_ca_cert"):
+                    self.printSummary("CA Certificate", "Provided")
+        else:
+            # In-cluster DB2 deployment (default when db2_action="install" or not set)
+            self.printSummary("Database Type", "In-cluster DB2")
+            if self.getParam("db2_namespace") != "":
+                self.printParamSummary("Install Namespace", "db2_namespace")
+            if self.getParam("db2_channel") != "":
+                self.printParamSummary("Subscription Channel", "db2_channel")
 
     def droSummary(self) -> None:
         self.printH2("IBM Data Reporter Operator (DRO) Configuration")

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/cli.py

@@ -126,7 +126,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger("urllib3").setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version: str = "22.0.2"
+        self.version: str = "23.1.0"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/install/app.py

@@ -1723,9 +1723,6 @@ class InstallApp(
             ]
         )
 
-        # Install Db2 for AI Service
-        self.setParam("db2_action_aiservice", "install")
-
         self.promptForString(
             "Instance ID",
             "aiservice_instance_id",
@@ -1733,6 +1730,65 @@ class InstallApp(
         )
         self.params["aiservice_channel"] = prompt(HTML("<Yellow>Custom channel for AI Service</Yellow> "))
 
+    @logMethodCall
+    def configAIServiceDatabase(self):
+        """Configure database for AI Service - either in-cluster DB2 or external database"""
+        self.printH2("Database Configuration for AI Service")
+        self.printDescription(
+            [
+                "By default, DB2 will be installed in-cluster (suitable for development and testing).",
+                "Alternatively, you can connect to an external Oracle or DB2 database (supported in AI Service 9.1.x only).",
+                # "Alternatively, you can connect to an external database (Oracle, SQL Server, or DB2).",
+            ]
+        )
+
+        if self.yesOrNo("Do you want to use an external database"):
+            # Configure external database
+            self.setParam("install_db2", "false")
+            self.setParam("db2_action_aiservice", "byo")
+
+            self.printDescription(
+                [
+                    "Provide connection details for your external Oracle or DB2 database.",
+                    "",
+                    "JDBC URL Example:",
+                    "  Oracle:     jdbc:oracle:thin:@//hostname:1521/servicename",
+                    "  DB2:        jdbc:db2://hostname:50000/database",
+                    # "  SQL Server: jdbc:sqlserver://hostname:1433;databaseName=aiservice",
+                ]
+            )
+
+            self.promptForString("Database JDBC URL", "aiservice_db_jdbc_url")
+            self.promptForString("Database Username", "aiservice_db_username")
+            self.promptForString("Database Password", "aiservice_db_password", isPassword=True)
+
+            if self.yesOrNo("Does the database use SSL/TLS with a self-signed certificate"):
+                self.promptForString(
+                    "Database CA certificate (PEM format)",
+                    "aiservice_db_ca_cert",
+                )
+        else:
+            # Install DB2 for AI Service
+            self.setParam("install_db2", "true")
+            self.setParam("db2_action_aiservice", "install")
+
+            # Prompt for DB2 license file (same as standalone)
+            self.printDescription(
+                [
+                    "Db2 Universal Operator for v12 onwards requires a License activation key",
+                    "If you don't have a license, press enter to continue.",
+                ]
+            )
+            db2LicenseFile = self.promptForString("Db2 License file", "db2_license_file")
+            if db2LicenseFile and db2LicenseFile.strip() != "":
+                self.db2LicenseFileLocal = db2LicenseFile
+
+    @logMethodCall
+    def configAIServiceDatabaseInDependencies(self) -> None:
+        """Wrapper method to configure AI Service database in the Dependencies section"""
+        if self.installAIService:
+            self.configAIServiceDatabase()
+
     @logMethodCall
     def aiServiceSettings(self) -> None:
         if self.installAIService:
@@ -2002,6 +2058,7 @@ class InstallApp(
         self.arcgisSettings()  # Will only prompt if Manage (with Spatial) or Facilities is selected
         self.configMongoDb()
         self.configDb2()
+        self.configAIServiceDatabaseInDependencies()  # Configure AI Service database
         self.configKafka()  # Will only do anything if IoT has been selected for install
         self.configAi()  # Configure AI Service integration
 
@@ -2190,9 +2247,24 @@ class InstallApp(
             elif key == "aiservice_channel":
                 if value is not None and value != "":
                     self.setParam("aiservice_channel", value)
-                    # Install Db2 for AI Service
-                    self.setParam("db2_action_aiservice", "install")
                     self.installAIService = True
+
+                    # Check if external DB parameters are provided
+                    externalDbParams = ["aiservice_db_jdbc_url", "aiservice_db_username", "aiservice_db_password"]
+                    hasExternalDb = any(vars(self.args)[dbParam] is not None for dbParam in externalDbParams)
+
+                    if hasExternalDb:
+                        # Using external database - validate all required parameters
+                        self.setParam("install_db2", "false")
+                        self.setParam("db2_action_aiservice", "byo")
+                        for dbParam in externalDbParams:
+                            if vars(self.args)[dbParam] is None:
+                                self.fatalError(f"Parameter is required when using external database: --{dbParam.replace('_', '-')}")
+                    else:
+                        # Default: Install DB2 in-cluster
+                        self.setParam("install_db2", "true")
+                        self.setParam("db2_action_aiservice", "install")
+
                     # Set manage - bind - AI Service params same as provided AI Service's params
                     self.setParam(
                         "manage_bind_aiservice_instance_id",
@@ -2867,7 +2939,6 @@ class InstallApp(
                     aiserviceConfig=self.aiserviceConfigSecret,
                     slack_token=self.getParam("slack_token"),
                     slack_channel=self.getParam("slack_channel"),
-                    ibm_entitlement_key=self.getParam("ibm_entitlement_key"),
                 )
 
                 self.setupApprovals(pipelinesNamespace)

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/install/argBuilder.py

@@ -376,6 +376,22 @@ class installArgBuilderMixin:
             if self.getParam("aiservice_certificate_issuer") != "":
                 command += f"  --aiservice-certificate-issuer \"{self.getParam('aiservice_certificate_issuer')}\"{newline}"
 
+            # Database configuration for AI Service - matches standalone pattern
+            if self.getParam("db2_action_aiservice") == "install":
+                # In-cluster DB2 installation
+                command += f"  --db2-aiservice{newline}"
+                if self.getParam("db2_channel") != "":
+                    command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
+                if self.db2LicenseFileLocal:
+                    command += f'  --db2-license-file "{self.db2LicenseFileLocal}"{newline}'
+            elif self.getParam("aiservice_db_jdbc_url") != "":
+                # External database (Oracle/SQL Server/DB2)
+                command += f"  --aiservice-db-jdbc-url \"{self.getParam('aiservice_db_jdbc_url')}\"{newline}"
+                command += f"  --aiservice-db-username \"{self.getParam('aiservice_db_username')}\"{newline}"
+                command += f"  --aiservice-db-password \"{self.getParam('aiservice_db_password')}\"{newline}"
+                if self.getParam("aiservice_db_ca_cert") != "":
+                    command += f"  --aiservice-db-ca-cert \"{self.getParam('aiservice_db_ca_cert')}\"{newline}"
+
             if self.getParam("aiservice_s3_accesskey") != "" and self.getParam("minio_root_user") == "":
                 command += f"  --s3-accesskey \"{self.getParam('aiservice_s3_accesskey')}\"{newline}"
             if self.getParam("aiservice_s3_secretkey") != "" and self.getParam("minio_root_user") == "":

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/install/argParser.py

@@ -1186,6 +1186,38 @@ db2ArgGroup.add_argument(
     action="store_const",
     const="install",
 )
+db2ArgGroup.add_argument(
+    "--db2-aiservice",
+    dest="db2_action_aiservice",
+    required=False,
+    help="Install a dedicated Db2u instance for Maximo AI Service (supported by AI Service)",
+    action="store_const",
+    const="install",
+)
+db2ArgGroup.add_argument(
+    "--aiservice-db-jdbc-url",
+    dest="aiservice_db_jdbc_url",
+    required=False,
+    help="JDBC URL for external database (Oracle, SQL Server, or external DB2) for AI Service",
+)
+db2ArgGroup.add_argument(
+    "--aiservice-db-username",
+    dest="aiservice_db_username",
+    required=False,
+    help="Username for external database connection for AI Service",
+)
+db2ArgGroup.add_argument(
+    "--aiservice-db-password",
+    dest="aiservice_db_password",
+    required=False,
+    help="Password for external database connection for AI Service",
+)
+db2ArgGroup.add_argument(
+    "--aiservice-db-ca-cert",
+    dest="aiservice_db_ca_cert",
+    required=False,
+    help="CA certificate for external database connection (PEM format, optional) for AI Service",
+)
 db2ArgGroup.add_argument(
     "--db2-type",
     required=False,

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/install/params.py

@@ -224,6 +224,12 @@ optionalParams = [
     "aiservice_instance_id",
     "aiservice_watsonxai_instance_id",
     "aiservice_watsonxai_verify",
+    "aiservice_db_jdbc_url",
+    "aiservice_db_username",
+    "aiservice_db_password",
+    "aiservice_db_ca_cert",
+    "install_db2",
+    "db2_action_aiservice",
     "minio_root_user",
     "minio_root_password",
     "tenant_entitlement_type",

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/install/summarizer.py

@@ -371,6 +371,38 @@ class InstallSummarizerMixin:
             if "aiservice_certificate_issuer" in self.params:
                 self.printParamSummary("Certificate Issuer", "aiservice_certificate_issuer")
 
+            # Database configuration - matches standalone aiservice-install pattern
+            self.printH2("AI Service Database Configuration")
+            db2_action = self.getParam("db2_action_aiservice")
+
+            if db2_action == "byo":
+                # External database
+                jdbc_url = self.getParam("aiservice_db_jdbc_url")
+                if jdbc_url:
+                    # Determine database type from JDBC URL
+                    if "oracle" in jdbc_url.lower():
+                        db_type = "External Database (Oracle)"
+                    # elif "sqlserver" in jdbc_url.lower():
+                    #     db_type = "External Database (SQL Server)"
+                    # elif "db2" in jdbc_url.lower():
+                    #     db_type = "External Database (DB2)"
+                    else:
+                        db_type = "External Database"
+
+                    self.printSummary("Database Type", db_type)
+                    self.printParamSummary("JDBC URL", "aiservice_db_jdbc_url")
+                    self.printParamSummary("Username", "aiservice_db_username")
+                    # Don't print password for security
+                    if self.getParam("aiservice_db_ca_cert"):
+                        self.printSummary("CA Certificate", "Provided")
+            else:
+                # In-cluster DB2 deployment (default when db2_action="install" or not set)
+                self.printSummary("Database Type", "In-cluster DB2")
+                if self.getParam("db2_namespace") != "":
+                    self.printParamSummary("Install Namespace", "db2_namespace")
+                if self.getParam("db2_channel") != "":
+                    self.printParamSummary("Subscription Channel", "db2_channel")
+
             self.printH2("AI Service Tenant Configuration")
             self.printParamSummary("Entitlement Type", "tenant_entitlement_type")
             self.printParamSummary("Start Date", "tenant_entitlement_start_date")

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/must_gather/app.py

@@ -23,7 +23,7 @@ from .arg_parser import mustGatherArgParser
 from .output import OutputManager
 from .timer import Timer
 from . import ocp
-from .dependencies import sls
+from .dependencies import sls, amlen as amlen_dep
 from .mas import core as mas_core, apps as mas_apps, pipelines as mas_pipelines
 from .aiservice import instance as aiservice_instance
 from .argo import applications as argo
@@ -411,8 +411,8 @@ class MustGatherApp(BaseApp):
         masInstanceIds = parsedArgs.mas_instance_ids.split(",") if parsedArgs.mas_instance_ids else None
         masAppIds = parsedArgs.mas_app_ids.split(",") if parsedArgs.mas_app_ids else None
 
-        # MAS Discovery (triggered by 'mas' or 'lic' collector)
-        if "mas" in enabledCollectors or "lic" in enabledCollectors:
+        # MAS Discovery (triggered by 'mas', 'lic', or 'amlen' collector)
+        if "mas" in enabledCollectors or "lic" in enabledCollectors or "amlen" in enabledCollectors:
             try:
                 # Add MAS Core collection tasks
                 coreNamespaces = mas_core.addMASCoreToCollectionPlan(
@@ -438,6 +438,18 @@ class MustGatherApp(BaseApp):
                             masAppIds=masAppIds,
                         )
 
+                    # Amlen Message Gateway log collection (runs when 'amlen' collector is enabled)
+                    # Collects from the IoT namespace (mas-{instance}-iot) where mbgx pods run
+                    if "amlen" in enabledCollectors:
+                        for coreNs in sorted(coreNamespaces):
+                            instanceId = coreNs[4:-5]  # Remove "mas-" prefix and "-core" suffix
+                            iotNamespace = f"mas-{instanceId}-iot"
+                            amlen_dep.addAmlenToCollectionPlan(
+                                plan=plan,
+                                namespace=iotNamespace,
+                                outputDir=outputDir,
+                            )
+
                 else:
                     logger.debug("No MAS instances discovered")
             except Exception as e:

{mas_cli-22.0.2 → mas_cli-23.1.0}/python/src/mas/cli/must_gather/arg_parser.py

@@ -72,7 +72,7 @@ def _parse_args_wrapper(args=None, namespace=None):
 
 
 # Define all available collectors
-ALL_COLLECTORS = ["ocp", "db2", "kafka", "mongodb", "cp4d", "cert-manager", "grafana", "sls", "mas", "rhoai", "aiservice", "lic", "pipelines"]
+ALL_COLLECTORS = ["ocp", "db2", "kafka", "mongodb", "cp4d", "cert-manager", "grafana", "sls", "mas", "rhoai", "aiservice", "lic", "pipelines", "amlen"]
 
 
 def validateCollectors(collectorsStr: str) -> str: