[Watcher] Support for adding actions to threshold watch

x-pack/plugins/translations/translations/zh-CN.json

@@ -7847,7 +7847,6 @@
     "xpack.watcher.models.baseWatch.watchStatusJsonPropertyMissingBadRequestMessage": "json 参数必须包含 {watchStatusJson} 属性",
     "xpack.watcher.models.emailAction.actionJsonEmailPropertyMissingBadRequestMessage": "json 参数必须包含 {actionJsonEmail} 属性",
     "xpack.watcher.models.emailAction.actionJsonEmailToPropertyMissingBadRequestMessage": "json 参数必须包含 {actionJsonEmailTo} 属性",
-    "xpack.watcher.models.emailAction.description": "“{subject}” 将发送至 {toList}",
     "xpack.watcher.models.emailAction.selectMessageText": "从您的服务器发送电子邮件。",
     "xpack.watcher.models.emailAction.simulateButtonLabel": "立即试发电子邮件",
     "xpack.watcher.models.emailAction.simulateFailMessage": "无法将电子邮件发至 {toList}。",
@@ -7858,7 +7857,6 @@
     "xpack.watcher.models.jsonWatch.typeName": "高级监视",
     "xpack.watcher.models.loggingAction.actionJsonLoggingPropertyMissingBadRequestMessage": "json 参数必须包含 {actionJsonLogging} 属性",
     "xpack.watcher.models.loggingAction.actionJsonLoggingTextPropertyMissingBadRequestMessage": "json 参数必须包含 {actionJsonLoggingText} 属性",
-    "xpack.watcher.models.loggingAction.description": "记录消息“{text}”",
     "xpack.watcher.models.loggingAction.selectMessageText": "向日志添加新项。",
     "xpack.watcher.models.loggingAction.simulateButtonLabel": "立即记录示例消息",
     "xpack.watcher.models.loggingAction.simulateFailMessage": "无法记录示例消息。",
@@ -7870,7 +7868,6 @@
     "xpack.watcher.models.monitoringWatch.upstreamJsonCalledBadRequestMessage": "为监测监视而调用的 {upstreamJson}",
     "xpack.watcher.models.slackAction.actionJsonSlackMessagePropertyMissingBadRequestMessage": "json 参数必须包含 {actionJsonSlackMessage} 属性",
     "xpack.watcher.models.slackAction.actionJsonSlackPropertyMissingBadRequestMessage": "json 参数必须包含 {actionJsonSlack} 属性",
-    "xpack.watcher.models.slackAction.description": "Slack 消息将发至 {toList}",
     "xpack.watcher.models.slackAction.selectMessageText": "向 slack 用户或渠道发送消息。",
     "xpack.watcher.models.slackAction.simulateButtonLabel": "立即发送示例消息",
     "xpack.watcher.models.slackAction.simulateFailMessage": "无法将示例 Slack 消息发至 {toList}。",

x-pack/plugins/watcher/common/constants/action_types.ts

