Skip to content

Commit

Permalink
[8.11] [EDR Workflows] Protection updates copy change (elastic#171318) (
Browse files Browse the repository at this point in the history
elastic#171499)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[EDR Workflows] Protection updates copy change
(elastic#171318)](elastic#171318)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Konrad
Szwarc","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-11-15T19:07:44Z","message":"[EDR
Workflows] Protection updates copy change (elastic#171318)\n\nChanged copy as
per request.\r\n\r\nCloses
https://github.com/elastic/security-team/issues/7968\r\n\r\n![Screenshot
2023-11-15 at 16
42\r\n34](https://github.com/elastic/kibana/assets/29123534/e2c20349-07c5-4785-848e-30201cb8b616)","sha":"65ebb69a9fffffd62689ef4536b939b3726e927e","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:Defend
Workflows","v8.12.0","v8.11.2"],"number":171318,"url":"https://github.com/elastic/kibana/pull/171318","mergeCommit":{"message":"[EDR
Workflows] Protection updates copy change (elastic#171318)\n\nChanged copy as
per request.\r\n\r\nCloses
https://github.com/elastic/security-team/issues/7968\r\n\r\n![Screenshot
2023-11-15 at 16
42\r\n34](https://github.com/elastic/kibana/assets/29123534/e2c20349-07c5-4785-848e-30201cb8b616)","sha":"65ebb69a9fffffd62689ef4536b939b3726e927e"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/171318","number":171318,"mergeCommit":{"message":"[EDR
Workflows] Protection updates copy change (elastic#171318)\n\nChanged copy as
per request.\r\n\r\nCloses
https://github.com/elastic/security-team/issues/7968\r\n\r\n![Screenshot
2023-11-15 at 16
42\r\n34](https://github.com/elastic/kibana/assets/29123534/e2c20349-07c5-4785-848e-30201cb8b616)","sha":"65ebb69a9fffffd62689ef4536b939b3726e927e"}},{"branch":"8.11","label":"v8.11.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/171347","number":171347,"state":"OPEN"}]}]
BACKPORT-->

---------

Co-authored-by: Kibana Machine <[email protected]>
  • Loading branch information
szwarckonrad and kibanamachine authored Nov 20, 2023
1 parent f982ca8 commit 0e2d46d
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import { enableAllPolicyProtections } from '../../../tasks/endpoint_policy';
import { createEndpointHost } from '../../../tasks/create_endpoint_host';
import { deleteAllLoadedEndpointData } from '../../../tasks/delete_all_endpoint_data';

describe('Response console', { tags: ['@ess', '@serverless'] }, () => {
// 8.11 backport skip due to the timeout of the suite. Test itself is not flaky.
describe.skip('Response console', { tags: ['@ess', '@serverless'] }, () => {
beforeEach(() => {
login();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,22 @@ export const ProtectionUpdatesLayout = React.memo<ProtectionUpdatesLayoutProps>(
}
)}
>
{i18n.translate(
'xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabled',
{
defaultMessage:
'Manifest will always be updated to the latest available version. If you want to control updates manually, disable "Update manifest automatically".',
}
)}
<FormattedMessage
id="xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabled"
defaultMessage="Protection updates will always be updated to the latest available version. If you want to control updates manually, disable the {toggleName} toggle."
values={{
toggleName: (
<strong>
{i18n.translate(
'xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabled.toggleName',
{
defaultMessage: 'Enable automatic updates',
}
)}
</strong>
),
}}
/>
</EuiCallOut>
);
}
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -35421,7 +35421,6 @@
"xpack.securitySolution.endpoint.policyNotFound": "Politique introuvable !",
"xpack.securitySolution.endpoint.policyResponse.backLinkTitle": "Détails de point de terminaison",
"xpack.securitySolution.endpoint.policyResponse.title": "Réponse de politique",
"xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabled": "Le manifeste est toujours mis à jour vers la dernière version disponible. Si vous voulez contrôler manuellement les mises à jour, désactivez \"Mettre à jour le manifeste automatiquement\".",
"xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabledTitle": "Mises à jour automatiques activées",
"xpack.securitySolution.endpoint.protectionUpdates.cancel": "Annuler",
"xpack.securitySolution.endpoint.protectionUpdates.deployedVersion.label": "Version actuellement déployée",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -35419,7 +35419,6 @@
"xpack.securitySolution.endpoint.policyNotFound": "ポリシーが見つかりません。",
"xpack.securitySolution.endpoint.policyResponse.backLinkTitle": "エンドポイント詳細",
"xpack.securitySolution.endpoint.policyResponse.title": "ポリシー応答",
"xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabled": "マニフェストは利用可能な最新バージョンに常に更新されます。更新を手動で管理する場合は、\"マニフェストを自動的に更新\"を無効にします。",
"xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabledTitle": "自動更新が有効です",
"xpack.securitySolution.endpoint.protectionUpdates.cancel": "キャンセル",
"xpack.securitySolution.endpoint.protectionUpdates.deployedVersion.label": "現在デプロイされているバージョン",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -35415,7 +35415,6 @@
"xpack.securitySolution.endpoint.policyNotFound": "未找到策略!",
"xpack.securitySolution.endpoint.policyResponse.backLinkTitle": "终端详情",
"xpack.securitySolution.endpoint.policyResponse.title": "策略响应",
"xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabled": "会始终将清单更新到可用的最新版本。如果不想手动控制更新,请禁用“自动更新清单”。",
"xpack.securitySolution.endpoint.protectionUpdates.automaticUpdates.enabledTitle": "已启用自动更新",
"xpack.securitySolution.endpoint.protectionUpdates.cancel": "取消",
"xpack.securitySolution.endpoint.protectionUpdates.deployedVersion.label": "当前部署的版本",
Expand Down

0 comments on commit 0e2d46d

Please sign in to comment.