[Monitoring] Disk usage alerting

x-pack/plugins/monitoring/common/constants.ts

@@ -231,6 +231,7 @@ export const ALERT_PREFIX = 'monitoring_';
 export const ALERT_LICENSE_EXPIRATION = `${ALERT_PREFIX}alert_license_expiration`;
 export const ALERT_CLUSTER_HEALTH = `${ALERT_PREFIX}alert_cluster_health`;
 export const ALERT_CPU_USAGE = `${ALERT_PREFIX}alert_cpu_usage`;
+export const ALERT_DISK_USAGE = `${ALERT_PREFIX}alert_disk_usage`;
 export const ALERT_NODES_CHANGED = `${ALERT_PREFIX}alert_nodes_changed`;
 export const ALERT_ELASTICSEARCH_VERSION_MISMATCH = `${ALERT_PREFIX}alert_elasticsearch_version_mismatch`;
 export const ALERT_KIBANA_VERSION_MISMATCH = `${ALERT_PREFIX}alert_kibana_version_mismatch`;
@@ -243,6 +244,7 @@ export const ALERTS = [
   ALERT_LICENSE_EXPIRATION,
   ALERT_CLUSTER_HEALTH,
   ALERT_CPU_USAGE,
+  ALERT_DISK_USAGE,
   ALERT_NODES_CHANGED,
   ALERT_ELASTICSEARCH_VERSION_MISMATCH,
   ALERT_KIBANA_VERSION_MISMATCH,

x-pack/plugins/monitoring/common/types.ts

@@ -27,8 +27,9 @@ export interface CommonAlertState {
   meta: any;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface CommonAlertFilter {}
+export interface CommonAlertFilter {
+  nodeUuid?: string;
+}
 
 export interface CommonAlertCpuUsageFilter extends CommonAlertFilter {
   nodeUuid: string;

x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/expression.tsx → x-pack/plugins/monitoring/public/alerts/components/duration/expression.tsx

@@ -6,10 +6,10 @@
 
 import React, { Fragment } from 'react';
 import { EuiForm, EuiSpacer } from '@elastic/eui';
-import { CommonAlertParamDetails } from '../../../common/types';
-import { AlertParamDuration } from '../flyout_expressions/alert_param_duration';
-import { AlertParamType } from '../../../common/enums';
-import { AlertParamPercentage } from '../flyout_expressions/alert_param_percentage';
+import { CommonAlertParamDetails } from '../../../../common/types';
+import { AlertParamDuration } from '../../flyout_expressions/alert_param_duration';
+import { AlertParamType } from '../../../../common/enums';
+import { AlertParamPercentage } from '../../flyout_expressions/alert_param_percentage';
 
 export interface Props {
   alertParams: { [property: string]: any };

x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/validation.tsx → x-pack/plugins/monitoring/public/alerts/components/duration/validation.tsx

@@ -6,25 +6,30 @@
 
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../triggers_actions_ui/public/types';
+import { ValidationResult } from '../../../../../triggers_actions_ui/public/types';
 
-export function validate(opts: any): ValidationResult {
+interface ValidateOptions {
+  duration: string;
+  threshold: number;
+}
+
+export function validate(inputValues: ValidateOptions): ValidationResult {
   const validationResult = { errors: {} };
 
   const errors: { [key: string]: string[] } = {
     duration: [],
     threshold: [],
   };
-  if (!opts.duration) {
+  if (!inputValues.duration) {
     errors.duration.push(
-      i18n.translate('xpack.monitoring.alerts.cpuUsage.validation.duration', {
+      i18n.translate('xpack.monitoring.alerts.validation.duration', {
         defaultMessage: 'A valid duration is required.',
       })
     );
   }
-  if (isNaN(opts.threshold)) {
+  if (isNaN(inputValues.threshold)) {
     errors.threshold.push(
-      i18n.translate('xpack.monitoring.alerts.cpuUsage.validation.threshold', {
+      i18n.translate('xpack.monitoring.alerts.validation.threshold', {
         defaultMessage: 'A valid number is required.',
       })
     );

x-pack/plugins/monitoring/public/alerts/cpu_usage_alert/cpu_usage_alert.tsx

@@ -6,9 +6,9 @@
 import React from 'react';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { AlertTypeModel } from '../../../../triggers_actions_ui/public/types';
-import { validate } from './validation';
 import { ALERT_CPU_USAGE } from '../../../common/constants';
-import { Expression } from './expression';
+import { validate } from '../components/duration/validation';
+import { Expression, Props } from '../components/duration/expression';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { CpuUsageAlert } from '../../../server/alerts';
 
@@ -18,7 +18,7 @@ export function createCpuUsageAlertType(): AlertTypeModel {
     id: ALERT_CPU_USAGE,
     name: alert.label,
     iconClass: 'bell',
-    alertParamsExpression: (props: any) => (
+    alertParamsExpression: (props: Props) => (
       <Expression {...props} paramDetails={CpuUsageAlert.paramDetails} />
     ),
     validate,

x-pack/plugins/monitoring/public/alerts/disk_usage_alert/index.tsx

@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+import React from 'react';
+import { validate } from '../components/duration/validation';
+import { Expression, Props } from '../components/duration/expression';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { AlertTypeModel } from '../../../../triggers_actions_ui/public/types';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { DiskUsageAlert } from '../../../server/alerts';
+
+export function createDiskUsageAlertType(): AlertTypeModel {
+  return {
+    id: DiskUsageAlert.TYPE,
+    name: DiskUsageAlert.LABEL,
+    iconClass: 'bell',
+    alertParamsExpression: (props: Props) => (
+      <Expression {...props} paramDetails={DiskUsageAlert.PARAM_DETAILS} />
+    ),
+    validate,
+    defaultActionMessage: '{{context.internalFullMessage}}',
+    requiresAppContext: false,
+  };
+}

x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js

@@ -39,6 +39,7 @@ import {
   ALERT_LICENSE_EXPIRATION,
   ALERT_CLUSTER_HEALTH,
   ALERT_CPU_USAGE,
+  ALERT_DISK_USAGE,
   ALERT_NODES_CHANGED,
   ALERT_ELASTICSEARCH_VERSION_MISMATCH,
 } from '../../../../common/constants';
@@ -156,6 +157,7 @@ const OVERVIEW_PANEL_ALERTS = [ALERT_CLUSTER_HEALTH, ALERT_LICENSE_EXPIRATION];
 
 const NODES_PANEL_ALERTS = [
   ALERT_CPU_USAGE,
+  ALERT_DISK_USAGE,
   ALERT_NODES_CHANGED,
   ALERT_ELASTICSEARCH_VERSION_MISMATCH,
 ];

x-pack/plugins/monitoring/public/plugin.ts

@@ -23,6 +23,7 @@ import { MonitoringStartPluginDependencies, MonitoringConfig } from './types';
 import { TriggersAndActionsUIPublicPluginSetup } from '../../triggers_actions_ui/public';
 import { createCpuUsageAlertType } from './alerts/cpu_usage_alert';
 import { createLegacyAlertTypes } from './alerts/legacy_alert';
+import { createDiskUsageAlertType } from './alerts/disk_usage_alert';
 
 interface MonitoringSetupPluginDependencies {
   home?: HomePublicPluginSetup;
@@ -69,6 +70,7 @@ export class MonitoringPlugin
     }
 
     plugins.triggers_actions_ui.alertTypeRegistry.register(createCpuUsageAlertType());
+    plugins.triggers_actions_ui.alertTypeRegistry.register(createDiskUsageAlertType());
     const legacyAlertTypes = createLegacyAlertTypes();
     for (const legacyAlertType of legacyAlertTypes) {
       plugins.triggers_actions_ui.alertTypeRegistry.register(legacyAlertType);

x-pack/plugins/monitoring/public/views/elasticsearch/node/advanced/index.js

@@ -16,7 +16,11 @@ import template from './index.html';
 import { Legacy } from '../../../../legacy_shims';
 import { AdvancedNode } from '../../../../components/elasticsearch/node/advanced';
 import { MonitoringViewBaseController } from '../../../base_controller';
-import { CODE_PATH_ELASTICSEARCH, ALERT_CPU_USAGE } from '../../../../../common/constants';
+import {
+  CODE_PATH_ELASTICSEARCH,
+  ALERT_CPU_USAGE,
+  ALERT_DISK_USAGE,
+} from '../../../../../common/constants';
 
 function getPageData($injector) {
   const $http = $injector.get('$http');
@@ -65,7 +69,7 @@ uiRoutes.when('/elasticsearch/nodes/:node/advanced', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_CPU_USAGE],
+            alertTypeIds: [ALERT_CPU_USAGE, ALERT_DISK_USAGE],
             filters: [
               {
                 nodeUuid: nodeName,

x-pack/plugins/monitoring/public/views/elasticsearch/node/index.js

@@ -18,7 +18,11 @@ import { Node } from '../../../components/elasticsearch/node/node';
 import { labels } from '../../../components/elasticsearch/shard_allocation/lib/labels';
 import { nodesByIndices } from '../../../components/elasticsearch/shard_allocation/transformers/nodes_by_indices';
 import { MonitoringViewBaseController } from '../../base_controller';
-import { CODE_PATH_ELASTICSEARCH, ALERT_CPU_USAGE } from '../../../../common/constants';
+import {
+  CODE_PATH_ELASTICSEARCH,
+  ALERT_CPU_USAGE,
+  ALERT_DISK_USAGE,
+} from '../../../../common/constants';
 
 uiRoutes.when('/elasticsearch/nodes/:node', {
   template,
@@ -50,7 +54,7 @@ uiRoutes.when('/elasticsearch/nodes/:node', {
         alerts: {
           shouldFetch: true,
           options: {
-            alertTypeIds: [ALERT_CPU_USAGE],
+            alertTypeIds: [ALERT_CPU_USAGE, ALERT_DISK_USAGE],
             filters: [
               {
                 nodeUuid: nodeName,

x-pack/plugins/monitoring/server/alerts/alerts_common.ts

@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { AlertMessageDocLinkToken } from './types';
+import { AlertMessageTokenType } from '../../common/enums';
+
+export class AlertingDefaults {
+  public static readonly ALERT_STATE = {
+    resolved: i18n.translate('xpack.monitoring.alerts.state.resolved', {
+      defaultMessage: 'resolved',
+    }),
+    firing: i18n.translate('xpack.monitoring.alerts.state.firing', {
+      defaultMessage: 'firing',
+    }),
+  };
+  public static readonly ALERT_TYPE = {
+    context: {
+      internalShortMessage: {
+        name: 'internalShortMessage',
+        description: i18n.translate(
+          'xpack.monitoring.alerts.actionVariables.internalShortMessage',
+          {
+            defaultMessage: 'The short internal message generated by Elastic.',
+          }
+        ),
+      },
+      internalFullMessage: {
+        name: 'internalFullMessage',
+        description: i18n.translate('xpack.monitoring.alerts.actionVariables.internalFullMessage', {
+          defaultMessage: 'The full internal message generated by Elastic.',
+        }),
+      },
+      state: {
+        name: 'state',
+        description: i18n.translate('xpack.monitoring.alerts.actionVariables.state', {
+          defaultMessage: 'The current state of the alert.',
+        }),
+      },
+      clusterName: {
+        name: 'clusterName',
+        description: i18n.translate('xpack.monitoring.alerts.actionVariables.clusterName', {
+          defaultMessage: 'The cluster to which the nodes belong.',
+        }),
+      },
+      action: {
+        name: 'action',
+        description: i18n.translate('xpack.monitoring.alerts.actionVariables.action', {
+          defaultMessage: 'The recommended action for this alert.',
+        }),
+      },
+      actionPlain: {
+        name: 'actionPlain',
+        description: i18n.translate('xpack.monitoring.alerts.actionVariables.actionPlain', {
+          defaultMessage: 'The recommended action for this alert, without any markdown.',
+        }),
+      },
+    },
+  };
+}
+
+export const createDocLink = (translateStr: string, linkText: string, linkURL: string) => {
+  return {
+    text: i18n.translate(translateStr, {
+      defaultMessage: `#start_link${linkText}#end_link`,
+    }),
+    tokens: [
+      {
+        startToken: '#start_link',
+        endToken: '#end_link',
+        type: AlertMessageTokenType.DocLink,
+        partialUrl: linkURL,
+      } as AlertMessageDocLinkToken,
+    ],
+  };
+};

x-pack/plugins/monitoring/server/alerts/alerts_factory.test.ts

@@ -63,6 +63,6 @@ describe('AlertsFactory', () => {
 
   it('should get all', () => {
     const alerts = AlertsFactory.getAll();
-    expect(alerts.length).toBe(7);
+    expect(alerts.length).toBe(8);
   });
 });

x-pack/plugins/monitoring/server/alerts/alerts_factory.ts

@@ -6,6 +6,7 @@
 
 import {
   CpuUsageAlert,
+  DiskUsageAlert,
   NodesChangedAlert,
   ClusterHealthAlert,
   LicenseExpirationAlert,
@@ -18,6 +19,7 @@ import {
   ALERT_CLUSTER_HEALTH,
   ALERT_LICENSE_EXPIRATION,
   ALERT_CPU_USAGE,
+  ALERT_DISK_USAGE,
   ALERT_NODES_CHANGED,
   ALERT_LOGSTASH_VERSION_MISMATCH,
   ALERT_KIBANA_VERSION_MISMATCH,
@@ -29,6 +31,7 @@ export const BY_TYPE = {
   [ALERT_CLUSTER_HEALTH]: ClusterHealthAlert,
   [ALERT_LICENSE_EXPIRATION]: LicenseExpirationAlert,
   [ALERT_CPU_USAGE]: CpuUsageAlert,
+  [ALERT_DISK_USAGE]: DiskUsageAlert,
   [ALERT_NODES_CHANGED]: NodesChangedAlert,
   [ALERT_LOGSTASH_VERSION_MISMATCH]: LogstashVersionMismatchAlert,
   [ALERT_KIBANA_VERSION_MISMATCH]: KibanaVersionMismatchAlert,

x-pack/plugins/monitoring/server/alerts/cluster_health_alert.test.ts

@@ -25,6 +25,7 @@ describe('ClusterHealthAlert', () => {
     expect(alert.defaultThrottle).toBe('1d');
     // @ts-ignore
     expect(alert.actionVariables).toStrictEqual([
+      { name: 'clusterHealth', description: 'The health of the cluster.' },
       {
         name: 'internalShortMessage',
         description: 'The short internal message generated by Elastic.',
@@ -34,7 +35,6 @@ describe('ClusterHealthAlert', () => {
         description: 'The full internal message generated by Elastic.',
       },
       { name: 'state', description: 'The current state of the alert.' },
-      { name: 'clusterHealth', description: 'The health of the cluster.' },
       { name: 'clusterName', description: 'The cluster to which the nodes belong.' },
       { name: 'action', description: 'The recommended action for this alert.' },
       {
@@ -125,7 +125,7 @@ describe('ClusterHealthAlert', () => {
         alertStates: [
           {
             cluster: { clusterUuid: 'abc123', clusterName: 'testCluster' },
-            ccs: null,
+            ccs: undefined,
             ui: {
               isFiring: true,
               message: {
@@ -206,7 +206,7 @@ describe('ClusterHealthAlert', () => {
                 clusterUuid,
                 clusterName,
               },
-              ccs: null,
+              ccs: undefined,
               ui: {
                 isFiring: true,
                 message: null,
@@ -238,7 +238,7 @@ describe('ClusterHealthAlert', () => {
         alertStates: [
           {
             cluster: { clusterUuid, clusterName },
-            ccs: null,
+            ccs: undefined,
             ui: {
               isFiring: false,
               message: {