@certik/skynet 0.8.15 → 0.8.16

package/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## 0.8.16
+
+- Changed monitor exit behavior
+- Improved OpsGenie message for service checks
+
 ## 0.8.15
 
-- OpsGenie bug fix
+- Fixed OpsGenie message bug 
 
 ## 0.8.14
 

package/monitor.js

@@ -30,69 +30,44 @@ function sortErrors(errors) {
 }
 
 async function getMostRecentJobLaunch(name) {
-  const jobsRes = await fetch(`http://localhost:4646/v1/jobs?prefix=${name}`);
+  try {
+    const jobsRes = await fetch(`http://localhost:4646/v1/jobs?prefix=${name}`);
 
-  if (!jobsRes.ok) {
-    console.log(`[MONITOR] request local nomad API failed`);
+    if (!jobsRes.ok) {
+      console.log(`[MONITOR] request local nomad API failed`);
 
-    return null;
-  }
-
-  const jobs = await jobsRes.json();
-
-  if (jobs.length === 0) {
-    console.log(`[MONITOR] did not see any jobs prefixed with ${name}`);
-
-    return null;
-  }
+      return null;
+    }
 
-  const recentFinishedJob = jobs.reverse().find((job) => {
-    // filter out monitor job
-    return job.ID.indexOf("-monitor") === -1 && job.Status === "dead";
-  });
+    const jobs = await jobsRes.json();
 
-  if (!recentFinishedJob) {
-    console.log(`[MONITOR] did not see any dead jobs`);
+    if (jobs.length === 0) {
+      console.log(`[MONITOR] did not see any jobs prefixed with ${name}`);
 
-    return null;
-  }
+      return null;
+    }
 
-  console.log("[MONITOR]", "most recent job info", recentFinishedJob.ID, recentFinishedJob.JobSummary.Summary);
+    const recentFinishedJob = jobs.reverse().find((job) => {
+      // filter out monitor job
+      return job.ID.indexOf("-monitor") === -1 && job.Status === "dead";
+    });
 
-  return recentFinishedJob;
-}
+    if (!recentFinishedJob) {
+      console.log(`[MONITOR] did not see any dead jobs`);
 
-function checkMostRecentJobFailures(recentFinishedJob) {
-  if (!recentFinishedJob) {
-    return [];
-  }
+      return null;
+    }
 
-  const summary = recentFinishedJob.JobSummary.Summary;
-  const groups = Object.keys(summary);
+    console.log("[MONITOR]", "most recent job info", recentFinishedJob.ID, recentFinishedJob.JobSummary.Summary);
 
-  for (let group of groups) {
-    if (summary[group].Failed > 0) {
-      return [
-        {
-          type: ERROR_LEVEL.CRITICAL,
-          message: `The most recent launch returned non-zero exit value, please investigate`,
-        },
-      ];
-    }
+    return recentFinishedJob;
+  } catch (getJobError) {
+    console.log("[MONITOR]", "cannot get most recent job", getJobError.message);
+    return null;
   }
-
-  return [];
 }
 
-function createMonitor({
-  binaryName,
-  name,
-  type = "stateless",
-  mode = false,
-  selector = {},
-  check,
-  maxRetry = 2,
-}) {
+function createMonitor({ binaryName, name, type = "stateless", mode = false, selector = {}, check, maxRetry = 2 }) {
   function monitor() {
     if (!binaryName) {
       binaryName = getBinaryName();
@@ -169,25 +144,26 @@ ${
 
       const jobName = getJobName(name, selectorFlags, mode);
       const mostRecentJob = await getMostRecentJobLaunch(jobName);
-      const recentJobFailures = checkMostRecentJobFailures(mostRecentJob);
-
-      result = result.concat(recentJobFailures);
 
       if (result.length > 0) {
         console.log("Found Errors", result);
 
         if (production) {
-          // Also alert on opsgenie (func prevents duplicate alerts)
+          const nomadAddr = process.env.SKYNET_NOMAD_PRODUCTION_ADDR;
+
+          // alert on opsgenie
           await postGenieMessage(
-            `${jobName} Monitor Errors`,
-            `${sortErrors(result)
-              .map((m) => m.message || m)
-              .join("\n")}`,
+            `Failed Service Check: ${jobName}`,
+            `<p><b>Service:</b><a href="${nomadAddr}/ui/jobs/${jobName}" target="_blank">${jobName}</a></p><p><b>Issues</b></p><ul>${sortErrors(
+              result
+            )
+              .map((m) => `<li><b>${m.type}:</b> ${m.message}</li>`)
+              .join("")}</ul>`,
             verbose
           );
+        } else {
+          console.log("skip sending messages to opsgenie in dev env");
         }
-
-        throw new Error(`failed due to critical errors`);
       }
 
       console.log(`[MONITOR] check successfully in ${Date.now() - startTime}ms`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.8.15",
+  "version": "0.8.16",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",