Merge pull request #377 from sirensolutions/multi-fix_report-and-alar…

…m-message Multi fix for report and alarm message and spy button
sentinl · Mar 26, 2018 · 81b78ec · 81b78ec
2 parents b881b3c + bc7cabe
commit 81b78ec
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 31 deletions.
diff --git a/index.js b/index.js
@@ -211,6 +211,7 @@ export default function (kibana) {
               'Option "report.tmp_path" is not needed anymore. Just delete it from config!'
             )),
             active: Joi.boolean().default(false),
+            executable_path: Joi.string().default('/usr/bin/chromium'),
             authentication: Joi.object({
               enabled: Joi.boolean().default(false),
               mode: Joi.object({

diff --git a/public/dashboard_spy_button/alarm_spy.html b/public/dashboard_spy_button/alarm_spy.html
@@ -1,6 +1,6 @@
-<div ng-show="spy.mode.name === 'setalarm'" class="fill visualize-spy-nav">
+<div class="fill visualize-spy-nav" style="padding-top:10px">
   <div class="form-group">
-    <a class="btn btn-success" ng-click="createWatcher()" target="_sentinl" ng-href="./sentinl">
+    <a class="kuiButton kuiButton--primary" ng-click="createWatcher()" target="_sentinl" ng-href="./sentinl">
       Set Alarm
     </a>
   </div>

diff --git a/server/lib/actions/actions/report.js b/server/lib/actions/actions/report.js
@@ -5,9 +5,8 @@ import url from 'url';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
-import { resolve, promisify, reject } from 'bluebird';
+import { delay } from 'bluebird';
 import { includes, isObject } from 'lodash';
-import { delay } from '../../helpers';
 import getConfiguration from '../../get_configuration';
 import logHistory from '../../log_history';
 import uuid from 'uuid/v4';
@@ -61,11 +60,12 @@ class Reporter {
     this.config = config;
   }
 
-  async openPage(url) {
+  async openPage(url, executablePath) {
     this.url = url;
 
     try {
       this.browser = await puppeteer.launch({
+        executablePath,
         args: ['--no-sandbox', '--disable-setuid-sandbox'],
         ignoreHTTPSErrors: true,
       });
@@ -172,6 +172,7 @@ const createReportAttachment = function (filename, file, type = 'png') {
 *
 * @param {object} server - Kibana hapi server
 * @param {object} email - instance of emailjs server
+* @param {object} task - watcher
 * @param {object} action - current watcher action
 * @param {string} actionName - name of the action
 * @param {object} payload - ES response
@@ -186,7 +187,7 @@ export default async function doReport(server, email, task, action, actionName,
   }
 
   if (!action.snapshot.url.length) {
-    reject('Report Disabled: No URL Settings!');
+    log.info('Report Disabled: No URL Settings!');
   }
 
   let formatterSubject = action.subject;
@@ -226,7 +227,7 @@ export default async function doReport(server, email, task, action, actionName,
 
   try {
     const report = new Reporter(config);
-    await report.openPage(action.snapshot.url);
+    await report.openPage(action.snapshot.url, config.executable_path);
 
     let file;
     if (action.snapshot.type !== 'pdf') {
@@ -276,6 +277,6 @@ export default async function doReport(server, email, task, action, actionName,
     log.debug('stateless report does not save data to Elasticsearch');
     return {message: 'stateless report does not save data to Elasticsearch'};
   } catch (err) {
-    throw err;
+    log.error(err);
   }
 }
diff --git a/server/lib/actions/do_actions.js b/server/lib/actions/do_actions.js
@@ -32,6 +32,13 @@ import Log from '../log';
 // actions
 import reportAction from './actions/report';
 
+const toString = function (message) {
+  if (typeof message !== 'string') {
+    return JSON.stringify(message);
+  }
+  return message;
+};
+
 export default function (server, actions, payload, task) {
   const config = getConfiguration(server);
   const log = new Log(config.app_name, server, 'action');
@@ -107,7 +114,7 @@ export default function (server, actions, payload, task) {
       esHistory({
         title: task._source.title,
         actionType: actionName,
-        message,
+        message: toString(message),
         level: priority,
         payload: !action.console.save_payload ? {} : payload,
         report: false
@@ -145,7 +152,7 @@ export default function (server, actions, payload, task) {
     *      "body" : "Series Alarm {{ payload._id}}: {{payload.hits.total}}",
     *      "stateless" : false,
     *      "save_payload" : false
-    *	    }
+    *     }
     */
 
     var formatterSubject;
@@ -180,7 +187,7 @@ export default function (server, actions, payload, task) {
         esHistory({
           title: task._source.title,
           actionType: actionName,
-          message: text,
+          message: toString(text),
           level: priority,
           payload: !action.email.save_payload ? {} : payload,
           report: false
@@ -200,7 +207,7 @@ export default function (server, actions, payload, task) {
     *      "html" : "<p>Series Alarm {{ payload._id}}: {{payload.hits.total}}</p>",
     *      "stateless" : false,
     *      "save_payload" : false
-    *	    }
+    *     }
     */
     var html;
     if (_.has(action, 'email_html')) {
@@ -241,7 +248,7 @@ export default function (server, actions, payload, task) {
         esHistory({
           title: task._source.title,
           actionType: actionName,
-          message: text,
+          message: toString(text),
           level: priority,
           payload: !action.email_html.save_payload ? {} : payload,
           report: false
@@ -258,13 +265,13 @@ export default function (server, actions, payload, task) {
     *      "priority" : "high",
     *      "body" : "Series Report {{ payload._id}}: {{payload.hits.total}}",
     *      "snapshot" : {
-    *      		"res" : "1280,900",
+    *         "res" : "1280,900",
     *         "url" : "http://127.0.0.1/app/kibana#/dashboard/Alerts",
     *         "path" : "/tmp/",
     *         "params" : {
-    *      				"username" : "username",
-    *      				"password" : "password",
-    *      				"delay" : 15,
+    *             "username" : "username",
+    *             "password" : "password",
+    *             "delay" : 15,
     *             "crop" : false
     *         }
     *       },
@@ -318,7 +325,7 @@ export default function (server, actions, payload, task) {
         esHistory({
           title: task._source.title,
           actionType: actionName,
-          message,
+          message: toString(message),
           level: priority,
           payload: !action.slack.save_payload ? {} : payload,
           report: false
@@ -366,7 +373,7 @@ export default function (server, actions, payload, task) {
           esHistory({
             title: task._source.title,
             actionType: actionName,
-            message: action.webhook.message,
+            message:  toString(action.webhook.message),
             level: action.webhook.priority,
             payload: !action.webhook.save_payload ? {} : payload,
             report: false
@@ -400,17 +407,17 @@ export default function (server, actions, payload, task) {
     */
 
     if (_.has(action, 'elastic')) {
-      let esMessage;
+      let message;
       let esFormatter;
       esFormatter = action.local.message ? action.local.message : '{{ payload }}';
-      esMessage = mustache.render(esFormatter, {payload: payload});
+      message = mustache.render(esFormatter, {payload: payload});
       priority = action.local.priority ? action.local.priority : 'INFO';
-      log.debug(`logged message to elastic: ${esMessage}`);
+      log.debug(`logged message to elastic: ${message}`);
       // Log Event
       esHistory({
         title: task._source.title,
         actionType: actionName,
-        message: esMessage,
+        message: toString(message),
         level: priority,
         payload: !action.local.save_payload ? {} : payload,
         report: false
@@ -472,4 +479,3 @@ export default function (server, actions, payload, task) {
     }
   });
 }
-
diff --git a/server/lib/helpers.js b/server/lib/helpers.js
@@ -10,13 +10,6 @@ const isKibi = function (server) {
   return server.plugins.saved_objects_api ? true : false;
 };
 
-const delay = function (timeout) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, timeout);
-  });
-};
-
 module.exports = {
   isKibi,
-  delay,
 };