valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-06 09:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '3.11-7.4' of https://github.com/wazuh/wazuh-kibana-app into 3.11-7.4

Browse Source
This commit is contained in:
JuanCarlos 2019-10-16 11:47:06 +02:00
commit b50cc199de
No known key found for this signature in database
GPG Key ID: B1C4FB733616273A
5 changed files with 103 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
public/controllers/management/components/reporting-table.js
View File

@ -12,7 +12,15 @@
*/ */
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { EuiBasicTable, EuiButtonIcon } from '@elastic/eui'; import {
EuiFlexGroup,
EuiFlexItem,
EuiBasicTable,
EuiButtonIcon,
EuiPanel,
EuiTitle,
EuiText
} from '@elastic/eui';
export class ReportingTable extends Component { export class ReportingTable extends Component {
constructor(props) { constructor(props) {
@ -116,14 +124,32 @@ export class ReportingTable extends Component {
}; };
return ( return (
<div> <EuiPanel>
<EuiBasicTable <EuiFlexGroup>
items={pageOfItems} <EuiFlexItem>
columns={columns} <EuiTitle>
pagination={pagination} <h2>Reporting</h2>
onChange={obj => this.onTableChange(obj)} </EuiTitle>
/> </EuiFlexItem>
</div> </EuiFlexGroup>
<EuiFlexGroup>
<EuiFlexItem>
<EuiText color="subdued" style={{ paddingBottom: '15px' }}>
From here you can check all your reports.
</EuiText>
</EuiFlexItem>
</EuiFlexGroup>
<EuiFlexGroup>
<EuiFlexItem>
<EuiBasicTable
items={pageOfItems}
columns={columns}
pagination={pagination}
onChange={obj => this.onTableChange(obj)}
/>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPanel>
); );
} }
} }

59
public/controllers/settings/components/add-api.js
View File

