mas-cli 22.0.1__tar.gz → 22.0.3__tar.gz

{mas_cli-22.0.1/python/src/mas_cli.egg-info → mas_cli-22.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 22.0.1
+Version: 22.0.3
 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.1 → mas_cli-22.0.3}/python/src/mas/cli/__init__.py

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

{mas_cli-22.0.1 → mas_cli-22.0.3}/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.1"
+        self.version: str = "22.0.3"
         self.h1count: int = 0
         self.h2count: int = 0
 

{mas_cli-22.0.1 → mas_cli-22.0.3}/python/src/mas/cli/must_gather/mas/apps.py

@@ -108,6 +108,12 @@ def _getReconcileLogsOperatorsForApp(namespace: str, appId: str) -> List[Tuple[s
             (namespace, "operator", "ibm-truststore-mgr"),
             (namespace, "mas.ibm.com/appType", "serverBundle"),
         ]
+    elif appId == "monitor":
+        operators = [
+            (namespace, "control-plane", "ibm-mas-monitor"),
+            (namespace, "mas.ibm.com/appType", "entitymgr-ws-operator"),
+            (namespace, "operator", "ibm-truststore-mgr"),
+        ]
     elif appId == "iot":
         operators = [
             (namespace, "control-plane", "ibm-iot-operator"),

{mas_cli-22.0.1 → mas_cli-22.0.3}/python/src/mas/cli/must_gather/mas/core.py

@@ -22,8 +22,8 @@ from typing import Set, Optional, List
 from kubernetes.dynamic import DynamicClient
 from kubernetes import client
 
+from mas.cli.must_gather.common import generateReconcileLogsCollectionTasks
 from mas.cli.must_gather.common.task_generation import generateNamespaceCollectionTasks
-from mas.cli.must_gather.common.reconcile_logs import collectReconcileLogs
 from mas.cli.must_gather.common.pod_exec import execCurlInPod
 from .network_tests import testCoreToManageConnectivity
 from .version import isMAS91OrLater
@@ -249,16 +249,24 @@ def _generateMASCoreCollectionTasks(
         )
 
         # Add MAS Core-specific task: Collect reconcile logs from MAS operator
-        tasks.append(
-            (
-                "reconcile_logs_mas_operator",
-                collectReconcileLogs,
-                namespace,
-                "app.kubernetes.io/name",
-                "ibm-mas-operator",
-                outputDir,
-            )
-        )
+        operators = [
+            (namespace, "control-plane", "ibm-mas"),
+            (namespace, "control-plane", "ibm-mas-ws"),
+            (namespace, "control-plane", "ibm-mas-coreidp"),
+            (namespace, "control-plane", "ibm-mas-addons"),
+            (namespace, "control-plane", "ibm-mas-cfg-ai"),
+            (namespace, "control-plane", "ibm-mas-cfg-app"),
+            (namespace, "control-plane", "ibm-mas-cfg-bas"),
+            (namespace, "control-plane", "ibm-mas-cfg-idp"),
+            (namespace, "control-plane", "ibm-mas-cfg-scim"),
+            (namespace, "control-plane", "ibm-mas-cfg-jdbc"),
+            (namespace, "control-plane", "ibm-mas-cfg-mongo"),
+            (namespace, "control-plane", "ibm-mas-cfg-kafka"),
+            (namespace, "control-plane", "ibm-mas-cfg-objectstorage"),
+            (namespace, "control-plane", "ibm-mas-cfg-smtp"),
+            (namespace, "operator", "ibm-truststore-mgr"),
+        ]
+        tasks.extend(generateReconcileLogsCollectionTasks(operators, outputDir))
 
         # Add network connectivity test (Core to Manage)
         tasks.append(