From 744b4356486e19783e9189828401c8aa60c94f60 Mon Sep 17 00:00:00 2001 From: wguy Date: Wed, 20 Nov 2024 09:44:48 -0800 Subject: [PATCH] Add kubelet config state files and Kubernetes PDB to collect Update collect to save kubelet information including state files and config data from /var/lib/kubelet, and query pods with Pod Disruption Budget. Test plan: AIO-SX: PASS: Verify collect has var/lib/kubelet contents PASS: Verify collect containerization_kube.info contains PDB Closes-Bug: #2091674 Implements: stx utilities tools Change-Id: Ib025696f0832d557614b2d20f735fa102460bde8 Signed-off-by: wguy --- .../collector/debian-scripts/collect_containerization.sh | 1 + tools/collector/debian-scripts/collect_host | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/tools/collector/debian-scripts/collect_containerization.sh b/tools/collector/debian-scripts/collect_containerization.sh index a3585928..f87a942c 100755 --- a/tools/collector/debian-scripts/collect_containerization.sh +++ b/tools/collector/debian-scripts/collect_containerization.sh @@ -97,6 +97,7 @@ if [ "$nodetype" = "controller" -a "${ACTIVE}" = true ] ; then CMDS+=("kubectl describe helmrepositories.source.toolkit.fluxcd.io -A") CMDS+=("kubectl describe helmcharts.source.toolkit.fluxcd.io -A") CMDS+=("kubectl describe helmreleases.helm.toolkit.fluxcd.io -A") + CMDS+=("kubectl get poddisruptionbudgets -A") DELAY_THROTTLE=4 delay_count=0 diff --git a/tools/collector/debian-scripts/collect_host b/tools/collector/debian-scripts/collect_host index 01d3b925..b1cc743e 100755 --- a/tools/collector/debian-scripts/collect_host +++ b/tools/collector/debian-scripts/collect_host @@ -438,6 +438,15 @@ for i in /var/lib/ceph/data/rook-ceph/log/*; do fi done +# Add kubelet config state files +for i in /var/lib/kubelet/*; do + if [ -e "$i" ]; then + kube_config_dir="var/lib/kubelet" + mkdir -p ${COLLECT_NAME_DIR}/$kube_config_dir + cp $i ${COLLECT_NAME_DIR}/$kube_config_dir + fi +done + sleep ${COLLECT_RUNEXTRA_DELAY} echo "$(date +'%H:%M:%S.%3N'): Running host tars" >> ${COLLECT_CMD_TIMING_LOG}