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

[kubernetes] add kube-system-log-files option, collect some kubelet files #3869

Merged
merged 2 commits into from
Dec 13, 2024
Merged

[kubernetes] add kube-system-log-files option, collect some kubelet files #3869

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c9b844
[kubernetes] collect some kubelet files
champtar Dec 11, 2024
2a358b3
[kubernetes] add kubelogs option
champtar Dec 11, 2024
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
21 changes: 19 additions & 2 deletions sos/report/plugins/kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ class Kubernetes(Plugin):
config_files = [
"/etc/kubernetes",
"/run/flannel",
"/var/lib/kubelet/config.yaml",
"/var/lib/kubelet/kubeadm-flags.env",
"/var/lib/kubelet/*_manager_state",
]
forbidden_paths = [
"/etc/kubernetes/pki",
]
kube_system_logs = [
"/var/log/pods/kube-system_etcd-*",
"/var/log/pods/kube-system_kube-apiserver-*",
"/var/log/pods/kube-system_kube-controller-manager-*",
"/var/log/pods/kube-system_kube-scheduler-*",
]
resources = [
'events',
Expand Down Expand Up @@ -82,8 +94,10 @@ class Kubernetes(Plugin):
desc='collect all namespace output separately'),
PluginOpt('describe', default=False,
desc='collect describe output of all resources'),
PluginOpt('kubelogs', default=False,
desc='copy some kube-system pod logs without using the API'),
PluginOpt('podlogs', default=False,
desc='capture stdout/stderr logs from pods'),
desc='capture stdout/stderr logs from pods using the API'),
PluginOpt('podlogs-filter', default='', val_type=str,
desc='only collect logs from pods matching this pattern')
]
Expand All @@ -105,7 +119,10 @@ def check_is_master(self):
def setup(self):
self.add_copy_spec(self.config_files)

self.add_forbidden_path("/etc/kubernetes/pki")
self.add_forbidden_path(self.forbidden_paths)

if self.get_option('kubelogs'):
self.add_copy_spec(self.kube_system_logs)

self.add_env_var([
'KUBECONFIG',
Expand Down
Loading