Skip to content

Commit 67937db

Browse files
dosaboyarif-ali
authored andcommitted
[kubernetes] Don't use wildcard for k8s systemd units
Using a wildcard to get all k8s units from journald takes inordinately longer than specifying each unit individually. We now explicity list each systemd k8s unit we want to get logs for. Signed-off-by: Edward Hope-Morley <edward.hope-morley@canonical.com>
1 parent 4ff8b10 commit 67937db

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

sos/report/plugins/kubernetes.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,15 @@ def setup(self):
348348
super().setup()
349349

350350
def _canonical_kubernetes(self):
351-
self.add_journal(units="snap.k8s.*")
351+
k8s_units = ['snap.k8s.containerd.service',
352+
'snap.k8s.etcd.service',
353+
'snap.k8s.k8sd.service',
354+
'snap.k8s.kube-apiserver.service',
355+
'snap.k8s.kube-controller-manager.service',
356+
'snap.k8s.kube-proxy.service',
357+
'snap.k8s.kube-scheduler.service',
358+
'snap.k8s.kubelet.service']
359+
self.add_journal(units=k8s_units)
352360

353361
k8s_cmd = "k8s"
354362
k8s_common = "/var/snap/k8s/common"

0 commit comments

Comments
 (0)