Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
2d860bf
feat: update core filter system to always u
felipegonzalezmv Sep 3, 2025
0416ccd
feat: unify API endpoints to always use cluster mode
felipegonzalezmv Sep 3, 2025
aab10b8
feat: update UI components to always use cluster mode
felipegonzalezmv Sep 3, 2025
97caa20
refactor: format API request calls in validation functions
felipegonzalezmv Sep 3, 2025
5c88829
refactor: simplify cluster status checks in Wazuh API controller
felipegonzalezmv Sep 3, 2025
0fadf79
update: changelog
felipegonzalezmv Sep 3, 2025
dc78860
refactor: improve readability of logs.js by standardizing API request…
felipegonzalezmv Sep 3, 2025
e693ee6
feat: update remaining cluster conditional logic for cluster by default
felipegonzalezmv Sep 3, 2025
70cd67d
refactor: standardize API endpoint usage across configuration and logs
felipegonzalezmv Sep 4, 2025
d082365
refactor: streamline validation endpoint logic in wz-fetch.js
felipegonzalezmv Sep 4, 2025
bb88b2d
refactor: enhance cluster status handling and API request formatting
felipegonzalezmv Sep 4, 2025
1bade48
refactor: remove unused cluster-related logic and imports
felipegonzalezmv Sep 4, 2025
4174ba3
refactor: streamline cluster configuration handling and remove unused…
felipegonzalezmv Sep 4, 2025
6a49295
refactor: enhance logs.js for improved cluster node handling
felipegonzalezmv Sep 4, 2025
268fb6c
refactor: improve cluster node selection and error handling in config…
felipegonzalezmv Sep 5, 2025
f86818f
refactor: remove cluster status checks and streamline dashboard compo…
felipegonzalezmv Sep 5, 2025
de07bc2
refactor: simplify DashboardCT component and enhance error handling i…
felipegonzalezmv Sep 5, 2025
6ad055b
refactor: remove deprecated cluster status actions and update permiss…
felipegonzalezmv Sep 8, 2025
06802e2
refactor: update user permissions by removing redundant cluster actions
felipegonzalezmv Sep 8, 2025
80bca0c
refactor: improve code readability and structure in module configurat…
felipegonzalezmv Sep 9, 2025
2681365
docs: update changelog and fix formatting for cluster by default impl…
felipegonzalezmv Sep 9, 2025
5160dd8
refactor: remove redundant isCluster parameter from managerQuery method
felipegonzalezmv Sep 10, 2025
db1c603
refactor: simplify API endpoint logic in module configuration component
felipegonzalezmv Sep 10, 2025
916c5b6
Update plugins/main/public/components/endpoints-summary/register-agen…
felipegonzalezmv Sep 10, 2025
173e9ed
refactor: simplify getRemoteConfiguration calls in register-agent-ser…
felipegonzalezmv Sep 10, 2025
bb5ed3c
refactor: remove redundant 'Running' card from OverviewCards component
felipegonzalezmv Sep 10, 2025
d01fad7
refactor: remove unused 'status' prop from OverviewCards component
felipegonzalezmv Sep 10, 2025
2757797
refactor: remove unused dashboard panels from analysis engine
felipegonzalezmv Sep 10, 2025
48d5357
refactor: remove redundant 'cluster:read' permission entries from mod…
felipegonzalezmv Sep 10, 2025
37d488c
refactor: update 'cluster:read' permission resource for user authoriz…
felipegonzalezmv Sep 10, 2025
1ff205e
refactor: enhance cluster node selection handling in configuration ed…
felipegonzalezmv Sep 10, 2025
031e70e
refactor: streamline configuration overview component and permissions…
felipegonzalezmv Sep 10, 2025
f7eccbb
refactor: simplify URL construction in getCurrentConfig function
felipegonzalezmv Sep 10, 2025
5bbda84
refactor: simplify error handling and remove unused daemon checks
felipegonzalezmv Sep 10, 2025
fdef470
refactor: remove isClusterMode parameter from dashboard components
felipegonzalezmv Sep 10, 2025
e82b9c1
refactor: remove updateClusterEnabled action and related logic
felipegonzalezmv Sep 10, 2025
8bbc133
refactor: simplify URL construction in queryConfig function
felipegonzalezmv Sep 10, 2025
634f78a
refactor: update filter creation documentation for clarity
felipegonzalezmv Sep 10, 2025
0067605
refactor: streamline cluster node selection logic in configuration co…
felipegonzalezmv Sep 11, 2025
59f86d5
refactor: remove status from cluster info and streamline API connecti…
felipegonzalezmv Sep 11, 2025
c823d77
refactor: remove redundant comments regarding cluster mode in various…
felipegonzalezmv Sep 11, 2025
c5b3259
chore: set cluster mode as default and remove manager-related logic
felipegonzalezmv Sep 11, 2025
f3d1a0b
feat: implement daemons status check for cluster endpoints
felipegonzalezmv Sep 12, 2025
0e7f32f
Merge branch 'main' into enhancement/7688-cluster-mode-by-default
Machi3mfl Sep 12, 2025
0012b6e
refactor: update cluster test cases to reflect changes in cluster name
felipegonzalezmv Sep 12, 2025
4dca606
Merge branch 'enhancement/7688-cluster-mode-by-default' of github.com…
felipegonzalezmv Sep 12, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ All notable changes to the Wazuh app project will be documented in this file.