@ -22,7 +22,8 @@ import {
EuiButton, EuiButton,
EuiButtonEmpty, EuiButtonEmpty,
EuiSteps, EuiSteps,
EuiCallOut EuiCallOut,
EuiPanel
} from '@elastic/eui'; } from '@elastic/eui';
export class AddApi extends Component { export class AddApi extends Component {
@ -106,12 +107,12 @@ export class AddApi extends Component {
<div> <div>
{(this.state.status === 'warning' || {(this.state.status === 'warning' ||
this.state.status === 'danger') && ( this.state.status === 'danger') && (
<EuiCallOut <EuiCallOut
color={this.state.status} color={this.state.status}
iconType="help" iconType="help"
title={this.state.message} title={this.state.message}
/> />
)} )}
{(this.state.status === 'warning' || {(this.state.status === 'warning' ||
this.state.status === 'danger') && <EuiSpacer />} this.state.status === 'danger') && <EuiSpacer />}
<EuiText> <EuiText>
@ -168,28 +169,30 @@ export class AddApi extends Component {
const view = ( const view = (
<EuiFlexGroup> <EuiFlexGroup>
<EuiFlexItem /> <EuiFlexItem />
<EuiFlexItem> <EuiFlexItem className="min-guide-width">
<EuiFlexGroup> <EuiPanel>
<EuiFlexItem grow={false}> <EuiFlexGroup>
<EuiText> <EuiFlexItem grow={false}>
<h2>Getting started</h2> <EuiText>
</EuiText> <h2>Getting started</h2>
</EuiFlexItem> </EuiText>
<EuiFlexItem /> </EuiFlexItem>
<EuiFlexItem grow={false}> <EuiFlexItem />
{this.state.enableClose && !this.state.blockClose && ( <EuiFlexItem grow={false}>
<EuiButtonEmpty {this.state.enableClose && !this.state.blockClose && (
size="s" <EuiButtonEmpty
onClick={() => this.props.closeAddApi()} size="s"
iconType="cross" onClick={() => this.props.closeAddApi()}
> iconType="cross"
close >
close
</EuiButtonEmpty> </EuiButtonEmpty>
)} )}
</EuiFlexItem> </EuiFlexItem>
</EuiFlexGroup> </EuiFlexGroup>
<EuiSpacer /> <EuiSpacer />
<EuiSteps firstStepNumber={1} steps={steps} /> <EuiSteps firstStepNumber={1} steps={steps} />
</EuiPanel>
</EuiFlexItem> </EuiFlexItem>
<EuiFlexItem /> <EuiFlexItem />
</EuiFlexGroup> </EuiFlexGroup>

62
public/controllers/settings/components/api-is-down.js
View File

@ -27,7 +27,8 @@ import {
EuiCallOut, EuiCallOut,
EuiLoadingSpinner, EuiLoadingSpinner,
EuiToolTip, EuiToolTip,
EuiButtonIcon EuiButtonIcon,
EuiPanel
} from '@elastic/eui'; } from '@elastic/eui';
export class ApiIsDown extends Component { export class ApiIsDown extends Component {
@ -103,8 +104,7 @@ export class ApiIsDown extends Component {
} }
render() { render() {
const apiExample = ` const apiExample = `# Example Wazuh API configuration
# Example Wazuh API configuration
hosts: hosts:
- production: - production:
url: http://172.16.1.2 url: http://172.16.1.2
@ -165,21 +165,21 @@ hosts:
</EuiToolTip> </EuiToolTip>
</span> </span>
) : ( ) : (
<span> <span>
<EuiHealth color="danger">Offline</EuiHealth> <EuiHealth color="danger">Offline</EuiHealth>
<EuiToolTip position="top" content={item.downReason}> <EuiToolTip position="top" content={item.downReason}>
<EuiButtonIcon <EuiButtonIcon
color="primary" color="primary"
style={{ marginTop: '-12px' }} style={{ marginTop: '-12px' }}
iconType="questionInCircle" iconType="questionInCircle"
aria-label="Info about the error" aria-label="Info about the error"
onClick={() => onClick={() =>
this.props.copyToClipBoard(item.downReason) this.props.copyToClipBoard(item.downReason)
} }
/> />
</EuiToolTip> </EuiToolTip>
</span> </span>
); );
} else { } else {
return ( return (
<span> <span>
@ -193,12 +193,12 @@ hosts:
]} ]}
/> />
)) || ( )) || (
<EuiCallOut <EuiCallOut
color="danger" color="danger"
iconType="cross" iconType="cross"
title={this.state.error} title={this.state.error}
/> />
)} )}
</div> </div>
); );
@ -239,12 +239,14 @@ hosts:
return ( return (
<EuiFlexGroup> <EuiFlexGroup>
<EuiFlexItem /> <EuiFlexItem />
<EuiFlexItem> <EuiFlexItem className="min-guide-width">
<EuiText> <EuiPanel>
<h2>Wazuh API seems to be down</h2> <EuiText>
</EuiText> <h2>Wazuh API seems to be down</h2>
<EuiSpacer /> </EuiText>
<EuiSteps firstStepNumber={1} steps={steps} /> <EuiSpacer />
<EuiSteps firstStepNumber={1} steps={steps} />
</EuiPanel>
</EuiFlexItem> </EuiFlexItem>
<EuiFlexItem /> <EuiFlexItem />
</EuiFlexGroup> </EuiFlexGroup>

2
public/controllers/settings/settings.js
View File

@ -527,7 +527,7 @@ export class SettingsController {
}; };
} }
throw { throw {
message: 'Some API entries are not reachable', message: `Some Api entries are not rechable but at least one it is. That's mean that the Wazuh App can be used, but please, review your hosts configuration in order to solve the unreachable Api entries.`,
type: 'warning', type: 'warning',
closedEnabled: true closedEnabled: true
}; };

4
public/less/common.less
View File

@ -1248,3 +1248,7 @@ md-toolbar.md-default-theme:not(.md-menu-toolbar), md-toolbar:not(.md-menu-toolb
md-chips.md-default-theme .md-chips, md-chips .md-chips{ md-chips.md-default-theme .md-chips, md-chips .md-chips{
box-shadow: none; box-shadow: none;
} }
.min-guide-width{
min-width: 675px !important;
}