From 17c7e335d9d54f4b203a97a27350c2b1aaec51d4 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 29 Oct 2024 00:01:18 +1100
Subject: [PATCH] [8.x] [Cloud Security] add posture type for CSPM dashboard
 accounts link (#197633) (#197971)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Cloud Security] add posture type for CSPM dashboard accounts link
(#197633)](https://github.com/elastic/kibana/pull/197633)

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

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

<!--BACKPORT [{"author":{"name":"Maxim
Kholod","email":"maxim.kholod@elastic.co"},"sourceCommit":{"committedDate":"2024-10-28T11:18:48Z","message":"[Cloud
Security] add posture type for CSPM dashboard accounts link
(#197633)\n\n## Summary\r\n\r\n- fixes
https://github.com/elastic/security-team/issues/10914","sha":"b6de3b713dd4cd3996b40bce53c7f0f31b2bcf1f","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Cloud
Security","backport:prev-minor","v8.16.0","backport:version","v8.17.0"],"title":"[Cloud
Security] add posture type for CSPM dashboard accounts
link","number":197633,"url":"https://github.com/elastic/kibana/pull/197633","mergeCommit":{"message":"[Cloud
Security] add posture type for CSPM dashboard accounts link
(#197633)\n\n## Summary\r\n\r\n- fixes
https://github.com/elastic/security-team/issues/10914","sha":"b6de3b713dd4cd3996b40bce53c7f0f31b2bcf1f"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197633","number":197633,"mergeCommit":{"message":"[Cloud
Security] add posture type for CSPM dashboard accounts link
(#197633)\n\n## Summary\r\n\r\n- fixes
https://github.com/elastic/security-team/issues/10914","sha":"b6de3b713dd4cd3996b40bce53c7f0f31b2bcf1f"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Maxim Kholod <maxim.kholod@elastic.co>
---
 .../public/components/accounts_evaluated_widget.test.tsx    | 1 +
 .../public/components/accounts_evaluated_widget.tsx         | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.test.tsx b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.test.tsx
index d81737fea1ec2..9f5f2ec85d021 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.test.tsx
@@ -45,6 +45,7 @@ describe('AccountsEvaluatedWidget', () => {
     expect(mockNavToFindings).toHaveBeenCalledWith(
       {
         'cloud.provider': 'aws',
+        'rule.benchmark.posture_type': 'cspm',
       },
       ['cloud.account.name']
     );
diff --git a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
index 1d4f26274690d..5ae8a47a93e71 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/accounts_evaluated_widget.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { EuiFlexGroup, EuiFlexItem, useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { useNavigateFindings } from '@kbn/cloud-security-posture/src/hooks/use_navigate_findings';
+import { CSPM_POLICY_TEMPLATE } from '@kbn/cloud-security-posture-common';
 import { CLOUD_PROVIDERS, getBenchmarkApplicableTo } from '../../common/utils/helpers';
 import { CIS_AWS, CIS_GCP, CIS_AZURE, CIS_K8S, CIS_EKS } from '../../common/constants';
 import { CISBenchmarkIcon } from './cis_benchmark_icon';
@@ -61,7 +62,10 @@ export const AccountsEvaluatedWidget = ({
   const navToFindings = useNavigateFindings();
 
   const navToFindingsByCloudProvider = (provider: string) => {
-    navToFindings({ 'cloud.provider': provider }, [FINDINGS_GROUPING_OPTIONS.CLOUD_ACCOUNT_NAME]);
+    navToFindings(
+      { 'cloud.provider': provider, 'rule.benchmark.posture_type': CSPM_POLICY_TEMPLATE },
+      [FINDINGS_GROUPING_OPTIONS.CLOUD_ACCOUNT_NAME]
+    );
   };
 
   const navToFindingsByCisBenchmark = (cisBenchmark: string) => {