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

Disable synced by default #5143

Merged
Merged
Show file tree
Hide file tree
Changes from 13 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ All notable changes to the Wazuh app project will be documented in this file.
### Added

- Added the option to sort by the agents count in the group table. [#4323](https:/wazuh/wazuh-kibana-app/pull/4323)
- Added agent synchronization status in the agent module. [#3874](https:/wazuh/wazuh-kibana-app/pull/3874)
- Added agent synchronization status in the agent module. [#3874](https:/wazuh/wazuh-kibana-app/pull/3874) [#5143](https:/wazuh/wazuh-kibana-app/pull/5143)
- The input name was added and when the user adds a value the variable WAZUH_AGENT_NAME with its value appears in the installation command. [#4739](https:/wazuh/wazuh-kibana-app/pull/4739)
- Redesign the SCA table from agent's dashboard [#4512](https:/wazuh/wazuh-kibana-app/pull/4512)
- Enhanced the plugin setting description displayed in the UI and the configuration file. [#4501](https:/wazuh/wazuh-kibana-app/pull/4501)
Expand Down
2 changes: 1 addition & 1 deletion common/compliance-requirements/pci-requirements.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const pciRequirementsFile = {
'6.5':
'Address common coding vulnerabilities in software development processes as follows:Train developers in secure coding techniques, including how to avoid common coding vulnerabilities, and understanding how sensitive data is handled in memory. Develop applications based on secure coding guidelines. ',
'6.5.1':
'Injection flaws, particularly SQL injection. Also consider OS Command Injection, LDAP and XPath injection flaws as well as other injection flaws.',
'Injection flaws, particularly SQL injection. Also consider Operating System Command Injection, LDAP and XPath injection flaws as well as other injection flaws.',
'6.5.2': 'Buffer overflows',
'6.5.5': 'Improper error handling',
'6.5.7': 'Cross-site scripting (XSS)',
Expand Down
4 changes: 2 additions & 2 deletions common/csv-key-equivalence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const KeyEquivalence: {[key: string]: string} = {
'os.uname': 'OS uname',
status: 'Status',
group: 'Group',
ip: 'IP',
ip: 'IP address',
description: 'Description',
tag: 'Tag',
level: 'Level',
Expand All @@ -52,7 +52,7 @@ export const KeyEquivalence: {[key: string]: string} = {
dateAdd: 'Registration date',
manager: 'Manager',
lastKeepAlive: 'Last keep alive',
os: 'OS',
os: 'Operating system',
path: 'Path',
details: 'Details',
position: 'Position',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function InventoryMetrics({agent}) {
<EuiText>Arch: {syscollector.isLoading ? <EuiLoadingSpinner size="s" /> : <strong>{syscollector.data.os.architecture}</strong>}</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText>OS: {syscollector.isLoading ? <EuiLoadingSpinner size="s" /> : <strong>{syscollector.data.os.os.name} {syscollector.data.os.os.version}</strong>}</EuiText>
<EuiText>Operating system: {syscollector.isLoading ? <EuiLoadingSpinner size="s" /> : <strong>{syscollector.data.os.os.name} {syscollector.data.os.os.version}</strong>}</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={true}>
<EuiText>CPU: {syscollector.isLoading ? <EuiLoadingSpinner size="s" /> : <strong>{syscollector.data.hardware.cpu.name}</strong>}</EuiText>
Expand Down
6 changes: 3 additions & 3 deletions public/components/common/welcome/agents-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class AgentInfo extends Component {
this.state = {};
}


async componentDidMount() {
const managerVersion = await WzRequest.apiReq('GET', '/', {});
this.setState({
Expand Down Expand Up @@ -99,7 +99,7 @@ export class AgentInfo extends Component {
)
}

buildStats(items) {
buildStats(items) {
const checkField = field => {
return field !== undefined || field ? field : '-';
};
Expand Down Expand Up @@ -157,7 +157,7 @@ export class AgentInfo extends Component {
arrayStats = [
{ title: agent.id, description: 'ID', style: { minWidth: 30 } },
{ title: agent.status, description: 'Status', style: { minWidth: 130 } },
{ title: agent.ip, description: 'IP', style: { minWidth: 80 } },
{ title: agent.ip, description: 'IP address', style: { minWidth: 80 } },
{ title: agent.version, description: 'Version', style: { minWidth: 100 } },
{ title: agent.group, description: 'Groups', style: { minWidth: 150 } },
{ title: agent.name, description: 'Operating system', style: { minWidth: 150 } },
Expand Down
2 changes: 1 addition & 1 deletion public/components/management/cluster/node-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const NodeList = withErrorBoundary (class NodeList extends Component {
},
{
field: 'ip',
name: 'IP',
name: 'IP address',
sortable: true,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const drilldownOperationsConfig = {
{ field: 'timestamp' },
{ field: 'rule.description', label: 'Description' },
{ field: 'data.office365.UserId', label: 'User ID' },
{ field: 'data.office365.ClientIP', label: 'Client IP' },
{ field: 'data.office365.ClientIP', label: 'Client IP address' },
{ field: 'rule.level', label: 'Level' },
{ field: 'rule.id', label: 'Rule ID' },
]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const drilldownRulesConfig = {
{ field: 'timestamp' },
{ field: 'rule.description', label: 'Description' },
{ field: 'data.office365.UserId', label: 'User ID' },
{ field: 'data.office365.ClientIP', label: 'Client IP' },
{ field: 'data.office365.ClientIP', label: 'Client IP address' },
{ field: 'data.office365.Operation', label: 'Operation' },
{ field: 'rule.level', label: 'Level' },
{ field: 'rule.id', label: 'Rule ID' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const drilldownUserConfig = {
{ field: 'icon' },
{ field: 'timestamp' },
{ field: 'rule.description', label: 'Description' },
{ field: 'data.office365.ClientIP', label: 'Client IP' },
{ field: 'data.office365.ClientIP', label: 'Client IP address' },
{ field: 'data.office365.Operation', label: 'Operation' },
{ field: 'rule.level', label: 'Level' },
{ field: 'rule.id', label: 'Rule ID' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ export const MainViewConfig = {
component: (props) => (
<EuiFlexItem grow={props.grow}>
<AggTable
tableTitle="Top client IP"
tableTitle="Top client IP address"
aggTerm="data.office365.ClientIP"
aggLabel="Client IP"
aggLabel="Client IP address"
maxRows={5}
onRowClick={(field, value) => props.onRowClick(field, value)}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const ModuleConfig = {
'data.office365.ClientIP': {
length: () => drilldownIPConfig.rows.reduce((total, row) => total + row.columns.length, 0),
component: (props) => (
<OfficeDrilldown title={'Client IP'} {...{ ...drilldownIPConfig, ...props }} />
<OfficeDrilldown title={'Client IP address'} {...{ ...drilldownIPConfig, ...props }} />
),
},
'data.office365.Operation': {
Expand Down
4 changes: 2 additions & 2 deletions public/components/visualize/visualizations.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const visualizations = {
width: 40
},
{
title: 'IP by Users',
title: 'IP address by Users',
id: 'Wazuh-App-Overview-Office-IPs-By-User-Barchart',
width: 30
},
Expand Down Expand Up @@ -235,7 +235,7 @@ export const visualizations = {
height: 450,
vis: [
{
title: 'Top 5 Map by source ip',
title: 'Top 5 Map by source IP address',
id: 'Wazuh-App-Overview-GCP-Map-By-SourceIp',
width: 100
},
Expand Down
4 changes: 2 additions & 2 deletions public/components/wz-search-bar/wz-search-bar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ const suggestions: IWzSuggestItem[] = [
{
type: 'q',
label: 'os.platform',
description: 'Filter by OS platform',
description: 'Filter by operating system platform',
operators: ['=', '!='],
values: async (value) => getSuggestionsFilters('os.platform', value, { q: 'id!=000' }),
},
{
type: 'q',
label: 'ip',
description: 'Filter by agent IP',
description: 'Filter by agent IP address',
operators: ['=', '!='],
values: async (value) => getSuggestionsFilters('ip', value, { q: 'id!=000' }),
},
Expand Down
15 changes: 2 additions & 13 deletions public/controllers/agent/components/agents-preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export const AgentsPreview = compose(
agentStatusSummary: { active: '-', disconnected: '-', total: '-', pending: '-', never_connected: '-' },
agentConfiguration: {},
agentsActiveCoverage: 0,
agentsSynced: 0,
};
this.wazuhConfig = new WazuhConfig();
this.agentStatus = UI_ORDER_AGENT_STATUS.map(agentStatus => ({
Expand All @@ -84,8 +83,8 @@ export const AgentsPreview = compose(
this._isMount = true;
this.fetchAgentStatusDetailsData();
if (this.wazuhConfig.getConfig()['wazuh.monitoring.enabled']) {
this._isMount && this.setState({
showAgentsEvolutionVisualization: true
this._isMount && this.setState({
showAgentsEvolutionVisualization: true
});
const tabVisualizations = new TabVisualizations();
tabVisualizations.removeAll();
Expand Down Expand Up @@ -120,7 +119,6 @@ export const AgentsPreview = compose(
agentStatusSummary,
agentConfiguration,
agentsActiveCoverage: ((agentStatusSummary.active / agentStatusSummary.total) * 100).toFixed(2),
agentsSynced: ((agentConfiguration.synced/agentConfiguration.total)*100).toFixed(2),
});
}

Expand Down Expand Up @@ -239,15 +237,6 @@ export const AgentsPreview = compose(
className="white-space-nowrap"
/>
</EuiFlexItem>
<EuiFlexItem className="agents-link-item">
<EuiStat
isLoading={this.state.loadingSummary}
title={`${this.state.agentsSynced}%`}
titleSize='s'
description="Synced agents"
className="white-space-nowrap"
/>
</EuiFlexItem>
</EuiFlexGroup>
<EuiFlexGroup className="mt-0">
<EuiFlexItem className="agents-link-item">
Expand Down
1 change: 1 addition & 0 deletions public/controllers/agent/components/agents-preview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
display: flex;
align-items: baseline;
margin: 15px 0px;
flex-wrap: wrap;
}

.columnsSelectedCheckboxs div {
Expand Down
Loading