Skip to content

Commit

Permalink
Merge branch '4.5' into 5239-wazuh-api-usage-agent-inventory-data-unn…
Browse files Browse the repository at this point in the history
…ecessary-query-while-accessing
  • Loading branch information
AlexRuiz7 authored May 29, 2023
2 parents ed8357d + c2944dc commit 26a7b58
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 462 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Changed the title of step 3 of the deploy a new agent section. [#5429](https://github.com/wazuh/wazuh-kibana-app/pull/5429)
- Changed the description of step 3 of the deploy a new agent section. [#5429](https://github.com/wazuh/wazuh-kibana-app/pull/5429)
- Changed the placeholder of the agent name input of the deploy a new agent section. [#5429](https://github.com/wazuh/wazuh-kibana-app/pull/5429)
- Changed the search bar in management/log to the one used in the rest of the app. [#5476](https://github.com/wazuh/wazuh-kibana-app/pull/5476)

### Fixed

Expand All @@ -36,7 +37,13 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed the GitHub and Office 365 modules appear in the main menu when they were not configured [#5376](https://github.com/wazuh/wazuh-kibana-app/pull/5376)
- Fixed TypeError in FIM Inventory using new error handler [#5364](https://github.com/wazuh/wazuh-kibana-app/pull/5364)
- Fixed error when using invalid group configuration [#5423](https://github.com/wazuh/wazuh-kibana-app/pull/5423)
- Fixed making unnecessary requests in inventory data and configurations of an agent. [#5460](https://github.com/wazuh/wazuh-kibana-app/pull/5460)
- Fixed repeated requests in inventory data and configurations of an agent. [#5460](https://github.com/wazuh/wazuh-kibana-app/pull/5460)
- Fixed repeated requests in the group table when adding a group or refreshing the table [#5465](https://github.com/wazuh/wazuh-kibana-app/pull/5465)

### Removed

- Removed deprecated request and code in agent's view [#5451](https://github.com/wazuh/wazuh-kibana-app/pull/5451)
- Removed unnecessary dashboard queries caused by the deploy agent view. [#5453](https://github.com/wazuh/wazuh-kibana-app/pull/5453)

## Wazuh v4.4.3 - OpenSearch Dashboards 2.6.0 - Revision 01

Expand All @@ -59,7 +66,7 @@ All notable changes to the Wazuh app project will be documented in this file.

- Fixed a problem in the backend service to get the plugin configuration [#5428](https://github.com/wazuh/wazuh-kibana-app/pull/5428) [#5432](https://github.com/wazuh/wazuh-kibana-app/pull/5432)

## Wazuh v4.4.1 - OpenSearch Dashboards 2.6.0 - Revision 00
## Wazuh v4.4.1 - OpenSearch Dashboards 2.6.0 - Revision 01

### Fixed

Expand Down
80 changes: 0 additions & 80 deletions public/components/common/welcome/agents-welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,92 +347,12 @@ class AgentsWelcome extends Component {
);
}

buildTabCard(tab, icon) {
return (
<EuiFlexItem>
<EuiCard
size="xs"
layout="horizontal"
icon={<EuiIcon size="xl" type={icon} color="primary" />}
className="homSynopsis__card"
title={WAZUH_MODULES[tab].title}
onClick={() => this.props.switchTab(tab)}
description={WAZUH_MODULES[tab].description}
/>
</EuiFlexItem>
);
}
onClickRestartAgent = () => {
const { agent } = this.props;
ActionAgents.restartAgent(agent.id);
};

onClickUpgradeAgent = () => {
const { agent } = this.props;
ActionAgents.upgradeAgent(agent.id);
};

renderUpgradeButton() {
const { managerVersion } = this.state;
const { agent } = this.props;
let outDated = ActionAgents.compareVersions(managerVersion, agent.version);

if (outDated === true) return;
return (
<EuiFlexItem grow={false}>
<EuiButton
color="secondary"
iconType="sortUp"
onClick={this.onClickUpgradeAgent}
>
Upgrade
</EuiButton>
</EuiFlexItem>
);
}

onTimeChange = (datePicker) => {
const { start: from, end: to } = datePicker;
this.setState({ datePicker: { from, to } });
}

getOptions() {
return [
{ value: 'pci', text: 'PCI DSS' },
{ value: 'gdpr', text: 'GDPR' },
{ value: 'nist', text: 'NIST 800-53' },
{ value: 'hipaa', text: 'HIPAA' },
{ value: 'gpg13', text: 'GPG13' },
{ value: 'tsc', text: 'TSC' },
];
}

setSelectValue(e) {
this.setState({ selectedRequirement: e.target.value });
}

getRequirementVis() {
if (this.state.selectedRequirement === 'pci') {
return 'Wazuh-App-Agents-Welcome-Top-PCI';
}
if (this.state.selectedRequirement === 'gdpr') {
return 'Wazuh-App-Agents-Welcome-Top-GDPR';
}
if (this.state.selectedRequirement === 'hipaa') {
return 'Wazuh-App-Agents-Welcome-Top-HIPAA';
}
if (this.state.selectedRequirement === 'nist') {
return 'Wazuh-App-Agents-Welcome-Top-NIST-800-53';
}
if (this.state.selectedRequirement === 'gpg13') {
return 'Wazuh-App-Agents-Welcome-Top-GPG-13';
}
if (this.state.selectedRequirement === 'tsc') {
return 'Wazuh-App-Agents-Welcome-Top-TSC';
}
return 'Wazuh-App-Agents-Welcome-Top-PCI'
}

renderMitrePanel() {
return (
<Fragment>
Expand Down
44 changes: 0 additions & 44 deletions public/components/wz-field-search-bar/wz-field-search-bar.tsx

This file was deleted.

5 changes: 2 additions & 3 deletions public/controllers/agent/agents-preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export class AgentsPreviewController {
this.wazuhConfig = new WazuhConfig();
this.errorInit = false;
this.$window = $window;
this.addingNewAgent = false;
}

/**
Expand Down Expand Up @@ -100,9 +101,7 @@ export class AgentsPreviewController {
updateSummary: (summary) => {
this.summary = summary;
if (this.summary.total === 0) {
if (this.addingNewAgent === undefined) {
this.addNewAgent(true);
}
this.addNewAgent(true);
this.hasAgents = false;
} else {
this.hasAgents = true;
Expand Down
Loading

0 comments on commit 26a7b58

Please sign in to comment.