Merge pull request #108 from lucidsoftware/PROD-2562

PROD-2562 Get rid of Medium monitoring priority
lucidsoftware · Mar 15, 2024 · 53d2e17 · 53d2e17
2 parents 671b6cc + b9d3a7c
commit 53d2e17
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/TriggerHelper.scala b/admin/app/com/lucidchart/piezo/admin/controllers/TriggerHelper.scala
@@ -54,7 +54,7 @@ object TriggerHelper {
       trigger.getKey,
     ).map { monitoringRecord =>
       (monitoringRecord.priority, monitoringRecord.maxSecondsInError)
-    }.getOrElse((TriggerMonitoringPriority.Medium, 300))
+    }.getOrElse((TriggerMonitoringPriority.Low, 300))
     val jobDataMap = trigger.getJobDataMap
     val job = trigger.getJobKey
     Json.obj(
@@ -65,7 +65,7 @@ object TriggerHelper {
       "name" -> triggerKey.getName,
       "description" -> trigger.getDescription,
       "job-data-map" -> JsObject(jobDataMap.getKeys.toSeq.map(key => key -> JsString(jobDataMap.getString(key)))),
-      "triggerMonitoringPriority" -> monitoringPriority.toString,
+      "triggerMonitoringPriority" -> monitoringPriority.name,
       "triggerMaxErrorTime" -> maxSecondsInError
     ) ++ schedule
   }

diff --git a/admin/app/com/lucidchart/piezo/admin/controllers/Triggers.scala b/admin/app/com/lucidchart/piezo/admin/controllers/Triggers.scala
@@ -73,10 +73,10 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
             triggerDetail.getKey
           ).map { triggerMonitoringRecord =>
             (triggerMonitoringRecord.priority, triggerMonitoringRecord.maxSecondsInError)
-          }.getOrElse((TriggerMonitoringPriority.Medium, 300))
+          }.getOrElse((TriggerMonitoringPriority.Low, 300))
         }.getOrElse {
           logger.error("Failed to get trigger monitoring info")
-          (TriggerMonitoringPriority.Medium, 300)
+          (TriggerMonitoringPriority.Low, 300)
         }
 
         Ok(
@@ -149,9 +149,7 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
     jobGroup: String = "",
     jobName: String = "",
     templateGroup: Option[String] = None,
-    templateName: Option[String] = None,
-    triggerMonitoringPriority: TriggerMonitoringPriority.Value = TriggerMonitoringPriority.Medium,
-    triggerMaxErrorTime: Int = 300
+    templateName: Option[String] = None
   ) = Action { implicit request =>
     templateGroup match {
       case Some(group) => getEditTrigger(group, templateName.get, true)
@@ -161,7 +159,7 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
           case "simple" => new DummySimpleTrigger(jobGroup, jobName)
         }
         val newTriggerForm = triggerFormHelper.buildTriggerForm.fill(
-          (dummyTrigger, TriggerMonitoringPriority.Medium, 300)
+          (dummyTrigger, TriggerMonitoringPriority.Low, 300)
         )
         Ok(
           com.lucidchart.piezo.admin.views.html.editTrigger(
@@ -189,10 +187,10 @@ class Triggers(schedulerFactory: WorkerSchedulerFactory, cc: ControllerComponent
           triggerDetail.getKey,
         ).map { triggerMonitoringRecord =>
           (triggerMonitoringRecord.priority, triggerMonitoringRecord.maxSecondsInError)
-        }.getOrElse((TriggerMonitoringPriority.Medium, 300))
+        }.getOrElse((TriggerMonitoringPriority.Low, 300))
       }.getOrElse {
         logger.error("Failed to get trigger monitoring info")
-        (TriggerMonitoringPriority.Medium, 300)
+        (TriggerMonitoringPriority.Low, 300)
       }
       val editTriggerForm = triggerFormHelper.buildTriggerForm.fill(
         (triggerDetail, triggerMonitoringPriority, triggerMaxErrorTime)

diff --git a/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html b/admin/app/com/lucidchart/piezo/admin/views/editTrigger.scala.html
@@ -66,7 +66,7 @@ <h4 class="text-danger">@triggerForm.errors.filter(_.key == "").map(_.message).m
       <input type="text" class="job-name-type-ahead form-control form-inline-control " name="@name" id="@id" @toHtmlArgs(args)>
     }
     }
-    @helper.select(triggerForm("triggerMonitoringPriority"), TriggerMonitoringPriority.values.toList.map(tp => tp.toString -> tp.toString), Symbol("_label") -> "Monitoring Priority", Symbol("labelClass") -> "col-sm-2 text-right", Symbol("inputDivClass") -> "col-sm-4", Symbol("class") -> "form-control", Symbol("value") -> triggerForm.data.get("triggerMonitoringPriority").getOrElse(TriggerMonitoringPriority.Medium), Symbol("placeholder") -> TriggerMonitoringPriority.Medium)
+    @helper.select(triggerForm("triggerMonitoringPriority"), TriggerMonitoringPriority.values.map(tp => tp.name -> tp.name), Symbol("_label") -> "Monitoring Priority", Symbol("labelClass") -> "col-sm-2 text-right", Symbol("inputDivClass") -> "col-sm-4", Symbol("class") -> "form-control", Symbol("value") -> triggerForm.data.get("triggerMonitoringPriority").getOrElse(TriggerMonitoringPriority.Low), Symbol("placeholder") -> TriggerMonitoringPriority.Low)
     @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)>
     }

diff --git a/worker/src/main/scala/com/lucidchart/piezo/TriggerMonitoringModel.scala b/worker/src/main/scala/com/lucidchart/piezo/TriggerMonitoringModel.scala
@@ -5,12 +5,22 @@ import java.util.{Date, Properties}
 import org.quartz.TriggerKey
 import org.slf4j.LoggerFactory
 
-object TriggerMonitoringPriority extends Enumeration {
+object TriggerMonitoringPriority {
+  case class Value(id: Int, name: String) {
+    override def toString: String = name
+  }
   type TriggerMonitoringPriority = Value
   val Off = Value(0, "Off")
   val Low = Value(1, "Low")
-  val Medium = Value(2, "Medium")
   val High = Value(3, "High")
+
+  val values = List(Off, Low, High)
+
+  // map values that formerly identified a Medium priority to Low
+  val valuesById: Map[Int, Value] = Map(2 -> Low) ++ values.map(p => p.id -> p)
+  val valuesByName: Map[String, Value] = Map("Medium" -> Low) ++ values.map(p => p.name -> p)
+
+  def withName: Function[String, Value] = valuesByName
 }
 
 case class TriggerMonitoringRecord (
@@ -101,7 +111,7 @@ class TriggerMonitoringModel(props: Properties) {
       prepared.setString(2, triggerKey.getGroup)
       val rs = prepared.executeQuery()
       if (rs.next()) {
-        TriggerMonitoringPriority.values.find(_.id == rs.getInt("priority")).map { priority =>
+        TriggerMonitoringPriority.valuesById.get(rs.getInt("priority")).map { priority =>
           TriggerMonitoringRecord(
             rs.getString("trigger_name"),
             rs.getString("trigger_group"),
@@ -127,4 +137,4 @@ class TriggerMonitoringModel(props: Properties) {
       connection.close()
     }
   }
-}
+}