[patch] Must-Gather for Manage (#453)

ibm-mas · Sep 6, 2023 · 950224f · 950224f
1 parent 1713968
commit 950224f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 21 deletions.
diff --git a/image/cli/mascli/must-gather/mg-collect-mas-core b/image/cli/mascli/must-gather/mg-collect-mas-core
@@ -8,25 +8,29 @@ OUTPUT_DIR=$2
 # Collect Reconcile Logs
 # -----------------------------------------------------------------------------
 # Primary Resources
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-ws $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-ws $OUTPUT_DIR
 
 # Internals
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-coreidp $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-coreidp $OUTPUT_DIR
 
 # Addons
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-addons $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-addons $OUTPUT_DIR
 
 # Configurations
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-bas $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-sls $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-idp $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-scim $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-jdbc $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-mongo $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-kafka $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-objectstorage $OUTPUT_DIR
-$DIR/mg-collect-reconcile-logs $NAMESPACE ibm-mas-cfg-smtp $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-bas $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-sls $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-idp $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-scim $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-jdbc $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-mongo $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-kafka $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-objectstorage $OUTPUT_DIR
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-cfg-smtp $OUTPUT_DIR
+
+#Truststore
+$DIR/mg-collect-reconcile-logs $NAMESPACE operator ibm-truststore-mgr $OUTPUT_DIR
+
 
 # Collect Custom Resources
 # -----------------------------------------------------------------------------

diff --git a/image/cli/mascli/must-gather/mg-collect-mas-manage b/image/cli/mascli/must-gather/mg-collect-mas-manage
@@ -6,6 +6,26 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 NAMESPACE=$1
 OUTPUT_DIR=$2
 
+# Collect Reconcile Logs
+# -----------------------------------------------------------------------------
+# Operators 
+$DIR/mg-collect-reconcile-logs $NAMESPACE control-plane ibm-mas-manage $OUTPUT_DIR 
+$DIR/mg-collect-reconcile-logs $NAMESPACE mas.ibm.com/appType imagestitching-entitymgr-operator $OUTPUT_DIR
+
+#WS
+$DIR/mg-collect-reconcile-logs $NAMESPACE mas.ibm.com/appType entitymgr-ws-operator $OUTPUT_DIR 
+$DIR/mg-collect-reconcile-logs $NAMESPACE mas.ibm.com/appType healthext-entitymgr-ws-operator $OUTPUT_DIR
+
+#DB
+$DIR/mg-collect-reconcile-logs $NAMESPACE mas.ibm.com/appType maxinstudb $OUTPUT_DIR
+
+#Truststore
+$DIR/mg-collect-reconcile-logs $NAMESPACE operator ibm-truststore-mgr $OUTPUT_DIR
+
+#Server Bundle
+$DIR/mg-collect-reconcile-logs $NAMESPACE mas.ibm.com/appType serverBundle $OUTPUT_DIR
+
+
 # Collect Custom Resources
 # -----------------------------------------------------------------------------
   for RESOURCE in ManageApp ManageBuild ManageDeployment ManageServerBundle ManageStatusChecker ManageWorkspace HealthextApp HealthextWorkspace

diff --git a/image/cli/mascli/must-gather/mg-collect-reconcile-logs b/image/cli/mascli/must-gather/mg-collect-reconcile-logs
@@ -2,9 +2,11 @@
 set -e
 
 NAMESPACE=$1
-CONTROL_PLANE=$2
-OUTPUT_DIR=$3
-POD=$(oc -n $NAMESPACE get pods -l "control-plane=$CONTROL_PLANE" -o jsonpath="{.items[0].metadata.name}")
+LABEL_SELECTOR=$2
+LABEL_VALUE=$3
+OUTPUT_DIR=$4
+
+POD=$(oc -n $NAMESPACE get pods -l "$LABEL_SELECTOR=$LABEL_VALUE" -o jsonpath="{.items[0].metadata.name}")
 
 set +e
 LOGFILES=$(oc -n $NAMESPACE exec $POD -- find /tmp/ansible-operator/runner/ -name stdout 2>/dev/null)
@@ -13,14 +15,14 @@ if [[ "$?" == "1" ]]; then
 fi
 set -e
 
-TMP_DIR=${OUTPUT_DIR}/tmp-$CONTROL_PLANE
+TMP_DIR=${OUTPUT_DIR}/tmp-$LABEL_VALUE
 mkdir -p $TMP_DIR
 
-echo "  - Collecting reconcile logs from control plane '$CONTROL_PLANE'"
-oc -n $NAMESPACE exec $POD -- tar -czf - $LOGFILES > $TMP_DIR/ansible-logs-$CONTROL_PLANE.tgz 2> /dev/null
-tar -xf $TMP_DIR/ansible-logs-$CONTROL_PLANE.tgz -C $TMP_DIR 2> /dev/null
+echo "  - Collecting reconcile logs from '$LABEL_SELECTOR':'$LABEL_VALUE'"
+oc -n $NAMESPACE exec $POD -- tar -czf - $LOGFILES > $TMP_DIR/ansible-logs-$LABEL_VALUE.tgz 2> /dev/null
+tar -xf $TMP_DIR/ansible-logs-$LABEL_VALUE.tgz -C $TMP_DIR 2> /dev/null
 if [[ "$?" == "0" ]]; then
-  rm $TMP_DIR/ansible-logs-$CONTROL_PLANE.tgz
+  rm $TMP_DIR/ansible-logs-$LABEL_VALUE.tgz
 else
   echo_warning "    - Unable to get reconcile logs from $POD"
 fi