From 805d5168b9507ac0d923d178769df007e19f455c Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Thu, 3 Jan 2019 10:39:10 -0600 Subject: [PATCH] (debug) debug-report.sh support ns filter - Support NAMESPACE_FILTER as a grep filter for which namespaces to collect pod logs for - Default report location to /var/tmp and support override with BASETEMP Change-Id: I8c302313c3c0492a9db856332067f77fb5a41a19 --- .../templates/roles/common/usr/local/bin/debug-report.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/promenade/templates/roles/common/usr/local/bin/debug-report.sh b/promenade/templates/roles/common/usr/local/bin/debug-report.sh index d277ec0f..b9a5ca8e 100755 --- a/promenade/templates/roles/common/usr/local/bin/debug-report.sh +++ b/promenade/templates/roles/common/usr/local/bin/debug-report.sh @@ -3,11 +3,13 @@ set -ux SUBDIR_NAME=debug-$(hostname) +BASETEMP=${BASETEMP:-"/var/tmp"} +NAMESPACE_PATTERN=${NAMESPACE_PATTERN:-'.*'} # NOTE(mark-burnett): This should add calicoctl to the path. export PATH=${PATH}:/opt/cni/bin -TEMP_DIR=$(mktemp -d) +TEMP_DIR=$(mktemp -d -p "$BASETEMP") export TEMP_DIR export BASE_DIR="${TEMP_DIR}/${SUBDIR_NAME}" export HELM_DIR="${BASE_DIR}/helm" @@ -18,7 +20,7 @@ mkdir -p "${BASE_DIR}" PARALLELISM_FACTOR=2 function get_namespaces () { - kubectl get namespaces -o name | awk -F '/' '{ print $NF }' + kubectl get namespaces -o name | awk -F '/' '{ print $NF }' | grep -E "$NAMESPACE_PATTERN" } function get_pods () { @@ -125,3 +127,4 @@ fi wait tar zcf "${SUBDIR_NAME}.tgz" -C "${TEMP_DIR}" "${SUBDIR_NAME}" +echo "Report collected in $TEMP_DIR/${SUBDIR_NAME}.tgz"