Skip to content

Commit ca2a0ca

Browse files
cnasikascnasikas
authored
[Cases] Update email content and footer (elastic#146036)
## Summary This PR replace `Kibana` with `Elastic` in the email content and footer. ### Checklist Delete any items that are not applicable to this PR. - [x] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md) - [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios ### For maintainers - [x] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
1 parent d097d96 commit ca2a0ca

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed

‎x-pack/plugins/cases/server/services/notifications/email_notification_service.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('EmailNotificationService', () => {
5151
],
5252
},
5353
message:
54-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
54+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
5555
subject: '[Elastic][Cases] Super Bad Security Issue',
5656
to: ['[email protected]', '[email protected]', '[email protected]'],
5757
});
@@ -74,7 +74,7 @@ describe('EmailNotificationService', () => {
7474
],
7575
},
7676
message:
77-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
77+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
7878
subject: '[Elastic][Cases] Super Bad Security Issue',
7979
to: ['[email protected]', '[email protected]', '[email protected]'],
8080
});
@@ -102,7 +102,7 @@ describe('EmailNotificationService', () => {
102102
],
103103
},
104104
message:
105-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
105+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
106106
subject: '[Elastic][Cases] Super Bad Security Issue',
107107
to: ['[email protected]'],
108108
});
@@ -125,7 +125,7 @@ describe('EmailNotificationService', () => {
125125
],
126126
},
127127
message:
128-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
128+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
129129
subject: '[Elastic][Cases] Super Bad Security Issue',
130130
to: ['[email protected]', '[email protected]', '[email protected]'],
131131
});
@@ -156,7 +156,7 @@ describe('EmailNotificationService', () => {
156156
],
157157
},
158158
message:
159-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/s/test-space/app/security/cases/mock-id-1)',
159+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n\r\n\r\n[View the case details](https://example.com/s/test-space/app/security/cases/mock-id-1)',
160160
subject: '[Elastic][Cases] Super Bad Security Issue',
161161
to: ['[email protected]', '[email protected]', '[email protected]'],
162162
});
@@ -186,7 +186,7 @@ describe('EmailNotificationService', () => {
186186
],
187187
},
188188
message:
189-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n',
189+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: defacement\r\n\r\n',
190190
subject: '[Elastic][Cases] Super Bad Security Issue',
191191
to: ['[email protected]', '[email protected]', '[email protected]'],
192192
});
@@ -209,7 +209,7 @@ describe('EmailNotificationService', () => {
209209
],
210210
},
211211
message:
212-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: one, two\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
212+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\nTags: one, two\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
213213
subject: '[Elastic][Cases] Super Bad Security Issue',
214214
to: ['[email protected]', '[email protected]', '[email protected]'],
215215
});
@@ -232,7 +232,7 @@ describe('EmailNotificationService', () => {
232232
],
233233
},
234234
message:
235-
'You are assigned to an Elastic Kibana Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
235+
'You are assigned to an Elastic Case.\r\n\r\nTitle: Super Bad Security Issue\r\n\r\nStatus: open\r\n\r\nSeverity: low\r\n\r\n\r\n\r\n[View the case details](https://example.com/app/security/cases/mock-id-1)',
236236
subject: '[Elastic][Cases] Super Bad Security Issue',
237237
to: ['[email protected]', '[email protected]', '[email protected]'],
238238
});

