@certik/skynet 0.8.12 → 0.8.15

package/CHANGELOG.md

@@ -1,8 +1,20 @@
 # Changelog
 
+## 0.8.15
+
+- OpsGenie bug fix
+
+## 0.8.14
+
+- Switched monitor to send to opsgenie only
+
+## 0.8.13
+
+- Added `inline.error` function to `log` library
+
 ## 0.8.12
 
-- Added `log` library for use with AWS Athena
+- Added `log` library to print one line log
 
 ## 0.8.11
 

package/app.js

@@ -202,8 +202,7 @@ function indexer({ name, selector, build, check, env = {}, region = "us-east-1"
           bin: `${bin} check`,
           schedule: check.schedule,
           cpu: check.cpu || 100,
-          mem: check.mem || 100,
-          hasSlack: check.slackChannel,
+          mem: check.mem || 100
         },
       });
 
@@ -216,8 +215,7 @@ function indexer({ name, selector, build, check, env = {}, region = "us-east-1"
         type: "stateless",
         selector,
         check: check.func,
-        maxRetry: check.maxRetry,
-        slackChannel: check.slackChannel,
+        maxRetry: check.maxRetry
       });
 
       monitor();
@@ -317,8 +315,7 @@ function modeIndexer({ name, selector, state, build, validate, check, env = {},
           bin: `${bin} check`,
           schedule: check.schedule,
           cpu: check.cpu || 100,
-          mem: check.mem || 100,
-          hasSlack: check.slackChannel,
+          mem: check.mem || 100
         },
       });
 
@@ -332,8 +329,7 @@ function modeIndexer({ name, selector, state, build, validate, check, env = {},
         selector,
         mode: true,
         check: check.func,
-        maxRetry: check.maxRetry,
-        slackChannel: check.slackChannel,
+        maxRetry: check.maxRetry
       });
 
       monitor();
@@ -421,8 +417,7 @@ function producer({ name, selector, produce, check, state, env = {}, region = "u
           bin: `${bin} check`,
           schedule: check.schedule,
           cpu: check.cpu || 100,
-          mem: check.mem || 100,
-          hasSlack: check.slackChannel,
+          mem: check.mem || 100
         },
       });
 
@@ -435,8 +430,7 @@ function producer({ name, selector, produce, check, state, env = {}, region = "u
         type: "stateful",
         selector,
         check: check.func,
-        maxRetry: check.maxRetry,
-        slackChannel: check.slackChannel,
+        maxRetry: check.maxRetry
       });
 
       monitor();
@@ -515,8 +509,7 @@ function consumer({ name, selector, consume, check, env = {}, region = "us-east-
           bin: `${bin} check`,
           schedule: check.schedule,
           cpu: check.cpu || 100,
-          mem: check.mem || 100,
-          hasSlack: check.slackChannel,
+          mem: check.mem || 100
         },
       });
 
@@ -529,8 +522,7 @@ function consumer({ name, selector, consume, check, env = {}, region = "us-east-
         type: "stateless",
         selector,
         check: check.func,
-        maxRetry: check.maxRetry,
-        slackChannel: check.slackChannel,
+        maxRetry: check.maxRetry
       });
 
       monitor();

package/log.js

@@ -1,15 +1,23 @@
-var inline = {};
-inline.log = function (...args) {
+function getLine(params) {
   let line = `${new Date().toISOString()}\t`;
 
   // Convert to string and filter out newline to tabs (AWS Athena)
-  for (let i = 0, l = args.length; i < l; i++) {
+  for (let i = 0, l = params.length; i < l; i++) {
     // Certain objects don't get converted
     // Note using JSON.stringfy may be too slow for large objects
-    line += `${args[i]} `.replace(/\n/gm, "\t");
+    line += `${params[i]} `.replace(/\n/gm, "\t");
   }
 
-  console.log(line.trim());
+  return line.trim();
+}
+
+const inline = {
+  log: function (...args) {
+    console.log(getLine(args));
+  },
+  error: function (...args) {
+    console.error(getLine(args));
+  },
 };
 
 module.exports = {

package/monitor.js

@@ -4,9 +4,8 @@ const { getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selec
 const { getBinaryName } = require("./cli");
 const { exponentialRetry } = require("./availability");
 const { getIndexerLatestId, getIndexerValidatedId, getIndexerState } = require("./indexer");
-const { postMessage } = require("./slack");
 const { postGenieMessage } = require("./opsgenie");
-const { getJobName, getNomadAddr } = require("./deploy");
+const { getJobName } = require("./deploy");
 
 const ERROR_LEVEL = {
   INFO: "Info",
@@ -90,7 +89,6 @@ function createMonitor({
   name,
   type = "stateless",
   mode = false,
-  slackChannel,
   selector = {},
   check,
   maxRetry = 2,
@@ -178,69 +176,14 @@ ${
       if (result.length > 0) {
         console.log("Found Errors", result);
 
-        if (slackChannel && production) {
-          // TODO: deduplicate
-          await postMessage(
-            slackChannel,
-            {
-              text: `${jobName} Monitor Errors: ${result.map((m) => m.message || m).join("\n")}`,
-              blocks: [
-                {
-                  type: "header",
-                  text: {
-                    type: "plain_text",
-                    text: `${jobName} Monitor Errors`,
-                    emoji: true,
-                  },
-                },
-                {
-                  type: "divider",
-                },
-                ...sortErrors(result)
-                  .map((m) => {
-                    return [
-                      {
-                        type: "context",
-                        elements: [
-                          {
-                            type: "plain_text",
-                            text: `${LEVEL_EMOJI[m.type || ERROR_LEVEL.CRITICAL]} ${m.type || ERROR_LEVEL.CRITICAL}`,
-                          },
-                        ],
-                      },
-                      {
-                        type: "section",
-                        text: {
-                          type: "mrkdwn",
-                          text: m.message || m,
-                        },
-                      },
-                    ];
-                  })
-                  .flat(),
-                {
-                  type: "actions",
-                  elements: [
-                    {
-                      type: "button",
-                      text: {
-                        type: "plain_text",
-                        text: "View Details",
-                      },
-                      value: "view_details",
-                      url: `${await getNomadAddr(production)}/ui/jobs/${jobName}`,
-                    },
-                  ],
-                },
-              ],
-            },
-            verbose
-          );
-
+        if (production) {
           // Also alert on opsgenie (func prevents duplicate alerts)
           await postGenieMessage(
-            `${jobName} Monitor Errors: ${result.map((m) => m.message || m).join("\n")}`,
-            m.message
+            `${jobName} Monitor Errors`,
+            `${sortErrors(result)
+              .map((m) => m.message || m)
+              .join("\n")}`,
+            verbose
           );
         }
 
@@ -270,4 +213,4 @@ ${
   return { monitor };
 }
 
-module.exports = { createMonitor, ERROR_LEVEL };
+module.exports = { createMonitor, ERROR_LEVEL, LEVEL_EMOJI };

package/opsgenie.js

@@ -26,7 +26,7 @@ async function postGenieMessage(msg, desc, verbose) {
     };
 
     // Prevents duplicate alerts (See Opsgenie doc about alias)
-    bodyHash = hash(body);
+    const bodyHash = hash(body);
     body.alias = bodyHash;
 
     if (verbose) {

package/package.json

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