Merge pull request #9 from NUCsimple/master

fix event message

Author: ringtail

pkg/custompluginmonitor/custom_plugin_monitor.go

@@ -231,6 +231,7 @@ func (c *customPluginMonitor) generateStatus(result cpmtypes.Result) *types.Stat
 						status,
 						newReason,
 						timestamp,
+						result.Message,
 					)
 
 					if status == types.True {

pkg/systemlogmonitor/log_monitor.go

@@ -193,6 +193,7 @@ func (l *logMonitor) generateStatus(logs []*logtypes.Log, rule systemlogtypes.Ru
 						types.True,
 						rule.Reason,
 						timestamp,
+						condition.Message,
 					))
 				}
 				condition.Status = types.True

pkg/systemlogmonitor/log_monitor_test.go

@@ -85,6 +85,7 @@ func TestGenerateStatusForConditions(t *testing.T) {
 					types.True,
 					"test reason",
 					time.Unix(1000, 1000),
+					"message 1",
 				)},
 				Conditions: []types.Condition{
 					{

pkg/util/helpers.go

@@ -28,21 +28,21 @@ import (
 var osReleasePath = "/etc/os-release"
 
 // GenerateConditionChangeEvent generates an event for condition change.
-func GenerateConditionChangeEvent(t string, status types.ConditionStatus, reason string, timestamp time.Time) types.Event {
+func GenerateConditionChangeEvent(t string, status types.ConditionStatus, reason string, timestamp time.Time, msg string) types.Event {
 	return types.Event{
 		Severity:  types.Info,
 		Timestamp: timestamp,
 		Reason:    reason,
-		Message:   fmt.Sprintf("Node condition %s is now: %s, reason: %s", t, status, reason),
+		Message:   fmt.Sprintf("Node condition %s is now: %s, reason: %s, msg: %s", t, status, reason, msg),
 	}
 }
 
-func GenerateWarnConditionChangeEvent(t string, status types.ConditionStatus, reason string, timestamp time.Time) types.Event {
+func GenerateWarnConditionChangeEvent(t string, status types.ConditionStatus, reason string, timestamp time.Time, msg string) types.Event {
 	return types.Event{
 		Severity:  types.Warn,
 		Timestamp: timestamp,
 		Reason:    reason,
-		Message:   fmt.Sprintf("Node condition %s is now: %s, reason: %s", t, status, reason),
+		Message:   fmt.Sprintf("Node condition %s is now: %s, reason: %s, msg: %s", t, status, reason, msg),
 	}
 }