Skip to content

Commit

Permalink
[8.x] [Ingest Pipelines] Update copy in Manage processors (#196923) (#…
Browse files Browse the repository at this point in the history
…197187)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Ingest Pipelines] Update copy in Manage processors
(#196923)](#196923)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Elena
Stoeva","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-22T09:14:42Z","message":"[Ingest
Pipelines] Update copy in Manage processors (#196923)\n\n##
Summary\r\n\r\nThis PR adds some copy changes to the Manage processors
pages.\r\n\r\n1. Empty prompt\r\n- Width and padding of the prompt is
adjusted so that \"IP\" in the title\r\nstarts in the 2nd line\r\n-
Description is updated\r\n<img width=\"800\" alt=\"Screenshot 2024-10-18
at 17 00
53\"\r\nsrc=\"https://github.com/user-attachments/assets/51aa6cdc-5eb4-4c54-8960-7ee273d82ef5\">\r\n\r\n\r\n2.
Add database modal\r\n- Copy in callouts is updated\r\n- The help text
of the \"Type\" field is updated\r\n- The text in the \"Database already
exists\" error callout is updated\r\n<img width=\"1490\"
alt=\"Screenshot 2024-10-21 at 09 34
12\"\r\nsrc=\"https://github.com/user-attachments/assets/ab3c2e21-4457-435f-a4c3-874c6edcb2ce\">\r\n<img
width=\"1498\" alt=\"Screenshot 2024-10-18 at 17 24
43\"\r\nsrc=\"https://github.com/user-attachments/assets/a0c15f5d-9360-4ee7-806d-2b5b64b6fd2a\">\r\n\r\n\r\n3.
Manage processors page\r\n- The title of the page is changed from
\"GeoIP\" to \"IP Location\"\r\n<img width=\"800\" alt=\"Screenshot
2024-10-18 at 17 20
01\"\r\nsrc=\"https://github.com/user-attachments/assets/cde8b070-9664-42df-b71a-723a5356d4a2\">","sha":"996eb73811c665945f8c4425d1e8e89fa9688b40","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Kibana
Management","release_note:skip","v9.0.0","Feature:Ingest Node
Pipelines","backport:prev-minor"],"title":"[Ingest Pipelines] Update
copy in Manage
processors","number":196923,"url":"https://github.com/elastic/kibana/pull/196923","mergeCommit":{"message":"[Ingest
Pipelines] Update copy in Manage processors (#196923)\n\n##
Summary\r\n\r\nThis PR adds some copy changes to the Manage processors
pages.\r\n\r\n1. Empty prompt\r\n- Width and padding of the prompt is
adjusted so that \"IP\" in the title\r\nstarts in the 2nd line\r\n-
Description is updated\r\n<img width=\"800\" alt=\"Screenshot 2024-10-18
at 17 00
53\"\r\nsrc=\"https://github.com/user-attachments/assets/51aa6cdc-5eb4-4c54-8960-7ee273d82ef5\">\r\n\r\n\r\n2.
Add database modal\r\n- Copy in callouts is updated\r\n- The help text
of the \"Type\" field is updated\r\n- The text in the \"Database already
exists\" error callout is updated\r\n<img width=\"1490\"
alt=\"Screenshot 2024-10-21 at 09 34
12\"\r\nsrc=\"https://github.com/user-attachments/assets/ab3c2e21-4457-435f-a4c3-874c6edcb2ce\">\r\n<img
width=\"1498\" alt=\"Screenshot 2024-10-18 at 17 24
43\"\r\nsrc=\"https://github.com/user-attachments/assets/a0c15f5d-9360-4ee7-806d-2b5b64b6fd2a\">\r\n\r\n\r\n3.
Manage processors page\r\n- The title of the page is changed from
\"GeoIP\" to \"IP Location\"\r\n<img width=\"800\" alt=\"Screenshot
2024-10-18 at 17 20
01\"\r\nsrc=\"https://github.com/user-attachments/assets/cde8b070-9664-42df-b71a-723a5356d4a2\">","sha":"996eb73811c665945f8c4425d1e8e89fa9688b40"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196923","number":196923,"mergeCommit":{"message":"[Ingest
Pipelines] Update copy in Manage processors (#196923)\n\n##
Summary\r\n\r\nThis PR adds some copy changes to the Manage processors
pages.\r\n\r\n1. Empty prompt\r\n- Width and padding of the prompt is
adjusted so that \"IP\" in the title\r\nstarts in the 2nd line\r\n-
Description is updated\r\n<img width=\"800\" alt=\"Screenshot 2024-10-18
at 17 00
53\"\r\nsrc=\"https://github.com/user-attachments/assets/51aa6cdc-5eb4-4c54-8960-7ee273d82ef5\">\r\n\r\n\r\n2.
Add database modal\r\n- Copy in callouts is updated\r\n- The help text
of the \"Type\" field is updated\r\n- The text in the \"Database already
exists\" error callout is updated\r\n<img width=\"1490\"
alt=\"Screenshot 2024-10-21 at 09 34
12\"\r\nsrc=\"https://github.com/user-attachments/assets/ab3c2e21-4457-435f-a4c3-874c6edcb2ce\">\r\n<img
width=\"1498\" alt=\"Screenshot 2024-10-18 at 17 24
43\"\r\nsrc=\"https://github.com/user-attachments/assets/a0c15f5d-9360-4ee7-806d-2b5b64b6fd2a\">\r\n\r\n\r\n3.
Manage processors page\r\n- The title of the page is changed from
\"GeoIP\" to \"IP Location\"\r\n<img width=\"800\" alt=\"Screenshot
2024-10-18 at 17 20
01\"\r\nsrc=\"https://github.com/user-attachments/assets/cde8b070-9664-42df-b71a-723a5356d4a2\">","sha":"996eb73811c665945f8c4425d1e8e89fa9688b40"}}]}]
BACKPORT-->

