Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Develop logic of a new index for the fim module (#6226)" #6601

Merged
merged 1 commit into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions plugins/main/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ export const VULNERABILITY_IMPLICIT_CLUSTER_MODE_FILTER = {
disabled: 'wazuh.manager.name',
};

// Wazuh fim
export const WAZUH_FIM_PATTERN = 'wazuh-states-fim';

// Job - Wazuh initialize
export const WAZUH_PLUGIN_PLATFORM_TEMPLATE_NAME = 'wazuh-kibana';

Expand Down Expand Up @@ -224,10 +221,12 @@ export enum WAZUH_MENU_SETTINGS_SECTIONS_ID {
}

export const AUTHORIZED_AGENTS = 'hidden-authorized-agents';
export const DATA_SOURCE_FILTER_CONTROLLED_EXCLUDE_SERVER = 'hidden-exclude-server';
export const DATA_SOURCE_FILTER_CONTROLLED_EXCLUDE_SERVER =
'hidden-exclude-server';
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_VULNERABILITIES_RULE_GROUP =
'vulnerabilities-rule-group';

// Wazuh links
export const WAZUH_LINK_GITHUB = 'https://github.com/wazuh';
Expand Down
29 changes: 11 additions & 18 deletions plugins/main/public/components/common/modules/modules-defaults.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import { Dashboard } from './dashboard';
import { MainSca } from '../../agents/sca';
import { MainMitre } from './main-mitre';
import { MainFim } from '../../agents/fim';
import { ModuleMitreAttackIntelligence } from '../../overview/mitre_attack_intelligence';
import { ComplianceTable } from '../../overview/compliance-table';
import ButtonModuleExploreAgent from '../../../controllers/overview/components/overview-actions/overview-actions';
Expand All @@ -20,11 +21,12 @@ import { OfficePanel } from '../../overview/office-panel';
import { GitHubPanel } from '../../overview/github-panel';
import { DashboardVuls, InventoryVuls } from '../../overview/vulnerabilities';
import { withModuleNotForAgent } from '../hocs';
import { WazuhDiscover, WazuhDiscoverProps } from '../wazuh-discover/wz-discover';
import {
WazuhDiscover,
WazuhDiscoverProps,
} from '../wazuh-discover/wz-discover';
import { threatHuntingColumns } from '../wazuh-discover/config/data-grid-columns';
import { vulnerabilitiesColumns } from '../../overview/vulnerabilities/events/vulnerabilities-columns';
import { DashboardFim } from '../../overview/fim/dashboard/dashboard';
import { InventoryFim } from '../../overview/fim/inventory/inventory';
import React from 'react';
import { dockerColumns } from '../../overview/docker/events/docker-columns';
import { googleCloudColumns } from '../../overview/google-cloud/events/google-cloud-columns';
Expand Down Expand Up @@ -60,9 +62,7 @@ const renderDiscoverTab = (props: WazuhDiscoverProps) => {
id: 'events',
name: 'Events',
buttons: [ButtonModuleExploreAgent],
component: () => (
<WazuhDiscover {...props} />
),
component: () => <WazuhDiscover {...props} />,
};
};

Expand All @@ -89,17 +89,12 @@ export const ModulesDefaults = {
fim: {
init: 'dashboard',
tabs: [
{
id: 'dashboard',
name: 'Dashboard',
buttons: [ButtonModuleExploreAgent],
component: DashboardFim,
},
DashboardTab,
{
id: 'inventory',
name: 'Inventory',
buttons: [ButtonModuleExploreAgent],
component: InventoryFim,
component: MainFim,
},
renderDiscoverTab(DEFAULT_INDEX_PATTERN, fileIntegrityMonitoringColumns),
],
Expand Down Expand Up @@ -168,9 +163,7 @@ export const ModulesDefaults = {
{
...renderDiscoverTab(DEFAULT_INDEX_PATTERN, office365Columns),
component: withModuleNotForAgent(() => (
<WazuhDiscover
tableColumns={office365Columns}
/>
<WazuhDiscover tableColumns={office365Columns} />
)),
},
],
Expand Down Expand Up @@ -223,8 +216,8 @@ export const ModulesDefaults = {
},
renderDiscoverTab({
tableColumns: vulnerabilitiesColumns,
DataSource: AlertsVulnerabilitiesDataSource
})
DataSource: AlertsVulnerabilitiesDataSource,
}),
],
buttons: ['settings'],
availableFor: ['manager', 'agent'],
Expand Down
108 changes: 0 additions & 108 deletions plugins/main/public/components/overview/fim/dashboard/dashboard.tsx

This file was deleted.

Loading