Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ObjectReference to write events #217

Merged
merged 1 commit into from
Sep 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion apis/monitoring/v1alpha1/alert.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package v1alpha1

import "time"
import (
"time"

"k8s.io/apimachinery/pkg/runtime"
)

type Alert interface {
GetName() string
Expand All @@ -11,4 +15,5 @@ type Alert interface {
IsValid() (bool, error)
GetNotifierSecretName() string
GetReceivers() []Receiver
ObjectReference() runtime.Object
}
14 changes: 14 additions & 0 deletions apis/monitoring/v1alpha1/cluster_alert.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package v1alpha1
import (
"fmt"
"time"

"k8s.io/apimachinery/pkg/runtime"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

const (
Expand Down Expand Up @@ -65,3 +68,14 @@ func (a ClusterAlert) GetNotifierSecretName() string {
func (a ClusterAlert) GetReceivers() []Receiver {
return a.Spec.Receivers
}

func (a ClusterAlert) ObjectReference() runtime.Object {
return &apiv1.ObjectReference{
APIVersion: SchemeGroupVersion.String(),
Kind: ResourceKindClusterAlert,
Namespace: a.Namespace,
Name: a.Name,
UID: a.UID,
ResourceVersion: a.ResourceVersion,
}
}
14 changes: 14 additions & 0 deletions apis/monitoring/v1alpha1/node_alert.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package v1alpha1
import (
"fmt"
"time"

"k8s.io/apimachinery/pkg/runtime"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

const (
Expand Down Expand Up @@ -65,3 +68,14 @@ func (a NodeAlert) GetNotifierSecretName() string {
func (a NodeAlert) GetReceivers() []Receiver {
return a.Spec.Receivers
}

func (a NodeAlert) ObjectReference() runtime.Object {
return &apiv1.ObjectReference{
APIVersion: SchemeGroupVersion.String(),
Kind: ResourceKindNodeAlert,
Namespace: a.Namespace,
Name: a.Name,
UID: a.UID,
ResourceVersion: a.ResourceVersion,
}
}
14 changes: 14 additions & 0 deletions apis/monitoring/v1alpha1/pod_alert.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package v1alpha1
import (
"fmt"
"time"

"k8s.io/apimachinery/pkg/runtime"
apiv1 "k8s.io/client-go/pkg/api/v1"
)

const (
Expand Down Expand Up @@ -65,3 +68,14 @@ func (a PodAlert) GetNotifierSecretName() string {
func (a PodAlert) GetReceivers() []Receiver {
return a.Spec.Receivers
}

func (a PodAlert) ObjectReference() runtime.Object {
return &apiv1.ObjectReference{
APIVersion: SchemeGroupVersion.String(),
Kind: ResourceKindPodAlert,
Namespace: a.Namespace,
Name: a.Name,
UID: a.UID,
ResourceVersion: a.ResourceVersion,
}
}
20 changes: 10 additions & 10 deletions pkg/operator/cluster_alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (op *Operator) WatchClusterAlerts() {
if alert, ok := obj.(*tapi.ClusterAlert); ok {
if ok, err := alert.IsValid(); !ok {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToCreate,
`Fail to be create ClusterAlert: "%v". Reason: %v`,
Expand All @@ -48,7 +48,7 @@ func (op *Operator) WatchClusterAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, alert); err != nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for ClusterAlert: "%v". Reason: %v`,
Expand All @@ -73,7 +73,7 @@ func (op *Operator) WatchClusterAlerts() {
if !reflect.DeepEqual(oldAlert.Spec, newAlert.Spec) {
if ok, err := newAlert.IsValid(); !ok {
op.recorder.Eventf(
newAlert,
newAlert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be update ClusterAlert: "%v". Reason: %v`,
Expand All @@ -84,7 +84,7 @@ func (op *Operator) WatchClusterAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, newAlert); err != nil {
op.recorder.Eventf(
newAlert,
newAlert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for ClusterAlert: "%v". Reason: %v`,
Expand All @@ -99,7 +99,7 @@ func (op *Operator) WatchClusterAlerts() {
if alert, ok := obj.(*tapi.ClusterAlert); ok {
if ok, err := alert.IsValid(); !ok {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be delete ClusterAlert: "%v". Reason: %v`,
Expand All @@ -110,7 +110,7 @@ func (op *Operator) WatchClusterAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, alert); err != nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for ClusterAlert: "%v". Reason: %v`,
Expand All @@ -130,7 +130,7 @@ func (op *Operator) EnsureClusterAlert(old, new *tapi.ClusterAlert) (err error)
defer func() {
if err == nil {
op.recorder.Eventf(
new,
new.ObjectReference(),
apiv1.EventTypeNormal,
eventer.EventReasonSuccessfulSync,
`Applied ClusterAlert: "%v"`,
Expand All @@ -139,7 +139,7 @@ func (op *Operator) EnsureClusterAlert(old, new *tapi.ClusterAlert) (err error)
return
} else {
op.recorder.Eventf(
new,
new.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToSync,
`Fail to be apply ClusterAlert: "%v". Reason: %v`,
Expand All @@ -163,7 +163,7 @@ func (op *Operator) EnsureClusterAlertDeleted(alert *tapi.ClusterAlert) (err err
defer func() {
if err == nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeNormal,
eventer.EventReasonSuccessfulDelete,
`Deleted ClusterAlert: "%v"`,
Expand All @@ -172,7 +172,7 @@ func (op *Operator) EnsureClusterAlertDeleted(alert *tapi.ClusterAlert) (err err
return
} else {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be delete ClusterAlert: "%v". Reason: %v`,
Expand Down
12 changes: 6 additions & 6 deletions pkg/operator/node_alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (op *Operator) WatchNodeAlerts() {
if alert, ok := obj.(*tapi.NodeAlert); ok {
if ok, err := alert.IsValid(); !ok {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToCreate,
`Fail to be create NodeAlert: "%v". Reason: %v`,
Expand All @@ -49,7 +49,7 @@ func (op *Operator) WatchNodeAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, alert); err != nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for NodeAlert: "%v". Reason: %v`,
Expand All @@ -74,7 +74,7 @@ func (op *Operator) WatchNodeAlerts() {
if !reflect.DeepEqual(oldAlert.Spec, newAlert.Spec) {
if ok, err := newAlert.IsValid(); !ok {
op.recorder.Eventf(
newAlert,
newAlert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be update NodeAlert: "%v". Reason: %v`,
Expand All @@ -85,7 +85,7 @@ func (op *Operator) WatchNodeAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, newAlert); err != nil {
op.recorder.Eventf(
newAlert,
newAlert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for NodeAlert: "%v". Reason: %v`,
Expand All @@ -100,7 +100,7 @@ func (op *Operator) WatchNodeAlerts() {
if alert, ok := obj.(*tapi.NodeAlert); ok {
if ok, err := alert.IsValid(); !ok {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be delete NodeAlert: "%v". Reason: %v`,
Expand All @@ -111,7 +111,7 @@ func (op *Operator) WatchNodeAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, alert); err != nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for NodeAlert: "%v". Reason: %v`,
Expand Down
8 changes: 4 additions & 4 deletions pkg/operator/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (op *Operator) EnsureNode(node *apiv1.Node, old, new *tapi.NodeAlert) (err
defer func() {
if err == nil {
op.recorder.Eventf(
new,
new.ObjectReference(),
apiv1.EventTypeNormal,
eventer.EventReasonSuccessfulSync,
`Applied NodeAlert: "%v"`,
Expand All @@ -145,7 +145,7 @@ func (op *Operator) EnsureNode(node *apiv1.Node, old, new *tapi.NodeAlert) (err
return
} else {
op.recorder.Eventf(
new,
new.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToSync,
`Fail to be apply NodeAlert: "%v". Reason: %v`,
Expand All @@ -169,7 +169,7 @@ func (op *Operator) EnsureNodeDeleted(node *apiv1.Node, alert *tapi.NodeAlert) (
defer func() {
if err == nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeNormal,
eventer.EventReasonSuccessfulDelete,
`Deleted NodeAlert: "%v"`,
Expand All @@ -178,7 +178,7 @@ func (op *Operator) EnsureNodeDeleted(node *apiv1.Node, alert *tapi.NodeAlert) (
return
} else {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be delete NodeAlert: "%v". Reason: %v`,
Expand Down
12 changes: 6 additions & 6 deletions pkg/operator/pod_alerts.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (op *Operator) WatchPodAlerts() {
if alert, ok := obj.(*tapi.PodAlert); ok {
if ok, err := alert.IsValid(); !ok {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToCreate,
`Fail to be create PodAlert: "%v". Reason: %v`,
Expand All @@ -49,7 +49,7 @@ func (op *Operator) WatchPodAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, alert); err != nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for PodAlert: "%v". Reason: %v`,
Expand All @@ -74,7 +74,7 @@ func (op *Operator) WatchPodAlerts() {
if !reflect.DeepEqual(oldAlert.Spec, newAlert.Spec) {
if ok, err := newAlert.IsValid(); !ok {
op.recorder.Eventf(
newAlert,
newAlert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be update PodAlert: "%v". Reason: %v`,
Expand All @@ -85,7 +85,7 @@ func (op *Operator) WatchPodAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, newAlert); err != nil {
op.recorder.Eventf(
newAlert,
newAlert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for PodAlert: "%v". Reason: %v`,
Expand All @@ -100,7 +100,7 @@ func (op *Operator) WatchPodAlerts() {
if alert, ok := obj.(*tapi.PodAlert); ok {
if ok, err := alert.IsValid(); !ok {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be delete PodAlert: "%v". Reason: %v`,
Expand All @@ -111,7 +111,7 @@ func (op *Operator) WatchPodAlerts() {
}
if err := util.CheckNotifiers(op.KubeClient, alert); err != nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonBadNotifier,
`Bad notifier config for PodAlert: "%v". Reason: %v`,
Expand Down
8 changes: 4 additions & 4 deletions pkg/operator/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func (op *Operator) EnsurePod(pod *apiv1.Pod, old, new *tapi.PodAlert) (err erro
defer func() {
if err == nil {
op.recorder.Eventf(
new,
new.ObjectReference(),
apiv1.EventTypeNormal,
eventer.EventReasonSuccessfulSync,
`Applied PodAlert: "%v"`,
Expand All @@ -155,7 +155,7 @@ func (op *Operator) EnsurePod(pod *apiv1.Pod, old, new *tapi.PodAlert) (err erro
return
} else {
op.recorder.Eventf(
new,
new.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToSync,
`Fail to be apply PodAlert: "%v". Reason: %v`,
Expand All @@ -179,7 +179,7 @@ func (op *Operator) EnsurePodDeleted(pod *apiv1.Pod, alert *tapi.PodAlert) (err
defer func() {
if err == nil {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeNormal,
eventer.EventReasonSuccessfulDelete,
`Deleted PodAlert: "%v"`,
Expand All @@ -188,7 +188,7 @@ func (op *Operator) EnsurePodDeleted(pod *apiv1.Pod, alert *tapi.PodAlert) (err
return
} else {
op.recorder.Eventf(
alert,
alert.ObjectReference(),
apiv1.EventTypeWarning,
eventer.EventReasonFailedToDelete,
`Fail to be delete PodAlert: "%v". Reason: %v`,
Expand Down