Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support docker-in-docker by only returning the oldest dockerd process #389

Merged
merged 1 commit into from
Jan 8, 2020
Merged

Support docker-in-docker by only returning the oldest dockerd process #389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions log-collector-script/eks-log-collector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env bash

# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
Expand Down Expand Up @@ -171,7 +171,7 @@ version_output() {
log_parameters() {
echo mode: "${mode}" >> "${COLLECT_DIR}"/system/script-params.txt
echo ignore_introspection: "${ignore_introspection}" >> "${COLLECT_DIR}"/system/script-params.txt
echo ignore_metrics: "${ignore_metrics}" >> "${COLLECT_DIR}"/system/script-params.txt
echo ignore_metrics: "${ignore_metrics}" >> "${COLLECT_DIR}"/system/script-params.txt
}

systemd_check() {
Expand All @@ -186,8 +186,8 @@ create_directories() {
# Make sure the directory the script lives in is there. Not an issue if
# the EKS AMI is used, as it will have it.
mkdir --parents "${PROGRAM_DIR}"
# Common directors creation

# Common directors creation
for directory in ${COMMON_DIRECTORIES[*]}; do
mkdir --parents "${COLLECT_DIR}"/"${directory}"
done
Expand Down Expand Up @@ -294,7 +294,7 @@ get_selinux_info() {

get_iptables_info() {
try "collect iptables information"

iptables --wait 1 --numeric --verbose --list --table mangle > "${COLLECT_DIR}"/networking/iptables-mangle.txt
iptables --wait 1 --numeric --verbose --list --table filter > "${COLLECT_DIR}"/networking/iptables-filter.txt
iptables --wait 1 --numeric --verbose --list --table nat > "${COLLECT_DIR}"/networking/iptables-nat.txt
Expand Down Expand Up @@ -401,7 +401,7 @@ get_ipamd_info() {
done
else
echo "Ignoring IPAM introspection stats as mentioned"| tee -a "${COLLECT_DIR}"/ipamd/ipam_introspection_ignore.txt

fi

if [[ "${ignore_metrics}" == "false" ]]; then
Expand All @@ -418,7 +418,7 @@ get_sysctls_info() {
try "collect sysctls information"
# dump all sysctls
sysctl --all >> "${COLLECT_DIR}"/sysctls/sysctl_all.txt 2>/dev/null

ok
}

Expand All @@ -440,7 +440,7 @@ get_cni_config() {

if [[ -e "/etc/cni/net.d/" ]]; then
cp --force --recursive --dereference /etc/cni/net.d/* "${COLLECT_DIR}"/cni/
fi
fi

ok
}
Expand Down Expand Up @@ -500,7 +500,7 @@ get_system_services() {
get_docker_info() {
try "collect Docker daemon information"

if [[ "$(pgrep dockerd)" -ne 0 ]]; then
if [[ "$(pgrep -o dockerd)" -ne 0 ]]; then
timeout 75 docker info > "${COLLECT_DIR}"/docker/docker-info.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker info output \" "
timeout 75 docker ps --all --no-trunc > "${COLLECT_DIR}"/docker/docker-ps.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker ps --all --no-truc output \" "
timeout 75 docker images > "${COLLECT_DIR}"/docker/docker-images.txt 2>&1 || echo -e "\tTimed out, ignoring \"docker images output \" "
Expand Down Expand Up @@ -543,7 +543,7 @@ enable_docker_debug() {
confirm_enable_docker_debug() {
read -r -p "${1:-Enabled Docker Debug will restart the Docker Daemon and restart all running container. Are you sure? [y/N]} " USER_INPUT
case "$USER_INPUT" in
[yY][eE][sS]|[yY])
[yY][eE][sS]|[yY])
enable_docker_debug
;;
*)
Expand Down