### Changed

- Set cluster mode as default for all Wazuh installations, including single-node deployments. Updated RBAC permissions to `cluster:*` actions [#7688](https://github.com/wazuh/wazuh-dashboard-plugins/issues/7688)
- Rework SCA modules visualizations, global detail for all agents without pinning, replaced `/sca` endpoint with `wazuh-states-sca-*` index pattern, added sample data section [#7578](https://github.com/wazuh/wazuh-dashboard-plugins/issues/7578)
- Split the FIM registry inventory into 2 index patterns and change some fields in the FIM files and registries sample data [#7604](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7604)

### Removed

- Removed logic related to manager in favor to cluster management [#7688](https://github.com/wazuh/wazuh-dashboard-plugins/issues/7688)
- Removed the monitoring and statistics jobs in the backend side [#7597](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7597)
- Removed the settings related to monitoring and statistics job from the configuration [#7597](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7597)
- Removed prompt related to statistic job is disabled in Statistics app [#7597](https://github.com/wazuh/wazuh-dashboard-plugins/pull/7597)
Expand Down
19 changes: 7 additions & 12 deletions docker/imposter/security/policies/get-policies-after-delete.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,10 @@
"name": "cluster_all_resourceless",
"policy": {
"actions": [
"cluster:status",
"manager:read",
"manager:read_api_config",
"manager:update_config",
"manager:restart"
"cluster:read",
"cluster:read_api_config",
"cluster:update_config",
"cluster:restart"
],
"resources": ["*:*:*"],
"effect": "allow"
Expand All @@ -329,11 +328,7 @@
"id": 31,
"name": "cluster_read_resourceless",
"policy": {
"actions": [
"cluster:status",
"manager:read",
"manager:read_api_config"
],
"actions": ["cluster:read", "cluster:read_api_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
Expand Down Expand Up @@ -387,7 +382,7 @@
"id": 100,
"name": "manager_deny_read",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand All @@ -397,7 +392,7 @@
"id": 102,
"name": "custom_manager_deny_read2",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand Down
21 changes: 8 additions & 13 deletions docker/imposter/security/policies/get-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,10 @@
"name": "cluster_all_resourceless",
"policy": {
"actions": [
"cluster:status",
"manager:read",
"manager:read_api_config",
"manager:update_config",
"manager:restart"
"cluster:read",
"cluster:read_api_config",
"cluster:update_config",
"cluster:restart"
],
"resources": ["*:*:*"],
"effect": "allow"
Expand All @@ -329,11 +328,7 @@
"id": 31,
"name": "cluster_read_resourceless",
"policy": {
"actions": [
"cluster:status",
"manager:read",
"manager:read_api_config"
],
"actions": ["cluster:read", "cluster:read_api_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
Expand Down Expand Up @@ -387,7 +382,7 @@
"id": 100,
"name": "manager_deny_read",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand All @@ -397,7 +392,7 @@
"id": 101,
"name": "custom_manager_deny_read",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand All @@ -407,7 +402,7 @@
"id": 102,
"name": "custom_manager_deny_read2",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand Down
65 changes: 0 additions & 65 deletions docker/imposter/security/security-actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,6 @@
},
"related_endpoints": ["PUT /agents/reconnect"]
},
"cluster:status": {
"description": "Check Wazuh's cluster general status",
"resources": ["*:*"],
"example": {
"actions": ["cluster:status"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": ["GET /cluster/status"]
},
"cluster:read_api_config": {
"description": "Check Wazuh's cluster nodes API configuration",
"resources": ["*:*"],
Expand Down Expand Up @@ -295,61 +285,6 @@
},
"related_endpoints": ["PUT /logtest", "DELETE /logtest/sessions/{token}"]
},
"manager:read": {
"description": "Read Wazuh manager configuration",
"resources": ["*:*"],
"example": {
"actions": ["manager:read"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": [
"GET /manager/status",
"GET /manager/info",
"GET /manager/configuration",
"GET /manager/daemons/stats",
"GET /manager/stats",
"GET /manager/stats/hourly",
"GET /manager/stats/weekly",
"GET /manager/stats/analysisd",
"GET /manager/stats/remoted",
"GET /manager/logs",
"GET /manager/logs/summary",
"PUT /manager/restart",
"GET /manager/configuration/validation",
"GET /manager/configuration/{component}/{configuration}"
]
},
"manager:update_config": {
"description": "Update current Wazuh manager configuration",
"resources": ["*:*"],
"example": {
"actions": ["manager:update_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": ["PUT /manager/configuration"]
},
"manager:read_api_config": {
"description": "Read Wazuh manager API configuration",
"resources": ["*:*"],
"example": {
"actions": ["manager:read_api_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": ["GET /manager/api/config"]
},
"manager:restart": {
"description": "Restart Wazuh managers",
"resources": ["*:*"],
"example": {
"actions": ["manager:restart"],
"resources": ["*:*:*"],
"effect": "deny"
},
"related_endpoints": ["PUT /manager/restart"]
},
"mitre:read": {
"description": "Access information from MITRE database",
"resources": ["*:*"],
Expand Down
21 changes: 8 additions & 13 deletions docker/imposter/security/security-policies.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,10 @@
"name": "cluster_all_resourceless",
"policy": {
"actions": [
"cluster:status",
"manager:read",
"manager:read_api_config",
"manager:update_config",
"manager:restart"
"cluster:read",
"cluster:read_api_config",
"cluster:update_config",
"cluster:restart"
],
"resources": ["*:*:*"],
"effect": "allow"
Expand All @@ -329,11 +328,7 @@
"id": 31,
"name": "cluster_read_resourceless",
"policy": {
"actions": [
"cluster:status",
"manager:read",
"manager:read_api_config"
],
"actions": ["cluster:read", "cluster:read_api_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
Expand Down Expand Up @@ -387,7 +382,7 @@
"id": 100,
"name": "manager_deny_read",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand All @@ -397,7 +392,7 @@
"id": 101,
"name": "custom_manager_deny_read",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand All @@ -407,7 +402,7 @@
"id": 102,
"name": "custom_manager_deny_read2",
"policy": {
"actions": ["manager:read", "cluster:read"],
"actions": ["cluster:read"],
"resources": ["*:*:*", "node:id:*"],
"effect": "deny"
},
Expand Down
8 changes: 0 additions & 8 deletions docker/imposter/wazuh-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,6 @@ resources:
statusCode: 200
scriptFile: cluster/cluster_sync.js
# staticFile: cluster/cluster_sync_no_sync.json

# Get cluster status
- method: GET
path: /cluster/status
response:
statusCode: 200
staticFile: cluster/cluster_status.json

# Get local node config
- method: GET
path: /cluster/local/config
Expand Down
65 changes: 0 additions & 65 deletions plugins/main/common/api-info/security-actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,6 @@
"GET /experimental/ciscat/results"
]
},
"cluster:status": {
"description": "Check Wazuh's cluster general status",
"resources": ["*:*"],
"example": {
"actions": ["cluster:status"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": ["GET /cluster/status"]
},
"cluster:read_api_config": {
"description": "Check Wazuh's cluster nodes API configuration",
"resources": ["*:*"],
Expand Down Expand Up @@ -317,61 +307,6 @@
},
"related_endpoints": ["PUT /logtest", "DELETE /logtest/sessions/{token}"]
},
"manager:read": {
"description": "Read Wazuh manager configuration",
"resources": ["*:*"],
"example": {
"actions": ["manager:read"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": [
"GET /manager/status",
"GET /manager/info",
"GET /manager/configuration",
"GET /manager/daemons/stats",
"GET /manager/stats",
"GET /manager/stats/hourly",
"GET /manager/stats/weekly",
"GET /manager/stats/analysisd",
"GET /manager/stats/remoted",
"GET /manager/logs",
"GET /manager/logs/summary",
"PUT /manager/restart",
"GET /manager/configuration/validation",
"GET /manager/configuration/{component}/{configuration}"
]
},
"manager:update_config": {
"description": "Update current Wazuh manager configuration",
"resources": ["*:*"],
"example": {
"actions": ["manager:update_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": ["PUT /manager/configuration"]
},
"manager:read_api_config": {
"description": "Read Wazuh manager API configuration",
"resources": ["*:*"],
"example": {
"actions": ["manager:read_api_config"],
"resources": ["*:*:*"],
"effect": "allow"
},
"related_endpoints": ["GET /manager/api/config"]
},
"manager:restart": {
"description": "Restart Wazuh managers",
"resources": ["*:*"],
"example": {
"actions": ["manager:restart"],
"resources": ["*:*:*"],
"effect": "deny"
},
"related_endpoints": ["PUT /manager/restart"]
},
"mitre:read": {
"description": "Access information from MITRE database",
"resources": ["*:*"],
Expand Down
14 changes: 4 additions & 10 deletions plugins/main/public/components/add-modules-data/sample-data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,23 +169,17 @@ export default class WzSampleData extends Component {
),
);

// Get information about cluster/manager
// Get information about cluster
const clusterName = AppState.getClusterInfo().cluster;
const managerName = AppState.getClusterInfo().manager;

// eslint-disable-next-line camelcase
this.generateAlertsParams.api_id = JSON.parse(
AppState.getCurrentAPI() || '{}',
)?.id;
this.generateAlertsParams.manager = {
name: managerName,
this.generateAlertsParams.cluster = {
name: clusterName,
node: clusterName,
};
if (clusterName && clusterName !== 'Disabled') {
this.generateAlertsParams.cluster = {
name: clusterName,
node: clusterName,
};
}
} catch (error) {
const options = {
context: `${WzSampleData.name}.componentDidMount`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,20 +256,16 @@ export class PatternDataSourceFilterManager
}

/**
* Return the filter when the cluster or manager are enabled
* Return the cluster filter
*/
static getClusterManagerFilters(
indexPatternId: string,
controlledByValue: string,
key?: string,
): tFilter[] {
const filterHandler = new FilterHandler();
const isCluster = AppState.getClusterInfo().status == 'enabled';
const managerFilter = filterHandler.managerQuery(
isCluster
? AppState.getClusterInfo().cluster
: AppState.getClusterInfo().manager,
isCluster,
AppState.getClusterInfo().cluster,
key,
);
managerFilter.meta = {
Expand Down
Loading
Loading