Revert "Added default dedupKey value as an {{alertInstanceId}} to pro…

…vide grouping functionality for PagerDuty incidents. (#83226)" This reverts commit f79188a.
elastic · Nov 20, 2020 · 21995e6 · 21995e6
1 parent 312438f
commit 21995e6
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 92 deletions.
diff --git a/x-pack/plugins/actions/README.md b/x-pack/plugins/actions/README.md
@@ -529,7 +529,7 @@ The PagerDuty action uses the [V2 Events API](https://v2.developer.pagerduty.com
 | Property    | Description                                                                                                                                                                                                                                                                                                             | Type                |
 | ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- |
 | eventAction | One of `trigger` _(default)_, `resolve`, or `acknowlege`. See [event action](https://v2.developer.pagerduty.com/docs/events-api-v2#event-action) for more details.                                                                                                                                                      | string _(optional)_ |
-| dedupKey    | All actions sharing this key will be associated with the same PagerDuty alert. Used to correlate trigger and resolution. The maximum length is **255** characters. See [alert deduplication](https://v2.developer.pagerduty.com/docs/events-api-v2#alert-de-duplication) for details.                                   | string _(optional)_ |
+| dedupKey    | All actions sharing this key will be associated with the same PagerDuty alert. Used to correlate trigger and resolution. Defaults to `action:<action id>`. The maximum length is **255** characters. See [alert deduplication](https://v2.developer.pagerduty.com/docs/events-api-v2#alert-de-duplication) for details. | string _(optional)_ |
 | summary     | A text summary of the event, defaults to `No summary provided`. The maximum length is **1024** characters.                                                                                                                                                                                                              | string _(optional)_ |
 | source      | The affected system, preferably a hostname or fully qualified domain name. Defaults to `Kibana Action <action id>`.                                                                                                                                                                                                     | string _(optional)_ |
 | severity    | The perceived severity of on the affected system. This can be one of `critical`, `error`, `warning` or `info`_(default)_.                                                                                                                                                                                               | string _(optional)_ |

diff --git a/...s_actions_ui/public/application/components/builtin_action_types/jira/jira_params.test.tsx b/...s_actions_ui/public/application/components/builtin_action_types/jira/jira_params.test.tsx
@@ -12,7 +12,6 @@ import { coreMock } from 'src/core/public/mocks';
 import { useGetIssueTypes } from './use_get_issue_types';
 import { useGetFieldsByIssueType } from './use_get_fields_by_issue_type';
 import { ActionConnector } from '../../../../types';
-import { AlertProvidedActionVariables } from '../../../lib/action_variables';
 
 jest.mock('./use_get_issue_types');
 jest.mock('./use_get_fields_by_issue_type');
@@ -91,7 +90,7 @@ describe('JiraParamsFields renders', () => {
         errors={{ title: [] }}
         editAction={() => {}}
         index={0}
-        messageVariables={[{ name: AlertProvidedActionVariables.alertId, description: '' }]}
+        messageVariables={[{ name: 'alertId', description: '' }]}
         docLinks={{ ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' } as DocLinksStart}
         toastNotifications={mocks.notifications.toasts}
         http={mocks.http}

diff --git a/...iggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx b/...iggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
@@ -29,7 +29,6 @@ import { useGetIssueTypes } from './use_get_issue_types';
 import { useGetFieldsByIssueType } from './use_get_fields_by_issue_type';
 import { SearchIssues } from './search_issues';
 import { extractActionVariable } from '../extract_action_variable';
-import { AlertProvidedActionVariables } from '../../../lib/action_variables';
 
 const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionParams>> = ({
   actionParams,
@@ -49,7 +48,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
   const [prioritiesSelectOptions, setPrioritiesSelectOptions] = useState<EuiSelectOption[]>([]);
 
   const isActionBeingConfiguredByAnAlert = messageVariables
-    ? isSome(extractActionVariable(messageVariables, AlertProvidedActionVariables.alertId))
+    ? isSome(extractActionVariable(messageVariables, 'alertId'))
     : false;
 
   useEffect(() => {
@@ -142,7 +141,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
       editAction('subAction', 'pushToService', index);
     }
     if (!savedObjectId && isActionBeingConfiguredByAnAlert) {
-      editSubActionProperty('savedObjectId', `${AlertProvidedActionVariables.alertId}`);
+      editSubActionProperty('savedObjectId', '{{alertId}}');
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [

diff --git a/...ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx b/...ui/public/application/components/builtin_action_types/pagerduty/pagerduty_params.test.tsx
@@ -40,10 +40,6 @@ describe('PagerDutyParamsFields renders', () => {
     expect(wrapper.find('[data-test-subj="severitySelect"]').first().prop('value')).toStrictEqual(
       'critical'
     );
-    expect(wrapper.find('[data-test-subj="dedupKeyInput"]').length > 0).toBeTruthy();
-    expect(wrapper.find('[data-test-subj="dedupKeyInput"]').first().prop('value')).toStrictEqual(
-      'test'
-    );
     expect(wrapper.find('[data-test-subj="eventActionSelect"]').length > 0).toBeTruthy();
     expect(wrapper.find('[data-test-subj="dedupKeyInput"]').length > 0).toBeTruthy();
     expect(wrapper.find('[data-test-subj="timestampInput"]').length > 0).toBeTruthy();

diff --git a/...ui/public/application/components/builtin_action_types/resilient/resilient_params.test.tsx b/...ui/public/application/components/builtin_action_types/resilient/resilient_params.test.tsx
@@ -11,7 +11,6 @@ import { DocLinksStart } from 'kibana/public';
 import { useGetIncidentTypes } from './use_get_incident_types';
 import { useGetSeverity } from './use_get_severity';
 import { coreMock } from 'src/core/public/mocks';
-import { AlertProvidedActionVariables } from '../../../lib/action_variables';
 
 const mocks = coreMock.createSetup();
 
@@ -87,7 +86,7 @@ describe('ResilientParamsFields renders', () => {
         errors={{ title: [] }}
         editAction={() => {}}
         index={0}
-        messageVariables={[{ name: AlertProvidedActionVariables.alertId, description: '' }]}
+        messageVariables={[{ name: 'alertId', description: '' }]}
         docLinks={{ ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' } as DocLinksStart}
         toastNotifications={mocks.notifications.toasts}
         http={mocks.http}

diff --git a/...ions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx b/...ions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
@@ -27,7 +27,6 @@ import { TextFieldWithMessageVariables } from '../../text_field_with_message_var
 import { useGetIncidentTypes } from './use_get_incident_types';
 import { useGetSeverity } from './use_get_severity';
 import { extractActionVariable } from '../extract_action_variable';
-import { AlertProvidedActionVariables } from '../../../lib/action_variables';
 
 const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<ResilientActionParams>> = ({
   actionParams,
@@ -44,7 +43,7 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
     actionParams.subActionParams || {};
 
   const isActionBeingConfiguredByAnAlert = messageVariables
-    ? isSome(extractActionVariable(messageVariables, AlertProvidedActionVariables.alertId))
+    ? isSome(extractActionVariable(messageVariables, 'alertId'))
     : false;
 
   const [incidentTypesComboBoxOptions, setIncidentTypesComboBoxOptions] = useState<
@@ -108,7 +107,7 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
       editAction('subAction', 'pushToService', index);
     }
     if (!savedObjectId && isActionBeingConfiguredByAnAlert) {
-      editSubActionProperty('savedObjectId', `${AlertProvidedActionVariables.alertId}`);
+      editSubActionProperty('savedObjectId', '{{alertId}}');
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [actionConnector, savedObjectId]);

diff --git a/.../public/application/components/builtin_action_types/servicenow/servicenow_params.test.tsx b/.../public/application/components/builtin_action_types/servicenow/servicenow_params.test.tsx
@@ -8,7 +8,6 @@ import { mountWithIntl } from '@kbn/test/jest';
 import ServiceNowParamsFields from './servicenow_params';
 import { DocLinksStart } from 'kibana/public';
 import { coreMock } from 'src/core/public/mocks';
-import { AlertProvidedActionVariables } from '../../../lib/action_variables';
 
 describe('ServiceNowParamsFields renders', () => {
   test('all params fields is rendered', () => {
@@ -33,7 +32,7 @@ describe('ServiceNowParamsFields renders', () => {
         errors={{ title: [] }}
         editAction={() => {}}
         index={0}
-        messageVariables={[{ name: AlertProvidedActionVariables.alertId, description: '' }]}
+        messageVariables={[{ name: 'alertId', description: '' }]}
         docLinks={{ ELASTIC_WEBSITE_URL: '', DOC_LINK_VERSION: '' } as DocLinksStart}
         toastNotifications={mocks.notifications.toasts}
         http={mocks.http}

diff --git a/...ns_ui/public/application/components/builtin_action_types/servicenow/servicenow_params.tsx b/...ns_ui/public/application/components/builtin_action_types/servicenow/servicenow_params.tsx
@@ -22,7 +22,6 @@ import { ServiceNowActionParams } from './types';
 import { TextAreaWithMessageVariables } from '../../text_area_with_message_variables';
 import { TextFieldWithMessageVariables } from '../../text_field_with_message_variables';
 import { extractActionVariable } from '../extract_action_variable';
-import { AlertProvidedActionVariables } from '../../../lib/action_variables';
 
 const ServiceNowParamsFields: React.FunctionComponent<ActionParamsProps<
   ServiceNowActionParams
@@ -31,7 +30,7 @@ const ServiceNowParamsFields: React.FunctionComponent<ActionParamsProps<
     actionParams.subActionParams || {};
 
   const isActionBeingConfiguredByAnAlert = messageVariables
-    ? isSome(extractActionVariable(messageVariables, AlertProvidedActionVariables.alertId))
+    ? isSome(extractActionVariable(messageVariables, 'alertId'))
     : false;
 
   const selectOptions = [
@@ -74,7 +73,7 @@ const ServiceNowParamsFields: React.FunctionComponent<ActionParamsProps<
       editAction('subAction', 'pushToService', index);
     }
     if (!savedObjectId && isActionBeingConfiguredByAnAlert) {
-      editSubActionProperty('savedObjectId', `${AlertProvidedActionVariables.alertId}`);
+      editSubActionProperty('savedObjectId', '{{alertId}}');
     }
     if (!urgency) {
       editSubActionProperty('urgency', '3');

diff --git a/...s/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx b/...s/triggers_actions_ui/public/application/components/text_field_with_message_variables.tsx
@@ -16,7 +16,6 @@ interface Props {
   inputTargetValue?: string;
   editAction: (property: string, value: any, index: number) => void;
   errors?: string[];
-  defaultValue?: string | number | string[];
 }
 
 export const TextFieldWithMessageVariables: React.FunctionComponent<Props> = ({
@@ -26,7 +25,6 @@ export const TextFieldWithMessageVariables: React.FunctionComponent<Props> = ({
   inputTargetValue,
   editAction,
   errors,
-  defaultValue,
 }) => {
   const [currentTextElement, setCurrentTextElement] = useState<HTMLInputElement | null>(null);
 
@@ -53,7 +51,6 @@ export const TextFieldWithMessageVariables: React.FunctionComponent<Props> = ({
       isInvalid={errors && errors.length > 0 && inputTargetValue !== undefined}
       data-test-subj={`${paramsProperty}Input`}
       value={inputTargetValue || ''}
-      defaultValue={defaultValue}
       onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChangeWithMessageVariable(e)}
       onFocus={(e: React.FocusEvent<HTMLInputElement>) => {
         setCurrentTextElement(e.target);

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_variables.ts
@@ -19,14 +19,6 @@ export function transformActionVariables(actionVariables: ActionVariables): Acti
   return alwaysProvidedVars.concat(contextVars, paramsVars, stateVars);
 }
 
-export enum AlertProvidedActionVariables {
-  alertId = 'alertId',
-  alertName = 'alertName',
-  spaceId = 'spaceId',
-  tags = 'tags',
-  alertInstanceId = 'alertInstanceId',
-}
-
 function prefixKeys(actionVariables: ActionVariable[], prefix: string): ActionVariable[] {
   return actionVariables.map((actionVariable) => {
     return { name: `${prefix}${actionVariable.name}`, description: actionVariable.description };
@@ -39,28 +31,28 @@ function getAlwaysProvidedActionVariables(): ActionVariable[] {
   const result: ActionVariable[] = [];
 
   result.push({
-    name: AlertProvidedActionVariables.alertId,
+    name: 'alertId',
     description: i18n.translate('xpack.triggersActionsUI.actionVariables.alertIdLabel', {
       defaultMessage: 'The id of the alert.',
     }),
   });
 
   result.push({
-    name: AlertProvidedActionVariables.alertName,
+    name: 'alertName',
     description: i18n.translate('xpack.triggersActionsUI.actionVariables.alertNameLabel', {
       defaultMessage: 'The name of the alert.',
     }),
   });
 
   result.push({
-    name: AlertProvidedActionVariables.spaceId,
+    name: 'spaceId',
     description: i18n.translate('xpack.triggersActionsUI.actionVariables.spaceIdLabel', {
       defaultMessage: 'The spaceId of the alert.',
     }),
   });
 
   result.push({
-    name: AlertProvidedActionVariables.tags,
+    name: 'tags',
     description: i18n.translate('xpack.triggersActionsUI.actionVariables.tagsLabel', {
       defaultMessage: 'The tags of the alert.',
     }),

diff --git a/...plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts b/...plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.test.ts
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/get_defaults_for_action_params.ts
diff --git a/...riggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx b/...riggers_actions_ui/public/application/sections/action_connector_form/action_type_form.tsx
@@ -39,7 +39,6 @@ import { hasSaveActionsCapability } from '../../lib/capabilities';
 import { ActionAccordionFormProps } from './action_form';
 import { transformActionVariables } from '../../lib/action_variables';
 import { resolvedActionGroupMessage } from '../../constants';
-import { getDefaultsForActionParams } from '../../lib/get_defaults_for_action_params';
 
 export type ActionTypeFormProps = {
   actionItem: AlertAction;
@@ -111,12 +110,6 @@ export const ActionTypeForm = ({
         ? resolvedActionGroupMessage
         : defaultActionMessage;
     setAvailableDefaultActionMessage(res);
-    const paramsDefaults = getDefaultsForActionParams(actionItem.actionTypeId, actionItem.group);
-    if (paramsDefaults) {
-      for (const [key, paramValue] of Object.entries(paramsDefaults)) {
-        setActionParamsProperty(key, paramValue, index);
-      }
-    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [actionItem.group]);