update the status for managed notification object

Author: bmeng

go.mod

@@ -9,13 +9,14 @@ require (
 	github.com/onsi/gomega v1.18.1
 	github.com/openshift-online/ocm-cli v0.1.62
 	github.com/openshift-online/ocm-sdk-go v0.1.242
-	github.com/openshift/ocm-agent-operator v0.0.0-20220315043808-a190995e3fda
+	github.com/openshift/ocm-agent-operator v0.0.0-20220316071606-afd26cc5ca68
 	github.com/prometheus/alertmanager v0.23.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.10.1
+	k8s.io/api v0.22.1
 	k8s.io/apimachinery v0.23.3
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/kubectl v0.23.3

go.sum

@@ -1124,8 +1124,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.242 h1:fesCAv8tg2gcVAV1aKwCoQrkRmDq+
 github.com/openshift-online/ocm-sdk-go v0.1.242/go.mod h1:nHYjrmvR9L7KSRZukysau62iEHKJOQYFhlceqaVAV1Y=
 github.com/openshift/api v0.0.0-20210910062324-a41d3573a3ba/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs=
 github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
-github.com/openshift/ocm-agent-operator v0.0.0-20220315043808-a190995e3fda h1:2nXscsh7v2S1RxeBJydANFWoevRGOS4ZDg8aejAxyHs=
-github.com/openshift/ocm-agent-operator v0.0.0-20220315043808-a190995e3fda/go.mod h1:ZwZI7wGFEmXT6bkoHfdNivUn8r5nG86g9+GeBqjIjz0=
+github.com/openshift/ocm-agent-operator v0.0.0-20220316071606-afd26cc5ca68 h1:FqYpwnYsrk0MPBw4gxgfA8CS/0T03y4zNVkpvotmIr8=
+github.com/openshift/ocm-agent-operator v0.0.0-20220316071606-afd26cc5ca68/go.mod h1:ZwZI7wGFEmXT6bkoHfdNivUn8r5nG86g9+GeBqjIjz0=
 github.com/openshift/origin v0.0.0-20160503220234-8f127d736703/go.mod h1:0Rox5r9C8aQn6j1oAOQ0c1uC86mYbUFObzjBRvUKHII=
 github.com/openshift/prom-label-proxy v0.1.1-0.20191016113035-b8153a7f39f1/go.mod h1:p5MuxzsYP1JPsNGwtjtcgRHHlGziCJJfztff91nNixw=
 github.com/openshift/rosa v1.1.7/go.mod h1:Ap4vfflxHXfzY0MIt1l9dckwG+DkPUDc/vv1mk1cSCQ=

pkg/handlers/webhookreceiver.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/openshift-online/ocm-cli/pkg/arguments"
 	sdk "github.com/openshift-online/ocm-sdk-go"
@@ -15,6 +16,8 @@ import (
 	oav1alpha1 "github.com/openshift/ocm-agent-operator/pkg/apis/ocmagent/v1alpha1"
 	"github.com/openshift/ocm-agent/pkg/config"
 	"github.com/openshift/ocm-agent/pkg/ocm"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -149,7 +152,7 @@ func (h *WebhookReceiverHandler) processAlert(alert template.Alert, mnl *oav1alp
 	}
 
 	// Update the notification status to indicate a servicelog has been sent
-	err = h.updateNotificationStatus(notification, managedNotifications)
+	err = h.updateNotificationStatus(notification, managedNotifications, true)
 	if err != nil {
 		log.WithFields(log.Fields{LogFieldNotificationName: notification.Name, LogFieldManagedNotification: managedNotifications.Name}).WithError(err).Error("unable to update notification status")
 		return err
@@ -236,7 +239,7 @@ func (h *WebhookReceiverHandler) sendServiceLog(n *oav1alpha1.Notification, firi
 	return nil
 }
 
-func (h *WebhookReceiverHandler) updateNotificationStatus(n *oav1alpha1.Notification, mn *oav1alpha1.ManagedNotification) error {
+func (h *WebhookReceiverHandler) updateNotificationStatus(n *oav1alpha1.Notification, mn *oav1alpha1.ManagedNotification, firing bool) error {
 
 	// Update lastSent timestamp
 	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
@@ -250,18 +253,52 @@ func (h *WebhookReceiverHandler) updateNotificationStatus(n *oav1alpha1.Notifica
 			return err
 		}
 
+		timeNow := &v1.Time{Time: time.Now()}
 		status, err := m.Status.GetNotificationRecord(n.Name)
 		if err != nil {
 			// Status does not exist, create it
+			// This will happen only when the alert is firing first time
 			status = &oav1alpha1.NotificationRecord{
 				Name:                n.Name,
 				ServiceLogSentCount: 0,
 			}
-			status.SetStatus(oav1alpha1.ConditionServiceLogSent, "Service log sent")
+			status.SetStatus(oav1alpha1.ConditionAlertFiring, "Alert is firing", corev1.ConditionTrue, timeNow)
+			status.SetStatus(oav1alpha1.ConditionAlertResolved, "Alert resolved", corev1.ConditionFalse, timeNow)
+			status.SetStatus(oav1alpha1.ConditionServiceLogSent, "Service log sent", corev1.ConditionTrue, timeNow)
 		} else {
 			// Status exists, update it
-			status.SetStatus(oav1alpha1.ConditionServiceLogSent, "Service log sent")
+			// When the alert is already firing
+			firingCondition := status.Conditions.GetCondition(oav1alpha1.ConditionAlertFiring).Status
+			if firingCondition == corev1.ConditionTrue {
+				firedConditionTime := status.Conditions.GetCondition(oav1alpha1.ConditionAlertFiring).LastTransitionTime
+				resolvedConditionTime := status.Conditions.GetCondition(oav1alpha1.ConditionAlertResolved).LastTransitionTime
+				if firing {
+					// Status transition is Firing to Firing
+					// Do not update the condition for AlertFiring and AlertResolved
+					// Only update the timestamp for the ServiceLogSent
+					status.SetStatus(oav1alpha1.ConditionAlertFiring, "Alert is firing", corev1.ConditionTrue, firedConditionTime)
+					status.SetStatus(oav1alpha1.ConditionAlertResolved, "Alert resolved", corev1.ConditionFalse, resolvedConditionTime)
+					status.SetStatus(oav1alpha1.ConditionServiceLogSent, "Service log sent", corev1.ConditionTrue, timeNow)
+				} else {
+					// Status transition is Firing to Resolved
+					// Update the condition status and timestamp for AlertFiring
+					// Update the condition status and timestamp for AlertResolved
+					// Update the timestamp for the ServiceLogSent
+					status.SetStatus(oav1alpha1.ConditionAlertFiring, "Alert is firing", corev1.ConditionFalse, timeNow)
+					status.SetStatus(oav1alpha1.ConditionAlertResolved, "Alert resolved", corev1.ConditionTrue, timeNow)
+					status.SetStatus(oav1alpha1.ConditionServiceLogSent, "Service log sent", corev1.ConditionTrue, timeNow)
+				}
+			} else {
+				// Status transition is Resolved to Firing
+				// Update the condition status and timestamp for AlertFiring
+				// Update the condition status and timestamp for AlertResolved
+				// Update the timestamp for the ServiceLogSent
+				status.SetStatus(oav1alpha1.ConditionAlertFiring, "Alert is firing", corev1.ConditionTrue, timeNow)
+				status.SetStatus(oav1alpha1.ConditionAlertResolved, "Alert resolved", corev1.ConditionFalse, timeNow)
+				status.SetStatus(oav1alpha1.ConditionServiceLogSent, "Service log sent", corev1.ConditionTrue, timeNow)
+			}
 		}
+
 		m.Status.Notifications.SetNotificationRecord(*status)
 
 		err = h.c.Status().Update(context.TODO(), m)