Co-authored-by: Elena Stoeva <[email protected]>
  • Loading branch information
kibanamachine and ElenaStoeva authored Oct 22, 2024
1 parent 8247e8d commit 5ca7589
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export const AddDatabaseModal = ({
helpText={
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.addDatabaseForm.databaseTypeSelectHelpText"
defaultMessage="Select which provider you want to use"
defaultMessage="Select the provider you want to use."
/>
}
>
Expand All @@ -156,15 +156,15 @@ export const AddDatabaseModal = ({
title={
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.licenseCalloutTitle"
defaultMessage="Add your MaxMind license key to keystore"
defaultMessage="Add your MaxMind license token to the keystore"
/>
}
iconType="iInCircle"
>
<p>
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.licenseCalloutText"
defaultMessage="In order to grant access to your MaxMind account, you must add the license key to the keystore."
defaultMessage="The processor needs the license key to connect to the database."
/>
</p>
</EuiCallOut>
Expand All @@ -178,15 +178,15 @@ export const AddDatabaseModal = ({
title={
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.licenseCalloutTitle"
defaultMessage="Add your IP Info license token to keystore"
defaultMessage="Add your IP Info license token to the keystore"
/>
}
iconType="iInCircle"
>
<p>
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.licenseCalloutText"
defaultMessage="In order to grant access to your IP Info account, you must add the license token to the keystore."
defaultMessage="The processor needs the license key to connect to the database."
/>
</p>
</EuiCallOut>
Expand Down Expand Up @@ -246,7 +246,7 @@ export const AddDatabaseModal = ({
<p>
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.nameExistsErrorText"
defaultMessage="Database cannot be added multiple times."
defaultMessage="A database needs to be added only once in order to be available."
/>
</p>
</EuiCallOut>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import { EuiPageTemplate } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import React from 'react';
import { css } from '@emotion/react/dist/emotion-react.cjs';

export const EmptyList = ({ addDatabaseButton }: { addDatabaseButton: JSX.Element }) => {
return (
Expand All @@ -26,11 +27,15 @@ export const EmptyList = ({ addDatabaseButton }: { addDatabaseButton: JSX.Elemen
<p>
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.emptyPromptDescription"
defaultMessage="Use a custom database when setting up IP Location processor."
defaultMessage="Set up a connection to a custom database when setting up IP Location processor."
/>
</p>
}
actions={addDatabaseButton}
css={css`
width: 450px;
padding: 0 20px 0 20px;
`}
/>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export const GeoipList: React.FunctionComponent = () => {
<h2>
<FormattedMessage
id="xpack.ingestPipelines.manageProcessors.geoip.tableTitle"
defaultMessage="GeoIP"
defaultMessage="IP Location"
/>
</h2>
</EuiTitle>
Expand Down

0 comments on commit 5ca7589

Please sign in to comment.