github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #776 from jodh-intel/bling-collect-script

Browse Source 
scripts: Use syntax highlighting in collect script
This commit is contained in:
Julio Montes 2018-09-26 08:47:15 -05:00 committed by GitHub
commit 0d99a4f49f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
data/kata-collect-data.sh.in
View File

@ -143,22 +143,30 @@ have_cmd()
show_quoted_text() show_quoted_text()
{ {
local language="$1"
shift
local text="$*" local text="$*"
echo "\`\`\`" echo "\`\`\`${language}"
echo "$text" echo "$text"
echo "\`\`\`" echo "\`\`\`"
} }
run_cmd_and_show_quoted_output() run_cmd_and_show_quoted_output()
{ {
local language="$1"
shift
local cmd="$*" local cmd="$*"
local output local output
msg "Output of \"\`$cmd\`\":" msg "Output of \"\`$cmd\`\":"
output=$(eval "$cmd" 2>&1) output=$(eval "$cmd" 2>&1)
show_quoted_text "$output" show_quoted_text "${language}" "$output"
} }
show_runtime_configs() show_runtime_configs()
@ -175,7 +183,7 @@ show_runtime_configs()
subheading "Runtime default config files" subheading "Runtime default config files"
show_quoted_text "$configs" show_quoted_text "" "$configs"
# add in the standard defaults for good measure "just in case" # add in the standard defaults for good measure "just in case"
configs+=" /etc/@PROJECT_TAG@/configuration.toml" configs+=" /etc/@PROJECT_TAG@/configuration.toml"
@ -190,7 +198,7 @@ show_runtime_configs()
for config in $configs; do for config in $configs; do
if [ -e "$config" ]; then if [ -e "$config" ]; then
run_cmd_and_show_quoted_output "cat \"$config\"" run_cmd_and_show_quoted_output "toml" "cat \"$config\""
else else
msg "Config file \`$config\` not found" msg "Config file \`$config\` not found"
fi fi
@ -237,7 +245,7 @@ find_system_journal_problems()
if [ -n "$problems" ]; then if [ -n "$problems" ]; then
msg "Recent $name problems found in $data_source:" msg "Recent $name problems found in $data_source:"
show_quoted_text "$problems" show_quoted_text "" "$problems"
else else
msg "No recent $name problems found in $data_source." msg "No recent $name problems found in $data_source."
fi fi
@ -296,11 +304,11 @@ show_package_versions()
pattern+=")" pattern+=")"
if have_cmd "dpkg"; then if have_cmd "dpkg"; then
run_cmd_and_show_quoted_output "dpkg -l|egrep \"$pattern\"" run_cmd_and_show_quoted_output "" "dpkg -l|egrep \"$pattern\""
fi fi
if have_cmd "rpm"; then if have_cmd "rpm"; then
run_cmd_and_show_quoted_output "rpm -qa|egrep \"$pattern\"" run_cmd_and_show_quoted_output "" "rpm -qa|egrep \"$pattern\""
fi fi
separator separator
@ -312,20 +320,20 @@ show_container_mgr_details()
if have_cmd "docker"; then if have_cmd "docker"; then
subheading "Docker" subheading "Docker"
run_cmd_and_show_quoted_output "docker version" run_cmd_and_show_quoted_output "" "docker version"
run_cmd_and_show_quoted_output "docker info" run_cmd_and_show_quoted_output "" "docker info"
run_cmd_and_show_quoted_output "systemctl show docker" run_cmd_and_show_quoted_output "" "systemctl show docker"
fi fi
if have_cmd "kubectl"; then if have_cmd "kubectl"; then
subheading "Kubernetes" subheading "Kubernetes"
run_cmd_and_show_quoted_output "kubectl version" run_cmd_and_show_quoted_output "" "kubectl version"
run_cmd_and_show_quoted_output "kubectl config view" run_cmd_and_show_quoted_output "" "kubectl config view"
run_cmd_and_show_quoted_output "systemctl show kubelet" run_cmd_and_show_quoted_output "" "systemctl show kubelet"
if have_cmd "crio"; then if have_cmd "crio"; then
run_cmd_and_show_quoted_output "crio --version" run_cmd_and_show_quoted_output "" "crio --version"
run_cmd_and_show_quoted_output "systemctl show crio" run_cmd_and_show_quoted_output "" "systemctl show crio"
fi fi
fi fi
@ -352,7 +360,7 @@ show_runtime()
cmd="@PROJECT_TYPE@-env" cmd="@PROJECT_TYPE@-env"
heading "\`$cmd\`" heading "\`$cmd\`"
run_cmd_and_show_quoted_output "$runtime $cmd" run_cmd_and_show_quoted_output "toml" "$runtime $cmd"
separator separator
} }
@ -570,7 +578,7 @@ show_throttler_details()
do do
local cmd local cmd
cmd="$throttler --version" cmd="$throttler --version"
run_cmd_and_show_quoted_output "$cmd" run_cmd_and_show_quoted_output "" "$cmd"
done done
subheading "systemd service" subheading "systemd service"
@ -586,7 +594,7 @@ show_throttler_details()
"vc-throttler" "vc-throttler"
do do
systemctl status "${unit}" >/dev/null 2>&1 && \ systemctl status "${unit}" >/dev/null 2>&1 && \
run_cmd_and_show_quoted_output "systemctl show ${unit}" run_cmd_and_show_quoted_output "" "systemctl show ${unit}"
done done
} }
@ -604,7 +612,7 @@ show_image_details()
if [ -n "$image" ] if [ -n "$image" ]
then then
details=$(get_image_details "$image") details=$(get_image_details "$image")
show_quoted_text "$details" show_quoted_text "yaml" "$details"
else else
msg "No image" msg "No image"
fi fi
@ -626,7 +634,7 @@ show_initrd_details()
if [ -n "$initrd" ] if [ -n "$initrd" ]
then then
details=$(get_initrd_details "$initrd") details=$(get_initrd_details "$initrd")
show_quoted_text "$details" show_quoted_text "yaml" "$details"
else else
msg "No initrd" msg "No initrd"
fi fi