Remove discover implement embeddable dashboard on aws module

plugins/main/common/constants.ts

@@ -227,6 +227,7 @@ export const DATA_SOURCE_FILTER_CONTROLLED_PINNED_AGENT = 'pinned-agent';
 export const DATA_SOURCE_FILTER_CONTROLLED_CLUSTER_MANAGER = 'cluster-manager';
 export const DATA_SOURCE_FILTER_CONTROLLED_VULNERABILITIES_RULE_GROUP =
   'vulnerabilities-rule-group';
+export const DATA_SOURCE_FILTER_CONTROLLED_AWS_RULE_GROUP = 'aws-rule-group';
 export const DATA_SOURCE_FILTER_CONTROLLED_VIRUSTOTAL_RULE_GROUP =
   'virustotal-rule-group';
 

plugins/main/public/components/common/data-source/hooks/use-data-source.ts

@@ -1,138 +1,152 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState } from 'react';
 import {
-    IDataSourceFactoryConstructor,
-    tDataSource,
-    tDataSourceRepository,
-    tFilter, 
-    tSearchParams, 
-    PatternDataSourceSelector,
-    PatternDataSourceFactory,
-    PatternDataSource,
-    tParsedIndexPattern,
-    PatternDataSourceFilterManager,
-    tFilterManager
+  IDataSourceFactoryConstructor,
+  tDataSource,
+  tDataSourceRepository,
+  tFilter,
+  tSearchParams,
+  PatternDataSourceSelector,
+  PatternDataSourceFactory,
+  PatternDataSource,
+  tParsedIndexPattern,
+  PatternDataSourceFilterManager,
+  tFilterManager,
 } from '../index';
 
 type tUseDataSourceProps<T extends object, K extends PatternDataSource> = {
-    DataSource: IDataSourceFactoryConstructor<K>;
-    repository: tDataSourceRepository<T>;
-    factory?: PatternDataSourceFactory;
-    filterManager?: tFilterManager;
-    filters?: tFilter[];
-}
+  DataSource: IDataSourceFactoryConstructor<K>;
+  repository: tDataSourceRepository<T>;
+  factory?: PatternDataSourceFactory;
+  filterManager?: tFilterManager;
+  filters?: tFilter[];
+};
 
 type tUseDataSourceLoadedReturns<K> = {
-    isLoading: boolean;
-    dataSource: K;
-    filters: tFilter[];
-    fetchFilters: tFilter[];
-    fixedFilters: tFilter[];
-    fetchData: (params: Omit<tSearchParams, 'filters'>) => Promise<any>;
-    setFilters: (filters: tFilter[]) => void;
-    filterManager: PatternDataSourceFilterManager;
-}
+  isLoading: boolean;
+  dataSource: K;
+  filters: tFilter[];
+  fetchFilters: tFilter[];
+  fixedFilters: tFilter[];
+  fetchData: (params: Omit<tSearchParams, 'filters'>) => Promise<any>;
+  setFilters: (filters: tFilter[]) => void;
+  filterManager: PatternDataSourceFilterManager;
+};
 
 type tUseDataSourceNotLoadedReturns = {
-    isLoading: boolean;
-    dataSource: undefined;
-    filters: [];
-    fetchFilters: [];
-    fixedFilters: [];
-    fetchData: (params: Omit<tSearchParams, 'filters'>) => Promise<any>;
-    setFilters: (filters: tFilter[]) => void;
-    filterManager: null;
-}
+  isLoading: boolean;
+  dataSource: undefined;
+  filters: [];
+  fetchFilters: [];
+  fixedFilters: [];
+  fetchData: (params: Omit<tSearchParams, 'filters'>) => Promise<any>;
+  setFilters: (filters: tFilter[]) => void;
+  filterManager: null;
+};
 