‎x-pack/plugins/cases/server/services/notifications/email_notification_service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class EmailNotificationService implements NotificationService {
5656
publicBaseUrl?: IBasePath['publicBaseUrl']
5757
) {
5858
const lineBreak = '\r\n\r\n';
59-
let message = `You are assigned to an Elastic Kibana Case.${lineBreak}`;
59+
let message = `You are assigned to an Elastic Case.${lineBreak}`;
6060
message = `${message}Title: ${theCase.attributes.title}${lineBreak}`;
6161
message = `${message}Status: ${theCase.attributes.status}${lineBreak}`;
6262
message = `${message}Severity: ${theCase.attributes.severity}${lineBreak}`;

‎x-pack/plugins/stack_connectors/server/connector_types/stack/email/index.test.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ describe('params validation', () => {
436436
"cc": Array [],
437437
"kibanaFooterLink": Object {
438438
"path": "/",
439-
"text": "Go to Kibana",
439+
"text": "Go to Elastic",
440440
},
441441
"message": "this is the message",
442442
"subject": "this is a test",
@@ -508,7 +508,7 @@ describe('execute()', () => {
508508
message: 'a message to you',
509509
kibanaFooterLink: {
510510
path: '/',
511-
text: 'Go to Kibana',
511+
text: 'Go to Elastic',
512512
},
513513
};
514514

@@ -542,7 +542,7 @@ describe('execute()', () => {
542542
543543
--
544544
545-
This message was sent by Kibana.",
545+
This message was sent by Elastic.",
546546
"subject": "the subject",
547547
},
548548
"hasAuth": true,
@@ -593,7 +593,7 @@ describe('execute()', () => {
593593
594594
--
595595
596-
This message was sent by Kibana.",
596+
This message was sent by Elastic.",
597597
"subject": "the subject",
598598
},
599599
"hasAuth": false,
@@ -644,7 +644,7 @@ describe('execute()', () => {
644644
645645
--
646646
647-
This message was sent by Kibana.",
647+
This message was sent by Elastic.",
648648
"subject": "the subject",
649649
},
650650
"hasAuth": false,
@@ -707,7 +707,7 @@ describe('execute()', () => {
707707
message: '{{rogue}}',
708708
kibanaFooterLink: {
709709
path: '/',
710-
text: 'Go to Kibana',
710+
text: 'Go to Elastic',
711711
},
712712
};
713713
const variables = {
@@ -729,7 +729,7 @@ describe('execute()', () => {
729729
],
730730
"kibanaFooterLink": Object {
731731
"path": "/",
732-
"text": "Go to Kibana",
732+
"text": "Go to Elastic",
733733
},
734734
"message": "\\\\*bold\\\\*",
735735
"subject": "*bold*",
@@ -738,7 +738,7 @@ describe('execute()', () => {
738738
`);
739739
});
740740

741-
test('provides a footer link to Kibana when publicBaseUrl is defined', async () => {
741+
test('provides a footer link to Elastic when publicBaseUrl is defined', async () => {
742742
const connectorTypeWithPublicUrl = getConnectorType({
743743
publicBaseUrl: 'https://localhost:1234/foo/bar',
744744
});
@@ -752,11 +752,11 @@ describe('execute()', () => {
752752
753753
--
754754
755-
This message was sent by Kibana. [Go to Kibana](https://localhost:1234/foo/bar)."
755+
This message was sent by Elastic. [Go to Elastic](https://localhost:1234/foo/bar)."
756756
`);
757757
});
758758

759-
test('allows to generate a deep link into Kibana when publicBaseUrl is defined', async () => {
759+
test('allows to generate a deep link into Elastic when publicBaseUrl is defined', async () => {
760760
const connectorTypeWithPublicUrl = getConnectorType({
761761
publicBaseUrl: 'https://localhost:1234/foo/bar',
762762
});
@@ -767,7 +767,7 @@ describe('execute()', () => {
767767
...params,
768768
kibanaFooterLink: {
769769
path: '/my/app',
770-
text: 'View this in Kibana',
770+
text: 'View this in Elastic',
771771
},
772772
},
773773
};
@@ -781,7 +781,7 @@ describe('execute()', () => {
781781
782782
--
783783
784-
This message was sent by Kibana. [View this in Kibana](https://localhost:1234/foo/bar/my/app)."
784+
This message was sent by Elastic. [View this in Elastic](https://localhost:1234/foo/bar/my/app)."
785785
`);
786786
});
787787

‎x-pack/plugins/stack_connectors/server/connector_types/stack/email/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const ParamsSchemaProps = {
160160
path: schema.string({ defaultValue: '/' }),
161161
text: schema.string({
162162
defaultValue: i18n.translate('xpack.stackConnectors.email.kibanaFooterLinkText', {
163-
defaultMessage: 'Go to Kibana',
163+
defaultMessage: 'Go to Elastic',
164164
}),
165165
}),
166166
}),
@@ -396,12 +396,12 @@ function getFooterMessage({
396396
}) {
397397
if (!publicBaseUrl) {
398398
return i18n.translate('xpack.stackConnectors.email.sentByKibanaMessage', {
399-
defaultMessage: 'This message was sent by Kibana.',
399+
defaultMessage: 'This message was sent by Elastic.',
400400
});
401401
}
402402

403403
return i18n.translate('xpack.stackConnectors.email.customViewInKibanaMessage', {
404-
defaultMessage: 'This message was sent by Kibana. [{kibanaFooterLinkText}]({link}).',
404+
defaultMessage: 'This message was sent by Elastic. [{kibanaFooterLinkText}]({link}).',
405405
values: {
406406
kibanaFooterLinkText: kibanaFooterLink.text,
407407
link: `${publicBaseUrl}${kibanaFooterLink.path === '/' ? '' : kibanaFooterLink.path}`,

‎x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/ms_exchage_server_simulation.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ export function initPlugin(router: IRouter, path: string) {
4343
cc: null,
4444
bcc: null,
4545
subject: 'email-subject',
46-
html: `<p>email-message</p>\n<p>--</p>\n<p>This message was sent by Kibana. <a href=\"https://localhost:5601\">Go to Kibana</a>.</p>\n`,
47-
text: 'email-message\n\n--\n\nThis message was sent by Kibana. [Go to Kibana](https://localhost:5601).',
46+
html: `<p>email-message</p>\n<p>--</p>\n<p>This message was sent by Elastic. <a href=\"https://localhost:5601\">Go to Elastic</a>.</p>\n`,
47+
text: 'email-message\n\n--\n\nThis message was sent by Elastic. [Go to Elastic](https://localhost:5601).',
4848
headers: {},
4949
},
5050
});

‎x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/stack/email.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ export default function emailTest({ getService }: FtrProviderContext) {
124124
cc: null,
125125
bcc: null,
126126
subject: 'email-subject',
127-
html: `<p>email-message</p>\n<p>--</p>\n<p>This message was sent by Kibana. <a href=\"https://localhost:5601\">Go to Kibana</a>.</p>\n`,
128-
text: 'email-message\n\n--\n\nThis message was sent by Kibana. [Go to Kibana](https://localhost:5601).',
127+
html: `<p>email-message</p>\n<p>--</p>\n<p>This message was sent by Elastic. <a href=\"https://localhost:5601\">Go to Elastic</a>.</p>\n`,
128+
text: 'email-message\n\n--\n\nThis message was sent by Elastic. [Go to Elastic](https://localhost:5601).',
129129
headers: {},
130130
},
131131
});
@@ -147,10 +147,10 @@ export default function emailTest({ getService }: FtrProviderContext) {
147147
.then((resp: any) => {
148148
const { text, html } = resp.body.data.message;
149149
expect(text).to.eql(
150-
'_italic_ **bold** https://elastic.co link\n\n--\n\nThis message was sent by Kibana. [Go to Kibana](https://localhost:5601).'
150+
'_italic_ **bold** https://elastic.co link\n\n--\n\nThis message was sent by Elastic. [Go to Elastic](https://localhost:5601).'
151151
);
152152
expect(html).to.eql(
153-
`<p><em>italic</em> <strong>bold</strong> <a href="https://elastic.co">https://elastic.co</a> link</p>\n<p>--</p>\n<p>This message was sent by Kibana. <a href=\"https://localhost:5601\">Go to Kibana</a>.</p>\n`
153+
`<p><em>italic</em> <strong>bold</strong> <a href="https://elastic.co">https://elastic.co</a> link</p>\n<p>--</p>\n<p>This message was sent by Elastic. <a href=\"https://localhost:5601\">Go to Elastic</a>.</p>\n`
154154
);
155155
});
156156
});
@@ -166,18 +166,18 @@ export default function emailTest({ getService }: FtrProviderContext) {
166166
message: 'message',
167167
kibanaFooterLink: {
168168
path: '/my/path',
169-
text: 'View my path in Kibana',
169+
text: 'View my path in Elastic',
170170
},
171171
},
172172
})
173173
.expect(200)
174174
.then((resp: any) => {
175175
const { text, html } = resp.body.data.message;
176176
expect(text).to.eql(
177-
'message\n\n--\n\nThis message was sent by Kibana. [View my path in Kibana](https://localhost:5601/my/path).'
177+
'message\n\n--\n\nThis message was sent by Elastic. [View my path in Elastic](https://localhost:5601/my/path).'
178178
);
179179
expect(html).to.eql(
180-
`<p>message</p>\n<p>--</p>\n<p>This message was sent by Kibana. <a href=\"https://localhost:5601/my/path\">View my path in Kibana</a>.</p>\n`
180+
`<p>message</p>\n<p>--</p>\n<p>This message was sent by Elastic. <a href=\"https://localhost:5601/my/path\">View my path in Elastic</a>.</p>\n`
181181
);
182182
});
183183
});
@@ -325,8 +325,8 @@ export default function emailTest({ getService }: FtrProviderContext) {
325325
cc: null,
326326
bcc: null,
327327
subject: 'email-subject',
328-
html: `<p>email-message</p>\n<p>--</p>\n<p>This message was sent by Kibana. <a href=\"https://localhost:5601\">Go to Kibana</a>.</p>\n`,
329-
text: 'email-message\n\n--\n\nThis message was sent by Kibana. [Go to Kibana](https://localhost:5601).',
328+
html: `<p>email-message</p>\n<p>--</p>\n<p>This message was sent by Elastic. <a href=\"https://localhost:5601\">Go to Elastic</a>.</p>\n`,
329+
text: 'email-message\n\n--\n\nThis message was sent by Elastic. [Go to Elastic](https://localhost:5601).',
330330
headers: {},
331331
},
332332
});

0 commit comments

Comments
 (0)