Skip to content

Commit

Permalink
[8.x] [Cloud Security] Removing Unused Options For CNVM (elastic#201461
Browse files Browse the repository at this point in the history
…) (elastic#202200)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Cloud Security] Removing Unused Options For CNVM
(elastic#201461)](elastic#201461)

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

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

<!--BACKPORT [{"author":{"name":"Rickyanto
Ang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-28T15:53:37Z","message":"[Cloud
Security] Removing Unused Options For CNVM (elastic#201461)\n\n##
Summary\r\nThis PR is to Remove Unused options for CNVM + Edit the page
now that\r\nthere are no more options to choose from\r\n<img
width=\"825\" alt=\"Screenshot 2024-11-27 at 1 03
06 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/712ce0bd-c0f8-47ae-b4a2-ee6fe2a047a2\">\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>","sha":"91643e9491a51fce4557bf1b5876452527259ecf","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Cloud
Security","backport:prev-minor","v8.18.0"],"title":"[Cloud Security]
Removing Unused Options For
CNVM","number":201461,"url":"https://github.com/elastic/kibana/pull/201461","mergeCommit":{"message":"[Cloud
Security] Removing Unused Options For CNVM (elastic#201461)\n\n##
Summary\r\nThis PR is to Remove Unused options for CNVM + Edit the page
now that\r\nthere are no more options to choose from\r\n<img
width=\"825\" alt=\"Screenshot 2024-11-27 at 1 03
06 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/712ce0bd-c0f8-47ae-b4a2-ee6fe2a047a2\">\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>","sha":"91643e9491a51fce4557bf1b5876452527259ecf"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/201461","number":201461,"mergeCommit":{"message":"[Cloud
Security] Removing Unused Options For CNVM (elastic#201461)\n\n##
Summary\r\nThis PR is to Remove Unused options for CNVM + Edit the page
now that\r\nthere are no more options to choose from\r\n<img
width=\"825\" alt=\"Screenshot 2024-11-27 at 1 03
06 PM\"\r\nsrc=\"https://github.com/user-attachments/assets/712ce0bd-c0f8-47ae-b4a2-ee6fe2a047a2\">\r\n\r\n---------\r\n\r\nCo-authored-by:
Elastic Machine
<[email protected]>","sha":"91643e9491a51fce4557bf1b5876452527259ecf"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Rickyanto Ang <[email protected]>
  • Loading branch information
kibanamachine and animehart authored Nov 28, 2024
1 parent f7f52a5 commit 76ce9e5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 51 deletions.
26 changes: 0 additions & 26 deletions x-pack/plugins/cloud_security_posture/public/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import {
CLOUDBEAT_AZURE,
CLOUDBEAT_VULN_MGMT_AWS,
VULN_MGMT_POLICY_TEMPLATE,
CLOUDBEAT_VULN_MGMT_GCP,
CLOUDBEAT_VULN_MGMT_AZURE,
CLOUDBEAT_AKS,
CLOUDBEAT_GKE,
} from '../../common/constants';
Expand Down Expand Up @@ -158,30 +156,6 @@ export const cloudPostureIntegrations: CloudPostureIntegrations = {
icon: 'logoAWS',
benchmark: 'N/A', // TODO: change benchmark to be optional
},
{
type: CLOUDBEAT_VULN_MGMT_GCP,
name: i18n.translate('xpack.csp.vulnMgmtIntegration.gcpOption.nameTitle', {
defaultMessage: 'GCP',
}),
disabled: true,
icon: googleCloudLogo,
tooltip: i18n.translate('xpack.csp.vulnMgmtIntegration.gcpOption.tooltipContent', {
defaultMessage: 'Coming soon',
}),
benchmark: 'N/A', // TODO: change benchmark to be optional
},
{
type: CLOUDBEAT_VULN_MGMT_AZURE,
name: i18n.translate('xpack.csp.vulnMgmtIntegration.azureOption.nameTitle', {
defaultMessage: 'Azure',
}),
disabled: true,
icon: 'logoAzure',
tooltip: i18n.translate('xpack.csp.vulnMgmtIntegration.azureOption.tooltipContent', {
defaultMessage: 'Coming soon',
}),
benchmark: 'N/A', // TODO: change benchmark to be optional
},
],
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -915,12 +915,16 @@ export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensio
<PolicyTemplateInfo postureType={input.policy_template} />
<EuiSpacer size="l" />
{/* Defines the single enabled input of the active policy template */}
<PolicyTemplateInputSelector
input={input}
setInput={setEnabledPolicyInput}
disabled={isEditPage}
/>
<EuiSpacer size="l" />
{input.type === 'cloudbeat/vuln_mgmt_aws' ? null : (
<>
<PolicyTemplateInputSelector
input={input}
setInput={setEnabledPolicyInput}
disabled={isEditPage}
/>
<EuiSpacer size="l" />
</>
)}

{/* AWS account type selection box */}
{input.type === 'cloudbeat/cis_aws' && (
Expand Down Expand Up @@ -954,8 +958,11 @@ export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensio
/>
)}

{/* Defines the name/description */}
<EuiSpacer size="l" />
{input.type === 'cloudbeat/vuln_mgmt_aws' ? null : (
<>
<EuiSpacer size="l" />
</>
)}
<IntegrationSettings
fields={integrationFields}
onChange={(field, value) => updatePolicy({ ...newPolicy, [field]: value })}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,16 @@ export const PolicyTemplateInfo = ({ postureType }: PolicyTemplateInfoProps) =>
</EuiCallOut>
<EuiSpacer size="m" />
<FormattedMessage
id="xpack.csp.fleetIntegration.cnvm.configureIntegrationDescription"
defaultMessage="Select the cloud service provider (CSP) you want to monitor and then fill in the name and description to help identify this integration"
id="xpack.csp.fleetIntegration.cnvm.awsSupportText"
defaultMessage="We currently support <b>AWS(Amazon Web Services)</b> cloud provider"
values={{
b: (chunks) => <b>{chunks}</b>,
}}
/>
<EuiSpacer size="s" />
<FormattedMessage
id="xpack.csp.fleetIntegration.cnvm.chooseNameAndDescriptionText"
defaultMessage="Choose a name and description to help identify this integration"
/>
</>
)}
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -15053,7 +15053,6 @@
"xpack.csp.fleetIntegration.azureAccountTypeDescriptionLabel": "Choisissez d'intégrer une organisation Azure (groupe racine du locataire) ou un seul abonnement Azure, puis saisissez un nom et une description pour permettre l'identification de cette intégration.",
"xpack.csp.fleetIntegration.cnvm.additionalChargesCalloutDescription": "Veuillez noter que l'utilisation de ce service peut entraîner des frais supplémentaires sur le prochain relevé de facturation provenant de votre fournisseur cloud en raison d'une augmentation de l'utilisation.",
"xpack.csp.fleetIntegration.cnvm.additionalChargesCalloutTitle": "Frais supplémentaires sur le compte de facturation du fournisseur cloud.",
"xpack.csp.fleetIntegration.cnvm.configureIntegrationDescription": "Sélectionner le fournisseur de services cloud (CSP) que vous souhaitez monitorer, puis remplir le nom et la description pour faciliter l'identification de cette intégration",
"xpack.csp.fleetIntegration.configureCspmIntegrationDescription": "Sélectionner le fournisseur de services cloud (CSP) que vous souhaitez monitorer, puis remplir le nom et la description pour faciliter l'identification de cette intégration",
"xpack.csp.fleetIntegration.configureKspmIntegrationDescription": "Sélectionner le type de cluster Kubernetes que vous souhaitez monitorer, puis remplir le nom et la description pour faciliter l'identification de cette intégration",
"xpack.csp.fleetIntegration.editWarning.calloutDescription": "Afin de changer le fournisseur de services cloud (CSP) que vous souhaitez monitorer, d'ajouter des comptes ou de modifier l'emplacement de déploiement (organisation ou compte unique) de la gestion du niveau de sécurité du cloud (CSPM), veuillez ajouter une nouvelle intégration CSPM.",
Expand Down Expand Up @@ -15258,10 +15257,6 @@
"xpack.csp.vulnerabilties.intergationNoInstalledEmptyPrompt.promptDescription": "Détectez et corrigez les vulnérabilités potentielles {lineBreak} de vos ressources cloud, grâce à l'intégration de notre solution Gestion des vulnérabilités {lineBreak} cloud-native (CNVM). {lineBreak} {learnMore}",
"xpack.csp.vulnerabilties.intergationNoInstalledEmptyPrompt.promptTitle": "Gestion des vulnérabilités {lineBreak} cloud-native d'Elastic",
"xpack.csp.vulnMgmtIntegration.awsOption.nameTitle": "Amazon Web Services",
"xpack.csp.vulnMgmtIntegration.azureOption.nameTitle": "Azure",
"xpack.csp.vulnMgmtIntegration.azureOption.tooltipContent": "Bientôt disponible",
"xpack.csp.vulnMgmtIntegration.gcpOption.nameTitle": "GCP",
"xpack.csp.vulnMgmtIntegration.gcpOption.tooltipContent": "Bientôt disponible",
"xpack.customBranding.appName": "Marque personnalisée",
"xpack.customBranding.customizedLogoDescription": "Remplace le texte en regard du logo. Les images sont plus belles lorsqu'elles ne dépassent pas 200 x 84 pixels et qu'elles ont un arrière-plan transparent. {subscriptionLink}",
"xpack.customBranding.customizedLogoLabel": "Nom de l'organisation",
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -15033,7 +15033,6 @@
"xpack.csp.fleetIntegration.azureAccountTypeDescriptionLabel": "Azure組織(テナントルートグループ)または単一のAzureサブスクリプションのオンボーディングのいずれかを選択し、この統合を識別するのに役立つ名前と説明を記入します。",
"xpack.csp.fleetIntegration.cnvm.additionalChargesCalloutDescription": "このサービスを使用すると、使用量が増えるため、次回のクラウドプロバイダー請求明細書に料金が追加される場合があります。",
"xpack.csp.fleetIntegration.cnvm.additionalChargesCalloutTitle": "クラウドプロバイダー請求アカウントへの追加料金。",
"xpack.csp.fleetIntegration.cnvm.configureIntegrationDescription": "監視するクラウドサービスプロバイダー(CSP)を選択し、この統合を識別するのに役立つ名前と説明を記入します",
"xpack.csp.fleetIntegration.configureCspmIntegrationDescription": "監視するクラウドサービスプロバイダー(CSP)を選択し、この統合を識別するのに役立つ名前と説明を記入します",
"xpack.csp.fleetIntegration.configureKspmIntegrationDescription": "監視するKubernetesクラスタータイプを選択し、この統合を識別するのに役立つ名前と説明を記入します",
"xpack.csp.fleetIntegration.editWarning.calloutDescription": "監視するクラウドサービスプロバイダー(CSP)の変更、アカウントの追加、CSPMのデプロイ先(組織か単一のアカウントか)の変更には、新しいCSPM統合を追加してください。",
Expand Down Expand Up @@ -15237,10 +15236,6 @@
"xpack.csp.vulnerabilties.intergationNoInstalledEmptyPrompt.promptDescription": "Elasticのクラウドネイティブ{lineBreak}脆弱性管理(CNVM)統合により、お客様のクラウド資産における脆弱性の可能性を{lineBreak}検出し、修復します。{lineBreak} {learnMore}",
"xpack.csp.vulnerabilties.intergationNoInstalledEmptyPrompt.promptTitle": "Elasticのクラウドネイティブ{lineBreak}脆弱性管理",
"xpack.csp.vulnMgmtIntegration.awsOption.nameTitle": "Amazon Web Services",
"xpack.csp.vulnMgmtIntegration.azureOption.nameTitle": "Azure",
"xpack.csp.vulnMgmtIntegration.azureOption.tooltipContent": "まもなくリリース",
"xpack.csp.vulnMgmtIntegration.gcpOption.nameTitle": "GCP",
"xpack.csp.vulnMgmtIntegration.gcpOption.tooltipContent": "まもなくリリース",
"xpack.customBranding.appName": "カスタムブランディング",
"xpack.customBranding.customizedLogoDescription": "ロゴの横のテキストを置換します。画像が200 x 84ピクセル以下で、背景が透明のときに、画像が最適に表示されます。{subscriptionLink}",
"xpack.customBranding.customizedLogoLabel": "組織名",
Expand Down
5 changes: 0 additions & 5 deletions x-pack/plugins/translations/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -15069,7 +15069,6 @@
"xpack.csp.fleetIntegration.azureAccountTypeDescriptionLabel": "选择载入 Azure 组织(租户根组)或单个 Azure 订阅,然后填写名称和描述以帮助标识此集成。",
"xpack.csp.fleetIntegration.cnvm.additionalChargesCalloutDescription": "请注意,由于使用量增加,使用此服务可能导致在您的下一份云服务提供商计费结算单上出现其他收费。",
"xpack.csp.fleetIntegration.cnvm.additionalChargesCalloutTitle": "云服务提供商计费帐户上的其他收费。",
"xpack.csp.fleetIntegration.cnvm.configureIntegrationDescription": "选择您要监测的云服务提供商 (CSP),然后填写名称和描述以帮助标识此集成",
"xpack.csp.fleetIntegration.configureCspmIntegrationDescription": "选择您要监测的云服务提供商 (CSP),然后填写名称和描述以帮助标识此集成",
"xpack.csp.fleetIntegration.configureKspmIntegrationDescription": "选择您要监测的 Kubernetes 集群类型,然后填写名称和描述以帮助标识此集成",
"xpack.csp.fleetIntegration.editWarning.calloutDescription": "为了更改您要监测的云服务提供商 (CSP),添加更多帐户或更改 CSPM 的部署位置(组织与单个帐户),请添加新的 CSPM 集成。",
Expand Down Expand Up @@ -15274,10 +15273,6 @@
"xpack.csp.vulnerabilties.intergationNoInstalledEmptyPrompt.promptDescription": "使用我们的{lineBreak}云原生漏洞管理 (CNVM) 集成,{lineBreak}检测并缓解您的云资产中的潜在漏洞。{lineBreak} {learnMore}",
"xpack.csp.vulnerabilties.intergationNoInstalledEmptyPrompt.promptTitle": "Elastic 的云原生{lineBreak}漏洞管理",
"xpack.csp.vulnMgmtIntegration.awsOption.nameTitle": "Amazon Web Services",
"xpack.csp.vulnMgmtIntegration.azureOption.nameTitle": "Azure",
"xpack.csp.vulnMgmtIntegration.azureOption.tooltipContent": "即将推出",
"xpack.csp.vulnMgmtIntegration.gcpOption.nameTitle": "GCP",
"xpack.csp.vulnMgmtIntegration.gcpOption.tooltipContent": "即将推出",
"xpack.customBranding.appName": "定制品牌",
"xpack.customBranding.customizedLogoDescription": "替换徽标旁的文本。图像不大于 200 x 84 像素并采用透明背景时,图像的显示效果最佳。{subscriptionLink}",
"xpack.customBranding.customizedLogoLabel": "组织名称",
Expand Down

0 comments on commit 76ce9e5

Please sign in to comment.