@@ -13,8 +13,6 @@ export const ACTION_TYPES: { [key: string]: string } = {
 
   LOGGING: 'logging',
 
-  HIPCHAT: 'hipchat',
-
   SLACK: 'slack',
 
   JIRA: 'jira',

x-pack/plugins/watcher/common/lib/get_action_type/__tests__/get_action_type.js

@@ -56,17 +56,6 @@ describe('get_action_type', () => {
       expect(type).to.be(ACTION_TYPES.LOGGING);
     });
 
-    it(`correctly calculates ACTION_TYPES.HIPCHAT`, () => {
-      const actionJson = {
-        hipchat: {
-          'foo': 'bar'
-        }
-      };
-      const type = getActionType(actionJson);
-
-      expect(type).to.be(ACTION_TYPES.HIPCHAT);
-    });
-
     it(`correctly calculates ACTION_TYPES.SLACK`, () => {
       const actionJson = {
         slack: {

x-pack/plugins/watcher/common/types/action_types.ts

@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+type EmailActionType = 'email';
+type LoggingActionType = 'logging';
+type WebhookActionType = 'webhook';
+type IndexActionType = 'index';
+type SlackActionType = 'slack';
+type JiraActionType = 'jira';
+type PagerDutyActionType = 'pagerduty';
+
+export interface BaseAction {
+  id: string;
+  typeName: string;
+  simulateMessage: string;
+  simulateFailMessage: string;
+  simulatePrompt: string;
+  selectMessage: string;
+  validate: () => { [key: string]: string[] };
+  isEnabled: boolean;
+}
+
+export interface EmailAction extends BaseAction {
+  type: EmailActionType;
+  iconClass: 'email';
+  to: [];
+  subject?: string;
+  body: string;
+}
+
+export interface LoggingAction extends BaseAction {
+  type: LoggingActionType;
+  iconClass: 'loggingApp';
+  text: string;
+}
+
+export interface IndexAction extends BaseAction {
+  type: IndexActionType;
+  iconClass: 'indexOpen';
+  index: string;
+}
+
+export interface PagerDutyAction extends BaseAction {
+  type: PagerDutyActionType;
+  iconClass: 'apps';
+  description: string;
+}
+
+export interface WebhookAction extends BaseAction {
+  type: WebhookActionType;
+  iconClass: 'logoWebhook';
+  method?: 'head' | 'get' | 'post' | 'put' | 'delete';
+  host: string;
+  port: number;
+  path?: string;
+  body: string;
+}
+
+export interface SlackAction extends BaseAction {
+  type: SlackActionType;
+  iconClass: 'logoSlack';
+  text: string;
+  to: string[];
+}
+
+export interface JiraAction extends BaseAction {
+  type: JiraActionType;
+  iconClass: 'apps';
+  account?: string;
+  projectKey: string;
+  issueType: string;
+  summary: string;
+}
+
+export type ActionType =
+  | EmailAction
+  | LoggingAction
+  | IndexAction
+  | SlackAction
+  | JiraAction
+  | PagerDutyAction;

x-pack/plugins/watcher/plugin_definition.js

@@ -21,6 +21,7 @@ export const pluginDefinition = {
   publicDir: resolve(__dirname, 'public'),
   require: ['kibana', 'elasticsearch', 'xpack_main'],
   uiExports: {
+    styleSheetPaths: resolve(__dirname, 'public/index.scss'),
     managementSections: ['plugins/watcher'],
     home: ['plugins/watcher/register_feature'],
   },

x-pack/plugins/watcher/public/index.scss

@@ -0,0 +1,16 @@
+// Import the EUI global scope so we can use EUI constants
+@import 'src/legacy/ui/public/styles/_styling_constants';
+
+// Watcher plugin styles
+
+// Prefix all styles with "watcher" to avoid conflicts.
+// Examples
+//   watcherChart
+//   watcherChart__legend
+//   watcherChart__legend--small
+//   watcherChart__legend-isLoading
+
+.watcherThresholdWatchActionDropdownContainer {
+  justify-content: flex-end;
+  flex-direction: row;
+}

x-pack/plugins/watcher/public/lib/api.ts

@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { Settings } from 'plugins/watcher/models/settings';
 import { Watch } from 'plugins/watcher/models/watch';
 import { WatchHistoryItem } from 'plugins/watcher/models/watch_history_item';
 import { WatchStatus } from 'plugins/watcher/models/watch_status';
@@ -157,10 +158,16 @@ export const loadIndexPatterns = async () => {
   });
   return savedObjects;
 };
+
 export const getWatchVisualizationData = async (watchModel: BaseWatch, visualizeOptions: any) => {
   const response = await getHttpClient().post(`${basePath}/watch/visualize`, {
     watch: watchModel.upstreamJson,
     options: visualizeOptions.upstreamJson,
   });
   return response.data;
 };
+
+export const fetchSettings = async () => {
+  const { data } = await getHttpClient().get(`${basePath}/settings`);
+  return Settings.fromUpstreamJson(data);
+};

x-pack/plugins/watcher/public/models/action/action.js

@@ -9,11 +9,10 @@ import { ACTION_TYPES } from 'plugins/watcher/../common/constants';
 import { EmailAction } from './email_action';
 import { LoggingAction } from './logging_action';
 import { SlackAction } from './slack_action';
-import { WebhookAction } from './webhook.action';
-import { IndexAction } from './index.action';
-import { HipchatAction } from './hipchat.action';
-import { PagerDutyAction } from './pagerduty.action';
-import { JiraAction } from './jira.action';
+import { WebhookAction } from './webhook_action';
+import { IndexAction } from './index_action';
+import { PagerDutyAction } from './pagerduty_action';
+import { JiraAction } from './jira_action';
 import { UnknownAction } from './unknown_action';
 
 const ActionTypes = {};
@@ -22,7 +21,6 @@ set(ActionTypes, ACTION_TYPES.LOGGING, LoggingAction);
 set(ActionTypes, ACTION_TYPES.SLACK, SlackAction);
 set(ActionTypes, ACTION_TYPES.WEBHOOK, WebhookAction);
 set(ActionTypes, ACTION_TYPES.INDEX, IndexAction);
-set(ActionTypes, ACTION_TYPES.HIPCHAT, HipchatAction);
 set(ActionTypes, ACTION_TYPES.PAGERDUTY, PagerDutyAction);
 set(ActionTypes, ACTION_TYPES.JIRA, JiraAction);
 

x-pack/plugins/watcher/public/models/action/base_action.js

@@ -47,15 +47,10 @@ export class BaseAction {
     return this.constructor.simulatePrompt;
   }
 
-  get template() {
-    return this.constructor.template;
-  }
-
   static typeName = i18n.translate('xpack.watcher.models.baseAction.typeName', {
     defaultMessage: 'Action',
   });
-  static iconClass = 'fa-cog';
-  static template = '';
+  static iconClass = 'apps';
   static selectMessage = i18n.translate('xpack.watcher.models.baseAction.selectMessageText', {
     defaultMessage: 'Perform an action.',
   });

x-pack/plugins/watcher/public/models/action/email_action.js

@@ -12,10 +12,32 @@ export class EmailAction extends BaseAction {
   constructor(props = {}) {
     super(props);
 
-    const toArray = get(props, 'to', []);
-    this.to = isArray(toArray) ? toArray : [ toArray ];
-    this.subject = get(props, 'subject', '');
-    this.body = get(props, 'body', '');
+    const toArray = get(props, 'to');
+    this.to = isArray(toArray) ? toArray : toArray && [ toArray ];
+    this.subject = get(props, 'subject');
+    this.body = get(props, 'body');
+  }
+
+  validate() {
+    const errors = {
+      to: [],
+      body: [],
+    };
+    if (!this.to || this.to.length === 0) {
+      errors.to.push(
+        i18n.translate('xpack.watcher.watchActions.email.emailRecipientIsRequiredValidationMessage', {
+          defaultMessage: 'To email address is required.',
+        })
+      );
+    }
+    if (!this.body) {
+      errors.body.push(
+        i18n.translate('xpack.watcher.watchActions.email.emailBodyIsRequiredValidationMessage', {
+          defaultMessage: 'Email body is required.',
+        })
+      );
+    }
+    return errors;
   }
 
   get upstreamJson() {
@@ -26,29 +48,17 @@ export class EmailAction extends BaseAction {
       subject: this.subject,
       body: this.body,
       email: {
-        to: this.to.length ? this.to : undefined,
+        to: this.to && this.to.length ? this.to : undefined,
       }
     });
 
     return result;
   }
 
-  get description() {
-    const toList = this.to.join(', ');
-    const subject = this.subject || '';
-    return i18n.translate('xpack.watcher.models.emailAction.description', {
-      defaultMessage: '"{subject}" will be sent to {toList}',
-      values: {
-        subject,
-        toList
-      }
-    });
-  }
-
   get simulateMessage() {
     const toList = this.to.join(', ');
     return i18n.translate('xpack.watcher.models.emailAction.simulateMessage', {
-      defaultMessage: 'Sample e-mail sent to {toList}',
+      defaultMessage: 'Sample email sent to {toList}',
       values: {
         toList
       }
@@ -58,7 +68,7 @@ export class EmailAction extends BaseAction {
   get simulateFailMessage() {
     const toList = this.to.join(', ');
     return i18n.translate('xpack.watcher.models.emailAction.simulateFailMessage', {
-      defaultMessage: 'Failed to send e-mail to {toList}.',
+      defaultMessage: 'Failed to send email to {toList}.',
       values: {
         toList
       }
@@ -70,14 +80,16 @@ export class EmailAction extends BaseAction {
   }
 
   static typeName = i18n.translate('xpack.watcher.models.emailAction.typeName', {
-    defaultMessage: 'E-mail',
+    defaultMessage: 'Email',
   });
-  static iconClass = 'kuiIcon fa-envelope-o';
-  static template = '<watch-email-action></watch-email-action>';
+  static iconClass = 'email';
   static selectMessage = i18n.translate('xpack.watcher.models.emailAction.selectMessageText', {
-    defaultMessage: 'Send out an e-mail from your server.',
+    defaultMessage: 'Send out an email from your server.',
   });
   static simulatePrompt = i18n.translate('xpack.watcher.models.emailAction.simulateButtonLabel', {
-    defaultMessage: 'Test fire an e-mail now'
+    defaultMessage: 'Test fire an email now'
   });
+  static defaults = {
+    subject: 'Watch [{{ctx.metadata.name}}] has exceeded the threshold'
+  };
 }