mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
[7.12] [alerting] encode rule/connector ids in http requests made from alerting UI (#97854) (#98211)
* [alerting] encode rule/connector ids in http requests made from alerting UI (#97854) resolves: https://github.com/elastic/kibana/issues/97852 Adds `encodeURIComponent()` wrappers around references to rule, alert, and connector ids. Without this fix, if an alert id (which can contain customer-generated data) contains a character that needs to be URL encoded, the resulting API call from the web UI will fail. # Conflicts: # x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.test.ts # x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/api.ts # x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.test.ts # x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/api.ts # x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.test.ts # x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/api.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/delete.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/execute.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/update.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/alert_summary.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/delete.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/delete.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/disable.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/disable.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/enable.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/enable.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/get_rule.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/get_rule.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/mute.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/mute.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/mute_alert.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/mute_alert.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/unmute.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/unmute.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/unmute_alert.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/unmute_alert.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/update.test.ts # x-pack/plugins/triggers_actions_ui/public/application/lib/alert_api/update.ts # x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts * fix merge conflicts In 7.13.0, the structure of the connector and rules API libraries in triggers_actions_ui changed, where in 7.12 they were all in a single file - one for connectors, one for rules - but in 7.13 they are split out into separate files in a directory for connectors and one for rules. To cut down on the noise, I decided to not use the `encodeURIComponent()` wrappers on rule ids, just connector ids and alert ids, since it's not possible in 7.12 to have rule ids which are not UUIDs, and so don't need the encoding. * fix prettier errors Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Patrick Mueller
GitHub
parent
b468ed7b75
commit
61f7cf9225
11 changed files with 117 additions and 86 deletions
|
|
@ -99,10 +99,10 @@ describe('Jira API', () => {
|
|||
test('should call get issue types API', async () => {
|
||||
const abortCtrl = new AbortController();
|
||||
http.post.mockResolvedValueOnce(issueTypesResponse);
|
||||
const res = await getIssueTypes({ http, signal: abortCtrl.signal, connectorId: 'test' });
|
||||
const res = await getIssueTypes({ http, signal: abortCtrl.signal, connectorId: 'te/st' });
|
||||
|
||||
expect(res).toEqual(issueTypesResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"issueTypes","subActionParams":{}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
@ -116,12 +116,12 @@ describe('Jira API', () => {
|
|||
const res = await getFieldsByIssueType({
|
||||
http,
|
||||
signal: abortCtrl.signal,
|
||||
connectorId: 'test',
|
||||
connectorId: 'te/st',
|
||||
id: '10006',
|
||||
});
|
||||
|
||||
expect(res).toEqual(fieldsResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"fieldsByIssueType","subActionParams":{"id":"10006"}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
@ -135,12 +135,12 @@ describe('Jira API', () => {
|
|||
const res = await getIssues({
|
||||
http,
|
||||
signal: abortCtrl.signal,
|
||||
connectorId: 'test',
|
||||
connectorId: 'te/st',
|
||||
title: 'test issue',
|
||||
});
|
||||
|
||||
expect(res).toEqual(issuesResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"issues","subActionParams":{"title":"test issue"}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
@ -154,12 +154,12 @@ describe('Jira API', () => {
|
|||
const res = await getIssue({
|
||||
http,
|
||||
signal: abortCtrl.signal,
|
||||
connectorId: 'test',
|
||||
connectorId: 'te/st',
|
||||
id: 'RJ-107',
|
||||
});
|
||||
|
||||
expect(res).toEqual(issuesResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"issue","subActionParams":{"id":"RJ-107"}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,12 +17,15 @@ export async function getIssueTypes({
|
|||
signal: AbortSignal;
|
||||
connectorId: string;
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'issueTypes', subActionParams: {} },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'issueTypes', subActionParams: {} },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
export async function getFieldsByIssueType({
|
||||
|
|
@ -36,12 +39,15 @@ export async function getFieldsByIssueType({
|
|||
connectorId: string;
|
||||
id: string;
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'fieldsByIssueType', subActionParams: { id } },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'fieldsByIssueType', subActionParams: { id } },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
export async function getIssues({
|
||||
|
|
@ -55,12 +61,15 @@ export async function getIssues({
|
|||
connectorId: string;
|
||||
title: string;
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'issues', subActionParams: { title } },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'issues', subActionParams: { title } },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
export async function getIssue({
|
||||
|
|
@ -74,10 +83,13 @@ export async function getIssue({
|
|||
connectorId: string;
|
||||
id: string;
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'issue', subActionParams: { id } },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'issue', subActionParams: { id } },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ const incidentTypesResponse = {
|
|||
{ id: 16, name: 'TBD / Unknown' },
|
||||
{ id: 15, name: 'Vendor / 3rd party error' },
|
||||
],
|
||||
actionId: 'test',
|
||||
actionId: 'te/st',
|
||||
};
|
||||
|
||||
const severityResponse = {
|
||||
|
|
@ -42,7 +42,7 @@ const severityResponse = {
|
|||
{ id: 5, name: 'Medium' },
|
||||
{ id: 6, name: 'High' },
|
||||
],
|
||||
actionId: 'test',
|
||||
actionId: 'te/st',
|
||||
};
|
||||
|
||||
describe('Resilient API', () => {
|
||||
|
|
@ -57,11 +57,11 @@ describe('Resilient API', () => {
|
|||
const res = await getIncidentTypes({
|
||||
http,
|
||||
signal: abortCtrl.signal,
|
||||
connectorId: 'test',
|
||||
connectorId: 'te/st',
|
||||
});
|
||||
|
||||
expect(res).toEqual(incidentTypesResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"incidentTypes","subActionParams":{}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
@ -75,11 +75,11 @@ describe('Resilient API', () => {
|
|||
const res = await getSeverity({
|
||||
http,
|
||||
signal: abortCtrl.signal,
|
||||
connectorId: 'test',
|
||||
connectorId: 'te/st',
|
||||
});
|
||||
|
||||
expect(res).toEqual(severityResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"severity","subActionParams":{}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -17,12 +17,15 @@ export async function getIncidentTypes({
|
|||
signal: AbortSignal;
|
||||
connectorId: string;
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'incidentTypes', subActionParams: {} },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'incidentTypes', subActionParams: {} },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
export async function getSeverity({
|
||||
|
|
@ -34,10 +37,13 @@ export async function getSeverity({
|
|||
signal: AbortSignal;
|
||||
connectorId: string;
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'severity', subActionParams: {} },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'severity', subActionParams: {} },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@ describe('ServiceNow API', () => {
|
|||
const res = await getChoices({
|
||||
http,
|
||||
signal: abortCtrl.signal,
|
||||
connectorId: 'test',
|
||||
connectorId: 'te/st',
|
||||
fields: ['priority'],
|
||||
});
|
||||
|
||||
expect(res).toEqual(choicesResponse);
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/test/_execute', {
|
||||
expect(http.post).toHaveBeenCalledWith('/api/actions/action/te%2Fst/_execute', {
|
||||
body: '{"params":{"subAction":"getChoices","subActionParams":{"fields":["priority"]}}}',
|
||||
signal: abortCtrl.signal,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -19,10 +19,13 @@ export async function getChoices({
|
|||
connectorId: string;
|
||||
fields: string[];
|
||||
}): Promise<Record<string, any>> {
|
||||
return await http.post(`${BASE_ACTION_API_PATH}/action/${connectorId}/_execute`, {
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'getChoices', subActionParams: { fields } },
|
||||
}),
|
||||
signal,
|
||||
});
|
||||
return await http.post(
|
||||
`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(connectorId)}/_execute`,
|
||||
{
|
||||
body: JSON.stringify({
|
||||
params: { subAction: 'getChoices', subActionParams: { fields } },
|
||||
}),
|
||||
signal,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ describe('loadActionTypes', () => {
|
|||
test('should call get types API', async () => {
|
||||
const resolvedValue: ActionType[] = [
|
||||
{
|
||||
id: 'test',
|
||||
id: 'te/st',
|
||||
name: 'Test',
|
||||
enabled: true,
|
||||
enabledInConfig: true,
|
||||
|
|
@ -67,7 +67,7 @@ describe('createActionConnector', () => {
|
|||
config: {},
|
||||
secrets: {},
|
||||
};
|
||||
const resolvedValue: ActionConnector = { ...connector, id: '123' };
|
||||
const resolvedValue: ActionConnector = { ...connector, id: '12/3' };
|
||||
http.post.mockResolvedValueOnce(resolvedValue);
|
||||
|
||||
const result = await createActionConnector({ http, connector });
|
||||
|
|
@ -85,7 +85,7 @@ describe('createActionConnector', () => {
|
|||
|
||||
describe('updateActionConnector', () => {
|
||||
test('should call the update API', async () => {
|
||||
const id = '123';
|
||||
const id = '12/3';
|
||||
const connector: ActionConnectorWithoutId<{}, {}> = {
|
||||
actionTypeId: 'test',
|
||||
isPreconfigured: false,
|
||||
|
|
@ -100,7 +100,7 @@ describe('updateActionConnector', () => {
|
|||
expect(result).toEqual(resolvedValue);
|
||||
expect(http.put.mock.calls[0]).toMatchInlineSnapshot(`
|
||||
Array [
|
||||
"/api/actions/action/123",
|
||||
"/api/actions/action/12%2F3",
|
||||
Object {
|
||||
"body": "{\\"name\\":\\"My test\\",\\"config\\":{},\\"secrets\\":{}}",
|
||||
},
|
||||
|
|
@ -111,7 +111,7 @@ describe('updateActionConnector', () => {
|
|||
|
||||
describe('deleteActions', () => {
|
||||
test('should call delete API per action', async () => {
|
||||
const ids = ['1', '2', '3'];
|
||||
const ids = ['1', '2/', '3'];
|
||||
|
||||
const result = await deleteActions({ ids, http });
|
||||
expect(result).toEqual({ errors: [], successes: [undefined, undefined, undefined] });
|
||||
|
|
@ -121,7 +121,7 @@ describe('deleteActions', () => {
|
|||
"/api/actions/action/1",
|
||||
],
|
||||
Array [
|
||||
"/api/actions/action/2",
|
||||
"/api/actions/action/2%2F",
|
||||
],
|
||||
Array [
|
||||
"/api/actions/action/3",
|
||||
|
|
@ -133,7 +133,7 @@ describe('deleteActions', () => {
|
|||
|
||||
describe('executeAction', () => {
|
||||
test('should call execute API', async () => {
|
||||
const id = '123';
|
||||
const id = '12/3';
|
||||
const params = {
|
||||
stringParams: 'someString',
|
||||
numericParams: 123,
|
||||
|
|
@ -151,7 +151,7 @@ describe('executeAction', () => {
|
|||
});
|
||||
expect(http.post.mock.calls[0]).toMatchInlineSnapshot(`
|
||||
Array [
|
||||
"/api/actions/action/123/_execute",
|
||||
"/api/actions/action/12%2F3/_execute",
|
||||
Object {
|
||||
"body": "{\\"params\\":{\\"stringParams\\":\\"someString\\",\\"numericParams\\":123}}",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ export async function updateActionConnector({
|
|||
connector: Pick<ActionConnectorWithoutId, 'name' | 'config' | 'secrets'>;
|
||||
id: string;
|
||||
}): Promise<ActionConnector> {
|
||||
return await http.put(`${BASE_ACTION_API_PATH}/action/${id}`, {
|
||||
return await http.put(`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(id)}`, {
|
||||
body: JSON.stringify({
|
||||
name: connector.name,
|
||||
config: connector.config,
|
||||
|
|
@ -57,7 +57,9 @@ export async function deleteActions({
|
|||
}): Promise<{ successes: string[]; errors: string[] }> {
|
||||
const successes: string[] = [];
|
||||
const errors: string[] = [];
|
||||
await Promise.all(ids.map((id) => http.delete(`${BASE_ACTION_API_PATH}/action/${id}`))).then(
|
||||
await Promise.all(
|
||||
ids.map((id) => http.delete(`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(id)}`))
|
||||
).then(
|
||||
function (fulfilled) {
|
||||
successes.push(...fulfilled);
|
||||
},
|
||||
|
|
@ -77,7 +79,7 @@ export async function executeAction({
|
|||
http: HttpSetup;
|
||||
params: Record<string, unknown>;
|
||||
}): Promise<ActionTypeExecutorResult<unknown>> {
|
||||
return http.post(`${BASE_ACTION_API_PATH}/action/${id}/_execute`, {
|
||||
return http.post(`${BASE_ACTION_API_PATH}/action/${encodeURIComponent(id)}/_execute`, {
|
||||
body: JSON.stringify({ params }),
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -664,12 +664,12 @@ describe('disableAlert', () => {
|
|||
|
||||
describe('muteAlertInstance', () => {
|
||||
test('should call mute instance alert API', async () => {
|
||||
const result = await muteAlertInstance({ http, id: '1', instanceId: '123' });
|
||||
const result = await muteAlertInstance({ http, id: '1', instanceId: '12/3' });
|
||||
expect(result).toEqual(undefined);
|
||||
expect(http.post.mock.calls).toMatchInlineSnapshot(`
|
||||
Array [
|
||||
Array [
|
||||
"/api/alerts/alert/1/alert_instance/123/_mute",
|
||||
"/api/alerts/alert/1/alert_instance/12%2F3/_mute",
|
||||
],
|
||||
]
|
||||
`);
|
||||
|
|
@ -678,12 +678,12 @@ describe('muteAlertInstance', () => {
|
|||
|
||||
describe('unmuteAlertInstance', () => {
|
||||
test('should call mute instance alert API', async () => {
|
||||
const result = await unmuteAlertInstance({ http, id: '1', instanceId: '123' });
|
||||
const result = await unmuteAlertInstance({ http, id: '1', instanceId: '1/23' });
|
||||
expect(result).toEqual(undefined);
|
||||
expect(http.post.mock.calls).toMatchInlineSnapshot(`
|
||||
Array [
|
||||
Array [
|
||||
"/api/alerts/alert/1/alert_instance/123/_unmute",
|
||||
"/api/alerts/alert/1/alert_instance/1%2F23/_unmute",
|
||||
],
|
||||
]
|
||||
`);
|
||||
|
|
|
|||
|
|
@ -246,7 +246,9 @@ export async function muteAlertInstance({
|
|||
instanceId: string;
|
||||
http: HttpSetup;
|
||||
}): Promise<void> {
|
||||
await http.post(`${BASE_ALERT_API_PATH}/alert/${id}/alert_instance/${instanceId}/_mute`);
|
||||
await http.post(
|
||||
`${BASE_ALERT_API_PATH}/alert/${id}/alert_instance/${encodeURIComponent(instanceId)}/_mute`
|
||||
);
|
||||
}
|
||||
|
||||
export async function unmuteAlertInstance({
|
||||
|
|
@ -258,7 +260,9 @@ export async function unmuteAlertInstance({
|
|||
instanceId: string;
|
||||
http: HttpSetup;
|
||||
}): Promise<void> {
|
||||
await http.post(`${BASE_ALERT_API_PATH}/alert/${id}/alert_instance/${instanceId}/_unmute`);
|
||||
await http.post(
|
||||
`${BASE_ALERT_API_PATH}/alert/${id}/alert_instance/${encodeURIComponent(instanceId)}/_unmute`
|
||||
);
|
||||
}
|
||||
|
||||
export async function muteAlert({ id, http }: { id: string; http: HttpSetup }): Promise<void> {
|
||||
|
|
|
|||
|
|
@ -93,14 +93,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
|
|||
|
||||
async function getAlertInstanceSummary(alertId: string) {
|
||||
const { body: summary } = await supertest
|
||||
.get(`/api/alerts/alert/${alertId}/_instance_summary`)
|
||||
.get(`/api/alerts/alert/${encodeURIComponent(alertId)}/_instance_summary`)
|
||||
.expect(200);
|
||||
return summary;
|
||||
}
|
||||
|
||||
async function muteAlertInstance(alertId: string, alertInstanceId: string) {
|
||||
const { body: response } = await supertest
|
||||
.post(`/api/alerts/alert/${alertId}/alert_instance/${alertInstanceId}/_mute`)
|
||||
.post(
|
||||
`/api/alerts/alert/${encodeURIComponent(alertId)}/alert_instance/${encodeURIComponent(
|
||||
alertInstanceId
|
||||
)}/_mute`
|
||||
)
|
||||
.set('kbn-xsrf', 'foo')
|
||||
.expect(204);
|
||||
|
||||
|
|
@ -640,17 +644,17 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
|
|||
|
||||
it('renders the muted inactive alert instances', async () => {
|
||||
// mute an alert instance that doesn't exist
|
||||
await muteAlertInstance(alert.id, 'eu-east');
|
||||
await muteAlertInstance(alert.id, 'eu/east');
|
||||
|
||||
// refresh to see alert
|
||||
await browser.refresh();
|
||||
|
||||
const instancesList: any[] = await pageObjects.alertDetailsUI.getAlertInstancesList();
|
||||
expect(
|
||||
instancesList.filter((alertInstance) => alertInstance.instance === 'eu-east')
|
||||
instancesList.filter((alertInstance) => alertInstance.instance === 'eu/east')
|
||||
).to.eql([
|
||||
{
|
||||
instance: 'eu-east',
|
||||
instance: 'eu/east',
|
||||
status: 'OK',
|
||||
start: '',
|
||||
duration: '',
|
||||
|
|
@ -693,14 +697,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
|
|||
});
|
||||
|
||||
it('allows the user unmute an inactive instance', async () => {
|
||||
log.debug(`Ensuring eu-east is muted`);
|
||||
await pageObjects.alertDetailsUI.ensureAlertInstanceMute('eu-east', true);
|
||||
log.debug(`Ensuring eu/east is muted`);
|
||||
await pageObjects.alertDetailsUI.ensureAlertInstanceMute('eu/east', true);
|
||||
|
||||
log.debug(`Unmuting eu-east`);
|
||||
await pageObjects.alertDetailsUI.clickAlertInstanceMuteButton('eu-east');
|
||||
log.debug(`Unmuting eu/east`);
|
||||
await pageObjects.alertDetailsUI.clickAlertInstanceMuteButton('eu/east');
|
||||
|
||||
log.debug(`Ensuring eu-east is removed from list`);
|
||||
await pageObjects.alertDetailsUI.ensureAlertInstanceExistance('eu-east', false);
|
||||
log.debug(`Ensuring eu/east is removed from list`);
|
||||
await pageObjects.alertDetailsUI.ensureAlertInstanceExistance('eu/east', false);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue