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.

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

Replace debug script with updated script from EKS AMI #864

Merged
merged 1 commit into from
Mar 24, 2020

Conversation

mogren
Copy link
Contributor

@mogren mogren commented Mar 11, 2020

Issue: #803

The aws-cni-support.sh script has not been kept up to date. Replacing with eks-log-collector.sh from awslabs/amazon-eks-ami by @nithu0115.

Description of changes:

  • Copied eks-log-collector.sh script
  • Changed output dir to /var/log
  • Added kube-system_cni-metrics-helper to logs being collected.
  • Hide errors when trying to copy logs from missing pods: 2>/dev/null

Test output:

$ sudo /opt/cni/bin/eks-log-collector.sh

	This is version 0.6.0. New versions can be found at https://github.com/awslabs/amazon-eks-ami/blob/master/log-collector-script/

Trying to collect common operating system logs...
Trying to collect kernel logs...
Trying to collect mount points and volume information...
Trying to collect SELinux status...
Trying to collect iptables information...
Trying to collect installed packages...
Trying to collect active system services...
Trying to collect Docker daemon information...
Trying to collect kubelet information...
Trying to collect L-IPAMD introspectioon information... Trying to collect L-IPAMD prometheus metrics...
Trying to collect sysctls information...
Trying to collect networking infomation...
Trying to collect CNI configuration information...
Trying to collect Docker daemon logs...
Trying to archive gathered information...

	Done... your bundled logs are located in /var/log/eks_i-0098c7e803266a475_2020-03-11_2047-UTC_0.6.0.tar.gz

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@mogren mogren force-pushed the update-log-script branch from 55143b1 to 0593988 Compare March 13, 2020 17:41
@mogren mogren requested a review from jaypipes March 13, 2020 18:08
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mogren I would much rather we delete the aws-cni-support.sh script from the CNI plugin repo and curl/wget the aws-log-collector.sh script from the eks-ami-builder repo in the Dockerfile, renaming it to aws-cni-support.sh (for backwards compatibility reasons since we have many issues that reference it).

We do this for the CNI base plugins and portmap already here:

curl -L $(FETCH_URL) | tar -z -x ./portmap

We should do the same for the aws-log-collector script, IMHO, and remove it from the CNI repo.

@mogren mogren force-pushed the update-log-script branch 5 times, most recently from 539c4f5 to aeeb94c Compare March 23, 2020 18:32
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

The aws-cni-support.sh has not been kept up to date. Replacing with
eks-log-collector.sh from awslabs/amazon-eks-ami

Issue: aws#803
@mogren mogren force-pushed the update-log-script branch from 42615b3 to 5fa1f14 Compare March 24, 2020 16:28
@mogren mogren merged commit 2897f08 into aws:master Mar 24, 2020
nithu0115 added a commit to nithu0115/amazon-eks-user-guide that referenced this pull request Apr 28, 2020
Updated troubleshooting doc to point to latest EKS log collector script which now is in EKS AMI GitHub repository. 

Ref: aws/amazon-vpc-cni-k8s#864
@mogren mogren deleted the update-log-script branch August 24, 2020 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants