From 2d5020e3b650c8df92e8a0a6c49426d801055eb7 Mon Sep 17 00:00:00 2001 From: Rong Gao Date: Tue, 21 May 2019 21:24:59 +0800 Subject: [PATCH] enrich oom event message info --- pkg/kubelet/oom/oom_watcher_linux.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/oom/oom_watcher_linux.go b/pkg/kubelet/oom/oom_watcher_linux.go index 82984d23904..dd8fcc39ee0 100644 --- a/pkg/kubelet/oom/oom_watcher_linux.go +++ b/pkg/kubelet/oom/oom_watcher_linux.go @@ -19,6 +19,8 @@ limitations under the License. package oom import ( + "fmt" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/runtime" @@ -58,7 +60,11 @@ func (ow *realWatcher) Start(ref *v1.ObjectReference) error { for event := range outStream { if event.ContainerName == "/" { klog.V(1).Infof("Got sys oom event: %v", event) - ow.recorder.PastEventf(ref, metav1.Time{Time: event.TimeOfDeath}, v1.EventTypeWarning, systemOOMEvent, "System OOM encountered") + eventMsg := "System OOM encountered" + if event.ProcessName != "" && event.Pid != 0 { + eventMsg = fmt.Sprintf("%s, victim process: %s, pid: %d", eventMsg, event.ProcessName, event.Pid) + } + ow.recorder.PastEventf(ref, metav1.Time{Time: event.TimeOfDeath}, v1.EventTypeWarning, systemOOMEvent, eventMsg) } } klog.Errorf("Unexpectedly stopped receiving OOM notifications")