Skip to content

Commit df01c15

Browse files
author
高强
committed
fix 'pod oom event' obj's type is pod
1 parent 99200b9 commit df01c15

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

pkg/exporters/k8sexporter/k8s_exporter.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ func NewExporterOrDie(npdo *options.NodeProblemDetectorOptions) types.Exporter {
6969

7070
func (ke *k8sExporter) ExportProblems(status *types.Status) {
7171
for _, event := range status.Events {
72-
if event.ObjectType != "Pod"{
73-
ke.client.Eventf(util.ConvertToAPIEventType(event.Severity), status.Source, event.Reason, event.Message)
74-
}else {
72+
if util.PodOOMRegex.MatchString(event.Message) {
7573
ke.client.PodEventf(util.ConvertToAPIEventType(event.Severity), status.Source, event.Reason, event.Message)
74+
} else {
75+
ke.client.Eventf(util.ConvertToAPIEventType(event.Severity), status.Source, event.Reason, event.Message)
7676
}
7777
}
7878
for _, cdt := range status.Conditions {

pkg/exporters/k8sexporter/problemclient/problem_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (c *nodeProblemClient) Eventf(eventType, source, reason, messageFmt string,
120120
recorder.Eventf(c.nodeRef, eventType, reason, messageFmt, args...)
121121
}
122122

123-
// PodEventf will send Pod type event
123+
124124
func (c *nodeProblemClient) PodEventf(eventType, source, reason, messageFmt string, args ...interface{}) {
125125
recorder, found := c.recorders[source]
126126
if !found {

pkg/systemlogmonitor/log_monitor.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ func (l *logMonitor) generateStatus(logs []*logtypes.Log, rule systemlogtypes.Ru
225225
// For temporary error only generate event
226226
events = append(events, types.Event{
227227
Severity: types.Warn,
228-
ObjectType: "Pod",
229228
Timestamp: timestamp,
230229
Reason: rule.Reason,
231230
Message: message,

pkg/types/types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ type Event struct {
7777
Reason string `json:"reason"`
7878
// Message is a human readable message of why the event is generated.
7979
Message string `json:"message"`
80-
// ObjectType
81-
ObjectType string `json:"object_type"`
8280
}
8381

8482
// Status is the status other problem daemons should report to node problem detector.

0 commit comments

Comments
 (0)