Add team to trigger monitoring record PRDO-2741

lucidsoftware · Jun 14, 2024 · 7bcc843 · 7bcc843
1 parent d8035fd
commit 7bcc843
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 40 deletions.
diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/Jobs.scala b/admin/app/com/lucidchart/piezo/admin/controllers/Jobs.scala
@@ -234,16 +234,17 @@ class Jobs(schedulerFactory: WorkerSchedulerFactory, jobView: html.job, cc: Cont
             logger.error(errorMessage)
             ImportFailure(Some(jobDetail.getKey), "Trigger Import Error:"+errorMessage)
           } else {
-            val triggers = triggersBinding.map(_.value).flatten
-              triggers.map { case (trigger, monitoringPriority, errorTime) =>
-                scheduler.scheduleJob(trigger)
-                triggerMonitoringPriorityModel.setTriggerMonitoringRecord(
-                  trigger.getKey,
-                  monitoringPriority,
-                  errorTime
-                )
-              }
-              ImportSuccess(Some(jobDetail.getKey))
+            val triggers = triggersBinding.flatMap(_.value)
+            triggers.foreach { case (trigger, monitoringPriority, errorTime, monitoringTeam) =>
+              scheduler.scheduleJob(trigger)
+              triggerMonitoringPriorityModel.setTriggerMonitoringRecord(
+                trigger.getKey,
+                monitoringPriority,
+                errorTime,
+                monitoringTeam,
+              )
+            }
+            ImportSuccess(Some(jobDetail.getKey))
           }
         } catch {
           case _: ObjectAlreadyExistsException =>

diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/TriggerFormHelper.scala b/admin/app/com/lucidchart/piezo/admin/controllers/TriggerFormHelper.scala
@@ -46,7 +46,8 @@ class TriggerFormHelper(scheduler: Scheduler) extends JobDataHelper {
     jobDataMap: Option[JobDataMap],
     triggerMonitoringPriority: String,
     triggerMaxErrorTime: Int,
-  ): (Trigger, TriggerMonitoringPriority, Int) = {
+    triggerMonitoringTeam: Option[String],
+  ): (Trigger, TriggerMonitoringPriority, Int, Option[String]) = {
     val newTrigger: Trigger = TriggerBuilder
       .newTrigger()
       .withIdentity(name, group)
@@ -58,10 +59,15 @@ class TriggerFormHelper(scheduler: Scheduler) extends JobDataHelper {
       .forJob(jobName, jobGroup)
       .usingJobData(jobDataMap.getOrElse(new JobDataMap()))
       .build()
-    (newTrigger, TriggerMonitoringPriority.withName(triggerMonitoringPriority), triggerMaxErrorTime)
+    (
+      newTrigger,
+      TriggerMonitoringPriority.withName(triggerMonitoringPriority),
+      triggerMaxErrorTime,
+      triggerMonitoringTeam,
+    )
   }
 
-  private def triggerFormUnapply(tp: (Trigger, TriggerMonitoringPriority, Int)): Option[
+  private def triggerFormUnapply(tp: (Trigger, TriggerMonitoringPriority, Int, Option[String])): Option[
     (
       String,
       String,
@@ -74,6 +80,7 @@ class TriggerFormHelper(scheduler: Scheduler) extends JobDataHelper {
       Option[JobDataMap],
       String,
       Int,
+      Option[String],
     ),
   ] = {
     val trigger = tp._1
@@ -95,6 +102,7 @@ class TriggerFormHelper(scheduler: Scheduler) extends JobDataHelper {
         Some(trigger.getJobDataMap),
         tp._2.toString,
         tp._3,
+        tp._4,
       ),
     )
   }
@@ -124,7 +132,7 @@ class TriggerFormHelper(scheduler: Scheduler) extends JobDataHelper {
     }
   }
 
-  def buildTriggerForm = Form[(Trigger, TriggerMonitoringPriority, Int)](
+  def buildTriggerForm: Form[(Trigger, TriggerMonitoringPriority, Int, Option[String])] = Form(
     mapping(
       "triggerType" -> nonEmptyText(),
       "group" -> nonEmptyText(),
@@ -146,6 +154,7 @@ class TriggerFormHelper(scheduler: Scheduler) extends JobDataHelper {
       "job-data-map" -> jobDataMap,
       "triggerMonitoringPriority" -> nonEmptyText(),
       "triggerMaxErrorTime" -> of(MaxSecondsBetweenSuccessesFormatter).verifying(Constraints.min(0)),
+      "triggerMonitoringTeam" -> optional(text()),
     )(triggerFormApply)(triggerFormUnapply)
       .verifying(
         "Job does not exist",

diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/TriggerHelper.scala b/admin/app/com/lucidchart/piezo/admin/controllers/TriggerHelper.scala
@@ -50,11 +50,11 @@ object TriggerHelper {
       case _ => Json.obj()
     }
 
-    val (monitoringPriority, maxSecondsInError) = monitoringModel.getTriggerMonitoringRecord(
+    val (monitoringPriority, maxSecondsInError, monitoringTeam) = monitoringModel.getTriggerMonitoringRecord(
       trigger.getKey,
     ).map { monitoringRecord =>
-      (monitoringRecord.priority, monitoringRecord.maxSecondsInError)
-    }.getOrElse((TriggerMonitoringPriority.Low, 300))
+      (monitoringRecord.priority, monitoringRecord.maxSecondsInError, monitoringRecord.monitoringTeam)
+    }.getOrElse((TriggerMonitoringPriority.Low, 300, None))
     val jobDataMap = trigger.getJobDataMap
     val job = trigger.getJobKey
     Json.obj(
@@ -66,7 +66,8 @@ object TriggerHelper {
       "description" -> trigger.getDescription,
       "job-data-map" -> JsObject(jobDataMap.getKeys.toSeq.map(key => key -> JsString(jobDataMap.getString(key)))),
       "triggerMonitoringPriority" -> monitoringPriority.name,
-      "triggerMaxErrorTime" -> maxSecondsInError
+      "triggerMaxErrorTime" -> maxSecondsInError,
+      "triggerMonitoringTeam" -> monitoringTeam,
     ) ++ schedule
   }
 

diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/Triggers.scala b/admin/app/com/lucidchart/piezo/admin/controllers/Triggers.scala
@@ -68,15 +68,15 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
           }
         }
 
-        val (triggerMonitoringPriority, triggerMaxErrorTime) = Try {
+        val (triggerMonitoringPriority, triggerMaxErrorTime, triggerMonitoringTeam) = Try {
           triggerMonitoringPriorityModel.getTriggerMonitoringRecord(
             triggerDetail.getKey
           ).map { triggerMonitoringRecord =>
-            (triggerMonitoringRecord.priority, triggerMonitoringRecord.maxSecondsInError)
-          }.getOrElse((TriggerMonitoringPriority.Low, 300))
+            (triggerMonitoringRecord.priority, triggerMonitoringRecord.maxSecondsInError, triggerMonitoringRecord.monitoringTeam)
+          }.getOrElse((TriggerMonitoringPriority.Low, 300, None))
         }.getOrElse {
           logger.error("Failed to get trigger monitoring info")
-          (TriggerMonitoringPriority.Low, 300)
+          (TriggerMonitoringPriority.Low, 300, None)
         }
 
         Ok(
@@ -87,6 +87,7 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
             None,
             Some(triggerMonitoringPriority),
             triggerMaxErrorTime,
+            triggerMonitoringTeam,
             triggerState = Some(scheduler.getTriggerState(triggerKey))
           )(request)
         )
@@ -159,7 +160,7 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
           case "simple" => new DummySimpleTrigger(jobGroup, jobName)
         }
         val newTriggerForm = triggerFormHelper.buildTriggerForm.fill(
-          (dummyTrigger, TriggerMonitoringPriority.Low, 300)
+          (dummyTrigger, TriggerMonitoringPriority.Low, 300, None)
         )
         Ok(
           com.lucidchart.piezo.admin.views.html.editTrigger(
@@ -182,18 +183,18 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
       NotFound(com.lucidchart.piezo.admin.views.html.trigger(mutable.Buffer(), None, None, errorMsg)(request))
     } else {
       val triggerDetail: Trigger = scheduler.getTrigger(triggerKey)
-      val (triggerMonitoringPriority, triggerMaxErrorTime) = Try {
+      val (triggerMonitoringPriority, triggerMaxErrorTime, triggerMonitoringTeam) = Try {
         triggerMonitoringPriorityModel.getTriggerMonitoringRecord(
           triggerDetail.getKey,
         ).map { triggerMonitoringRecord =>
-          (triggerMonitoringRecord.priority, triggerMonitoringRecord.maxSecondsInError)
-        }.getOrElse((TriggerMonitoringPriority.Low, 300))
+          (triggerMonitoringRecord.priority, triggerMonitoringRecord.maxSecondsInError, triggerMonitoringRecord.monitoringTeam)
+        }.getOrElse((TriggerMonitoringPriority.Low, 300, None))
       }.getOrElse {
         logger.error("Failed to get trigger monitoring info")
-        (TriggerMonitoringPriority.Low, 300)
+        (TriggerMonitoringPriority.Low, 300, None)
       }
       val editTriggerForm = triggerFormHelper.buildTriggerForm.fill(
-        (triggerDetail, triggerMonitoringPriority, triggerMaxErrorTime)
+        (triggerDetail, triggerMonitoringPriority, triggerMaxErrorTime, triggerMonitoringTeam)
       )
       if (isTemplate) {
         Ok(
@@ -237,12 +238,13 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
           )
         ),
       value => {
-        val (trigger, triggerMonitoringPriority, triggerMaxErrorTime) = value
+        val (trigger, triggerMonitoringPriority, triggerMaxErrorTime, triggerMonitoringTeam) = value
         scheduler.rescheduleJob(trigger.getKey(), trigger)
         triggerMonitoringPriorityModel.setTriggerMonitoringRecord(
           trigger.getKey,
           triggerMonitoringPriority,
-          triggerMaxErrorTime
+          triggerMaxErrorTime,
+          triggerMonitoringTeam
         )
         Redirect(routes.Triggers.getTrigger(trigger.getKey.getGroup(), trigger.getKey.getName()))
           .flashing("message" -> "Successfully added trigger.", "class" -> "")
@@ -263,20 +265,21 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
           )
         ),
       value => {
-        val (trigger, triggerMonitoringPriority, triggerMaxErrorTime) = value
+        val (trigger, triggerMonitoringPriority, triggerMaxErrorTime, triggerMonitoringTeam) = value
         try {
           scheduler.scheduleJob(trigger)
           triggerMonitoringPriorityModel.setTriggerMonitoringRecord(
             trigger.getKey,
             triggerMonitoringPriority,
-            triggerMaxErrorTime
+            triggerMaxErrorTime,
+            triggerMonitoringTeam
           )
           Redirect(routes.Triggers.getTrigger(trigger.getKey.getGroup(), trigger.getKey.getName()))
             .flashing("message" -> "Successfully added trigger.", "class" -> "")
         } catch {
           case alreadyExists: ObjectAlreadyExistsException =>
             val form = triggerFormHelper.buildTriggerForm.fill(
-              (trigger, triggerMonitoringPriority, triggerMaxErrorTime)
+              (trigger, triggerMonitoringPriority, triggerMaxErrorTime, triggerMonitoringTeam)
             )
             Ok(
               com.lucidchart.piezo.admin.views.html.editTrigger(

diff --git a/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html b/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html
@@ -1,6 +1,6 @@
 @(
 triggersByGroup: scala.collection.mutable.Buffer[(String, scala.collection.immutable.List[org.quartz.TriggerKey])],
-triggerForm: Form[(org.quartz.Trigger, com.lucidchart.piezo.TriggerMonitoringPriority.Value, Int)],
+triggerForm: Form[(org.quartz.Trigger, com.lucidchart.piezo.TriggerMonitoringPriority.Value, Int, Option[String])],
 formAction: play.api.mvc.Call,
 existing: Boolean,
 isTemplate: Boolean,
@@ -70,6 +70,9 @@ <h4 class="text-danger">@triggerForm.errors.filter(_.key == "").map(_.message).m
     @helper.input(triggerForm("triggerMaxErrorTime"), Symbol("_label") -> "Monitoring - Max Seconds Between Successes", Symbol("labelClass") -> "col-sm-2 text-right", Symbol("inputDivClass") -> "col-sm-4", Symbol("placeholder") -> "", Symbol("value") -> triggerForm.data.get("triggerMaxErrorTime").getOrElse(300)) { (id, name, value, args) =>
       <input type="number" class="form-control form-inline-control " name="@name" id="@id" @toHtmlArgs(args)>
     }
+    @helper.input(triggerForm("triggerMonitoringTeam"), Symbol("_label") -> "Monitoring team", Symbol("labelClass") -> "col-sm-2 text-right", Symbol("inputDivClass") -> "col-sm-4", Symbol("placeholder") -> "", Symbol("value") -> triggerForm.data.get("triggerMonitoringTeam").getOrElse(None)) { (id, name, value, args) =>
+      <input type="text" class="form-control form-inline-control" name="@name" id="@id" @toHtmlArgs(args)>
+    }
 
     @helper.input(triggerForm("description"), Symbol("_label") -> "Description", Symbol("labelClass") -> "col-sm-2 text-right", Symbol("inputDivClass") -> "col-sm-10", Symbol("placeholder") -> "Description", Symbol("value")-> triggerForm.data.get("description").getOrElse("")) { (id, name, value, args) =>
       <input type="text" class="form-control form-inline-control " name="@name" id="@id" @toHtmlArgs(args)>

diff --git a/admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html b/admin/app/com/lucidchart/piezo/admin/views/trigger.scala.html
@@ -11,6 +11,7 @@
 errorMessage: Option[String] = None,
 triggerMonitoringPriority: Option[com.lucidchart.piezo.TriggerMonitoringPriority.Value] = None,
 triggerMaxErrorTime: Integer = 300,
+triggerMonitoringTeam: Option[String] = None,
 triggerState: Option[TriggerState] = None
 )(
 implicit
@@ -167,6 +168,10 @@ <h4>This will permanently delete the trigger!</h4>
                 <td class="text-right">Monitoring - max seconds between successes:</td>
                 <td>@triggerMaxErrorTime seconds</td>
             </tr>
+            <tr>
+                <td class="text-right">Monitoring team:</td>
+                <td>@triggerMonitoringTeam.getOrElse("")</td>
+            </tr>
             }
             <tr>
                 <td class="text-right">Description:</td>

diff --git a/worker/src/main/resources/piezo_mysql_8.sql b/worker/src/main/resources/piezo_mysql_8.sql
@@ -0,0 +1 @@
+ALTER TABLE trigger_monitoring_priority ADD monitoring_team VARCHAR(100) DEFAULT NULL;
diff --git a/worker/src/main/scala/com/lucidchart/piezo/TriggerMonitoringModel.scala b/worker/src/main/scala/com/lucidchart/piezo/TriggerMonitoringModel.scala
@@ -28,6 +28,7 @@ case class TriggerMonitoringRecord (
   triggerGroup: String,
   priority: TriggerMonitoringPriority,
   maxSecondsInError: Int,
+  monitoringTeam: Option[String],
   created: Date,
   modified: Date
 )
@@ -39,15 +40,16 @@ class TriggerMonitoringModel(props: Properties) {
   def setTriggerMonitoringRecord(
     triggerKey: TriggerKey,
     triggerMonitoringPriority: TriggerMonitoringPriority,
-    maxSecondsInError: Int
+    maxSecondsInError: Int,
+    monitoringTeam: Option[String]
   ): Int = {
     val connection = connectionProvider.getConnection
     try {
       val prepared = connection.prepareStatement("""
         INSERT INTO trigger_monitoring_priority
-          (trigger_name, trigger_group, priority, max_error_time)
+          (trigger_name, trigger_group, priority, max_error_time, monitoring_team)
         VALUES
-          (?, ?, ?, ?)
+          (?, ?, ?, ?, ?)
         ON DUPLICATE KEY UPDATE
           priority = values(priority),
           max_error_time = values(max_error_time)
@@ -56,6 +58,10 @@ class TriggerMonitoringModel(props: Properties) {
       prepared.setString(2, triggerKey.getGroup)
       prepared.setInt(3, triggerMonitoringPriority.id)
       prepared.setInt(4, maxSecondsInError)
+      monitoringTeam match {
+        case Some(team) => prepared.setString(5, team)
+        case None => prepared.setNull(5, java.sql.Types.VARCHAR)
+      }
       prepared.executeUpdate()
     } catch {
       case e: Exception => logger.error(
@@ -117,6 +123,7 @@ class TriggerMonitoringModel(props: Properties) {
             rs.getString("trigger_group"),
             priority,
             rs.getInt("max_error_time"),
+            Option(rs.getString("monitoring_team")),
             rs.getDate("created"),
             rs.getDate("modified")
           )

diff --git a/worker/src/test/scala/com/lucidchart/piezo/ModelTest.scala b/worker/src/test/scala/com/lucidchart/piezo/ModelTest.scala
@@ -50,7 +50,7 @@ class ModelTest extends Specification with BeforeAll with AfterAll {
     }
 
     override def beforeAll(): Unit = {
-        val piezoSchema = for (num <- 0 to 7) yield getPatchFile(s"piezo_mysql_$num.sql")
+        val piezoSchema = for (num <- 0 to 8) yield getPatchFile(s"piezo_mysql_$num.sql")
         val quartzSchema = getPatchFile("quartz_mysql_0.sql")
         val schema = (quartzSchema +: piezoSchema).map { path =>
             Files.readAllLines(path).asScala.mkString("\n")
@@ -81,7 +81,7 @@ class ModelTest extends Specification with BeforeAll with AfterAll {
             val triggerMonitoringPriorityModel = new TriggerMonitoringModel(properties)
             val triggerKey = new TriggerKey("blahj", "blahg")
             triggerMonitoringPriorityModel.getTriggerMonitoringRecord(triggerKey) must beNone
-            triggerMonitoringPriorityModel.setTriggerMonitoringRecord(triggerKey, TriggerMonitoringPriority.Low, 1800)
+            triggerMonitoringPriorityModel.setTriggerMonitoringRecord(triggerKey, TriggerMonitoringPriority.Low, 1800, Some("my-team"))
             triggerMonitoringPriorityModel.getTriggerMonitoringRecord(triggerKey) must beSome
             triggerMonitoringPriorityModel.deleteTriggerMonitoringRecord(triggerKey) mustEqual 1
             triggerMonitoringPriorityModel.getTriggerMonitoringRecord(triggerKey) must beNone
@@ -107,4 +107,4 @@ class ModelTest extends Specification with BeforeAll with AfterAll {
             triggerHistoryModel.deleteTriggers(new Date().getTime+1000) mustEqual 1
         }
     }
-}
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE trigger_monitoring_priority ADD monitoring_team VARCHAR(100) DEFAULT NULL;