Merge branch 'main' into co-pilot-chunking

elastic · Jun 21, 2023 · 52b2f4a · 52b2f4a
2 parents d550608 + 8a5f001
commit 52b2f4a
Show file tree

Hide file tree

Showing 26 changed files with 573 additions and 281 deletions.
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -264,7 +264,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.upgrade_assistant.featureSet.mlSnapshots (boolean)',
         'xpack.upgrade_assistant.featureSet.reindexCorrectiveActions (boolean)',
         'xpack.upgrade_assistant.ui.enabled (boolean)',
-        'xpack.observability.coPilot.enabled (boolean)',
+        'xpack.observability.aiAssistant.enabled (boolean)',
         'xpack.observability.unsafe.alertDetails.metrics.enabled (boolean)',
         'xpack.observability.unsafe.alertDetails.logs.enabled (boolean)',
         'xpack.observability.unsafe.alertDetails.uptime.enabled (boolean)',

diff --git a/x-pack/plugins/cloud_security_posture/common/types.ts b/x-pack/plugins/cloud_security_posture/common/types.ts
@@ -131,13 +131,26 @@ export interface GetCspRuleTemplateResponse {
 
 // CNVM DASHBOARD
 
-export interface VulnScoreTrend {
+interface AccountVulnStats {
+  cloudAccountId: string;
+  cloudAccountName: string;
+  critical: number;
+  high: number;
+  medium: number;
+  low: number;
+}
+
+export interface VulnStatsTrend {
   '@timestamp': string;
   policy_template: 'vuln_mgmt';
   critical: number;
   high: number;
   medium: number;
   low: number;
+  vulnerabilities_stats_by_cloud_account?: Record<
+    AccountVulnStats['cloudAccountId'],
+    AccountVulnStats
+  >;
 }
 
 export interface CnvmStatistics {
@@ -150,7 +163,7 @@ export interface CnvmStatistics {
 
 export interface CnvmDashboardData {
   cnvmStatistics: CnvmStatistics;
-  vulnTrends: VulnScoreTrend[];
+  vulnTrends: VulnStatsTrend[];
   topVulnerableResources: VulnerableResourceStat[];
   topPatchableVulnerabilities: PatchableVulnerabilityStat[];
   topVulnerabilities: VulnerabilityStat[];

diff --git a/x-pack/plugins/cloud_security_posture/public/components/chart_panel.tsx b/x-pack/plugins/cloud_security_posture/public/components/chart_panel.tsx
@@ -74,7 +74,9 @@ export const ChartPanel: React.FC<ChartPanelProps> = ({
                 </EuiTitle>
               )}
             </EuiFlexItem>
-            <EuiFlexItem grow={false}>{rightSideItems}</EuiFlexItem>
+            <EuiFlexItem grow={false} style={{ flexDirection: 'row', gap: euiTheme.size.s }}>
+              {rightSideItems}
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem style={{ height: '100%' }}>{renderChart()}</EuiFlexItem>