diff --git a/pkg/event/msgbuilder.go b/pkg/event/msgbuilder.go index 6c90081ef0..f674b0b4ef 100644 --- a/pkg/event/msgbuilder.go +++ b/pkg/event/msgbuilder.go @@ -21,8 +21,8 @@ const ( func (k MsgKey) String() string { return [...]string{ - "Failed to satisfy policy on resource '%s'.The following rule(s) '%s' failed to apply. Created Policy Violation", - "Failed to process rule '%s' of policy '%s'. Created Policy Violation", + "Policy violation on resource '%s'. The rule(s) '%s' failed to apply", + "Failed to process rule '%s' of policy '%s'.", "Policy applied successfully on the resource '%s'", "Rule(s) '%s' of Policy '%s' applied successfully", "Resource %s creation blocked by rule(s) %s", diff --git a/pkg/gencontroller/generation.go b/pkg/gencontroller/generation.go index 76c03792e8..72989a8cc5 100644 --- a/pkg/gencontroller/generation.go +++ b/pkg/gencontroller/generation.go @@ -111,7 +111,7 @@ func (c *Controller) processPolicy(ns *corev1.Namespace, p *v1alpha1.Policy) { } else { // Event eventInfo = event.NewEvent(policyKind, "", policyInfo.Name, event.RequestBlocked, - event.FPolicyApplyBlockCreate, policyInfo.RName, policyInfo.GetRuleNames(false)) + event.FPolicyApplyBlockCreate, policyInfo.RNamespace+"/"+policyInfo.RName, policyInfo.GetRuleNames(false)) glog.V(2).Infof("Request blocked event info has prepared for %s/%s\n", policyKind, policyInfo.Name) diff --git a/pkg/webhooks/report.go b/pkg/webhooks/report.go index 7f9b4697af..d40a291efb 100644 --- a/pkg/webhooks/report.go +++ b/pkg/webhooks/report.go @@ -27,7 +27,7 @@ func newEventInfoFromPolicyInfo(policyInfoList []*info.PolicyInfo, onUpdate bool if !onUpdate { // CREATE eventsInfo = append(eventsInfo, - event.NewEvent(policyKind, "", pi.Name, event.RequestBlocked, event.FPolicyApplyBlockCreate, pi.RName, ruleNames)) + event.NewEvent(policyKind, "", pi.Name, event.RequestBlocked, event.FPolicyApplyBlockCreate, pi.RNamespace+"/"+pi.RName, ruleNames)) glog.V(3).Infof("Rule(s) %s of policy %s blocked resource creation, error: %s\n", ruleNames, pi.Name, msg) } else { @@ -35,7 +35,7 @@ func newEventInfoFromPolicyInfo(policyInfoList []*info.PolicyInfo, onUpdate bool eventsInfo = append(eventsInfo, event.NewEvent(pi.RKind, pi.RNamespace, pi.RName, event.RequestBlocked, event.FPolicyApplyBlockUpdate, ruleNames, pi.Name)) eventsInfo = append(eventsInfo, - event.NewEvent(policyKind, "", pi.Name, event.RequestBlocked, event.FPolicyBlockResourceUpdate, pi.RName, ruleNames)) + event.NewEvent(policyKind, "", pi.Name, event.RequestBlocked, event.FPolicyBlockResourceUpdate, pi.RNamespace+"/"+pi.RName, ruleNames)) glog.V(3).Infof("Request blocked events info has prepared for %s/%s and %s/%s\n", policyKind, pi.Name, pi.RKind, pi.RName) } // if report flag is set