-export function useDataSource<T extends tParsedIndexPattern, K extends PatternDataSource>(props: tUseDataSourceProps<T, K>): tUseDataSourceLoadedReturns<K> | tUseDataSourceNotLoadedReturns {
-    const { 
-        filters: defaultFilters = [],
-        DataSource: DataSourceConstructor,
-        repository,
-        factory: injectedFactory,
-     } = props;
+export function useDataSource<
+  T extends tParsedIndexPattern,
+  K extends PatternDataSource,
+>(
+  props: tUseDataSourceProps<T, K>,
+): tUseDataSourceLoadedReturns<K> | tUseDataSourceNotLoadedReturns {
+  const {
+    filters: defaultFilters = [],
+    DataSource: DataSourceConstructor,
+    repository,
+    factory: injectedFactory,
+  } = props;
 
-    if (!repository || !DataSourceConstructor) {
-        throw new Error('DataSource and repository are required');
-    }
+  if (!repository || !DataSourceConstructor) {
+    throw new Error('DataSource and repository are required');
+  }
 
-    const [dataSource, setDataSource] = useState<tDataSource>();
-    const [dataSourceFilterManager, setDataSourceFilterManager] = useState<PatternDataSourceFilterManager | null>(null);
-    const [isLoading, setIsLoading] = useState<boolean>(true);
-    const [fetchFilters, setFetchFilters] = useState<tFilter[]>([]);
-    const [allFilters, setAllFilters] = useState<tFilter[]>([]);
+  const [dataSource, setDataSource] = useState<tDataSource>();
+  const [dataSourceFilterManager, setDataSourceFilterManager] =
+    useState<PatternDataSourceFilterManager | null>(null);
+  const [isLoading, setIsLoading] = useState<boolean>(true);
+  const [fetchFilters, setFetchFilters] = useState<tFilter[]>([]);
+  const [allFilters, setAllFilters] = useState<tFilter[]>([]);
 
-    const setFilters = (filters: tFilter[]) => {
-        if (!dataSourceFilterManager) {
-            return;
-        }
-        dataSourceFilterManager?.setFilters(filters);
-        setAllFilters(dataSourceFilterManager?.getFilters() || []);
-        setFetchFilters(dataSourceFilterManager?.getFetchFilters() || []);
+  const setFilters = (filters: tFilter[]) => {
+    if (!dataSourceFilterManager) {
+      return;
     }
+    dataSourceFilterManager?.setFilters(filters);
+    setAllFilters(dataSourceFilterManager?.getFilters() || []);
+    setFetchFilters(dataSourceFilterManager?.getFetchFilters() || []);
+  };
 
-    const fetchData = async (params: Omit<tSearchParams, 'filters'>) => {
-        if (!dataSourceFilterManager) {
-            return
-        }
-        return await dataSourceFilterManager?.fetch(params);
+  const fetchData = async (params: Omit<tSearchParams, 'filters'>) => {
+    if (!dataSourceFilterManager) {
+      return;
     }
+    return await dataSourceFilterManager?.fetch(params);
+  };
 
-    useEffect(() => {
-        init();
-    }, [])
+  useEffect(() => {
+    let subscription;
+    (async () => {
+      setIsLoading(true);
+      const factory = injectedFactory || new PatternDataSourceFactory();
+      const patternsData = await repository.getAll();
+      const dataSources = await factory.createAll(
+        DataSourceConstructor,
+        patternsData,
+      );
+      const selector = new PatternDataSourceSelector(dataSources, repository);
+      const dataSource = await selector.getSelectedDataSource();
+      if (!dataSource) {
+        throw new Error('No valid data source found');
+      }
+      setDataSource(dataSource);
+      const dataSourceFilterManager = new PatternDataSourceFilterManager(
+        dataSource,
+        defaultFilters,
+      );
+      if (!dataSourceFilterManager) {
+        throw new Error('Error creating filter manager');
+      }
 
-    const init = async () => {
-        setIsLoading(true);
-        const factory = injectedFactory || new PatternDataSourceFactory();
-        const patternsData = await repository.getAll();
-        const dataSources = await factory.createAll(DataSourceConstructor, patternsData);
-        const selector = new PatternDataSourceSelector(dataSources, repository);
-        const dataSource = await selector.getSelectedDataSource();
-        if (!dataSource) {
-            throw new Error('No valid data source found');
-        }
-        setDataSource(dataSource);
-        const dataSourceFilterManager = new PatternDataSourceFilterManager(dataSource, defaultFilters);
-        if (!dataSourceFilterManager) {
-            throw new Error('Error creating filter manager');
-        }
+      // what the filters update
+      subscription = dataSourceFilterManager.getUpdates$().subscribe({
+        next: () => {
+          // this is necessary to remove the hidden filters from the filter manager and not show them in the search bar
+          dataSourceFilterManager.setFilters(
+            dataSourceFilterManager.getFilters(),
+          );
+          setAllFilters(dataSourceFilterManager.getFilters());
+          setFetchFilters(dataSourceFilterManager.getFetchFilters());
+        },
+      });
+      setAllFilters(dataSourceFilterManager.getFilters());
+      setFetchFilters(dataSourceFilterManager.getFetchFilters());
+      setDataSourceFilterManager(dataSourceFilterManager);
+      setIsLoading(false);
+    })();
+    return () => subscription.unsubscribe();
+  }, []);
 
-        // what the filters update
-        dataSourceFilterManager.getUpdates$().subscribe({
-            next: () => {
-                // this is necessary to remove the hidden filters from the filter manager and not show them in the search bar
-                dataSourceFilterManager.setFilters(dataSourceFilterManager.getFilters());
-                setAllFilters(dataSourceFilterManager.getFilters());
-                setFetchFilters(dataSourceFilterManager.getFetchFilters());
-            },
-        });
-        setAllFilters(dataSourceFilterManager.getFilters());
-        setFetchFilters(dataSourceFilterManager.getFetchFilters());
-        setDataSourceFilterManager(dataSourceFilterManager);
-        setIsLoading(false);
-    }
-
-    if (isLoading) {
-        return {
-            isLoading: true,
-            dataSource: undefined,
-            filters: [],
-            fetchFilters: [],
-            fixedFilters: [],
-            fetchData,
-            setFilters,
-            filterManager: null
-        }
-    }else{
-        return {
-            isLoading: false,
-            dataSource: dataSource as K,
-            filters: allFilters,
-            fetchFilters,
-            fixedFilters: dataSourceFilterManager?.getFixedFilters() || [],
-            fetchData,
-            setFilters,
-            filterManager: dataSourceFilterManager as PatternDataSourceFilterManager
-        }
-    }
-}
+  if (isLoading) {
+    return {
+      isLoading: true,
+      dataSource: undefined,
+      filters: [],
+      fetchFilters: [],
+      fixedFilters: [],
+      fetchData,
+      setFilters,
+      filterManager: null,
+    };
+  } else {
+    return {
+      isLoading: false,
+      dataSource: dataSource as K,
+      filters: allFilters,
+      fetchFilters,
+      fixedFilters: dataSourceFilterManager?.getFixedFilters() || [],
+      fetchData,
+      setFilters,
+      filterManager: dataSourceFilterManager as PatternDataSourceFilterManager,
+    };
+  }
+}

plugins/main/public/components/common/data-source/pattern/alerts/alerts-aws/alerts-aws-data-source.ts

@@ -0,0 +1,24 @@
+import { tFilter } from '../../../index';
+import { DATA_SOURCE_FILTER_CONTROLLED_AWS_RULE_GROUP } from '../../../../../../../common/constants';
+import { AlertsDataSource } from '../alerts-data-source';
+
+const AWS_GROUP_KEY = 'rule.groups';
+const AWS_GROUP_VALUE = 'amazon';
+
+export class AlertsAWSDataSource extends AlertsDataSource {
+  constructor(id: string, title: string) {
+    super(id, title);
+  }
+
+  getRuleGroupsFilter() {
+    return super.getRuleGroupsFilter(
+      AWS_GROUP_KEY,
+      AWS_GROUP_VALUE,
+      DATA_SOURCE_FILTER_CONTROLLED_AWS_RULE_GROUP,
+    );
+  }
+
+  getFixedFilters(): tFilter[] {
+    return [...this.getRuleGroupsFilter(), ...super.getFixedFilters()];
+  }
+}

plugins/main/public/components/common/data-source/pattern/alerts/alerts-aws/index.ts

@@ -0,0 +1 @@
+export * from './alerts-aws-data-source';

plugins/main/public/components/common/data-source/pattern/alerts/index.ts

@@ -1,4 +1,5 @@
 export * from './alerts-vulnerabilities';
 export * from './alerts-data-source-repository';
 export * from './alerts-data-source';
+export * from './alerts-aws';
 export * from './alerts-virustotal';

plugins/main/public/components/common/modules/modules-defaults.tsx

@@ -11,6 +11,7 @@
  */
 import { Dashboard } from './dashboard';
 import { MainSca } from '../../agents/sca';
+import { DashboardAWS } from '../../overview/amazon-web-services/dashboards';
 import { MainMitre } from './main-mitre';
 import { MainFim } from '../../agents/fim';
 import { ModuleMitreAttackIntelligence } from '../../overview/mitre_attack_intelligence';
@@ -50,6 +51,7 @@ import {
   AlertsDataSource,
   AlertsVulnerabilitiesDataSource,
   AlertsVirustotalDataSource,
+  AlertsAWSDataSource,
 } from '../data-source';
 
 const ALERTS_INDEX_PATTERN = 'wazuh-alerts-*';
@@ -117,8 +119,16 @@ export const ModulesDefaults = {
   aws: {
     init: 'dashboard',
     tabs: [
-      DashboardTab,
-      renderDiscoverTab(DEFAULT_INDEX_PATTERN, amazonWebServicesColumns),
+      {
+        id: 'dashboard',
+        name: 'Dashboard',
+        buttons: [ButtonModuleExploreAgent, ButtonModuleGenerateReport],
+        component: DashboardAWS,
+      },
+      renderDiscoverTab({
+        tableColumns: amazonWebServicesColumns,
+        DataSource: AlertsAWSDataSource,
+      }),
     ],
     availableFor: ['manager', 'agent'],
   },