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.

Sign up for GitHub

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

Configuration assessment #505

Merged
merged 45 commits into from
Feb 20, 2019
Merged

Configuration assessment #505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
70b65cf
added new methods to agents controller
manuasir Jan 23, 2019
39eba5b
Added run scan for rootcheck
manuasir Jan 23, 2019
d1a8dd6
Merge branch '3.9-491' of https://github.com/wazuh/wazuh-splunk into …
manuasir Jan 23, 2019
40c7a56
Prettier
manuasir Jan 23, 2019
d0c983b
Added run scan to agents fim
manuasir Jan 23, 2019
5d83daf
New methods to rootcheck
manuasir Jan 23, 2019
3ab1ac4
Making rootcheck URLs as links
manuasir Jan 23, 2019
ba3f1cc
New key equivalences
manuasir Jan 23, 2019
cd82b55
Added new dependencies
manuasir Jan 23, 2019
e2f5dcb
Changes in views
manuasir Jan 23, 2019
51c633d
New equivalences
manuasir Jan 23, 2019
bad7cc5
Rootcheck links as HTML
manuasir Jan 23, 2019
4781715
Making scans
manuasir Jan 23, 2019
ffd19f6
Changes in tables
manuasir Jan 23, 2019
1f8660c
Adjusting style
manuasir Jan 23, 2019
3296455
Setting margin in buttons
manuasir Jan 23, 2019
ea2a163
Fixes conflicts
manuasir Jan 23, 2019
b68f176
Prettier
manuasir Jan 23, 2019
5c2a8ee
Resolve conflicts
adri9valle Feb 11, 2019
4d9215f
List policies
adri9valle Feb 11, 2019
8198803
Set styles and refs to policies
adri9valle Feb 11, 2019
62503a0
Get checks of policy monitoring, and check error when run rootcheck scan
adri9valle Feb 12, 2019
9414c25
Init checks lists, stall
adri9valle Feb 12, 2019
4ba7c83
dataService modified, only for test, undo when API works ok
adri9valle Feb 12, 2019
6183eb3
Add subtab
adri9valle Feb 12, 2019
289ae52
Show config assessment
adri9valle Feb 12, 2019
540509b
Merge branch '3.9' into 3.9-config-assessment-applied
adri9valle Feb 14, 2019
98a15ec
Merge branch '3.9' into 3.9-491
adri9valle Feb 14, 2019
fd72eb5
Merge branch '3.9-config-assessment-applied' into 3.9-491
adri9valle Feb 19, 2019
87d57e0
Update API call
adri9valle Feb 19, 2019
da28ade
Hide reference if is null
adri9valle Feb 19, 2019
9d74eb2
Fix checks
adri9valle Feb 19, 2019
5c26ca7
Fix policies applied
adri9valle Feb 19, 2019
8d65d57
Remove several fields from checks
adri9valle Feb 19, 2019
9f0785c
Change to table
adri9valle Feb 19, 2019
56f9ff5
Removed unused click actions
adri9valle Feb 19, 2019
5b3c7ee
click action debug
adri9valle Feb 20, 2019
99d3458
Added configuration assessment to agents > overview
adri9valle Feb 20, 2019
206deda
Removed config assess from agents > policy monitoring
adri9valle Feb 20, 2019
a61ae2b
Added configuration assessment(pm content)
adri9valle Feb 20, 2019
07a5ea6
Change table style
adri9valle Feb 20, 2019
8c7019c
Changed agents config assess dashboard
adri9valle Feb 20, 2019
b75e489
Removed click-action for config assess
adri9valle Feb 20, 2019
1f6bb96
Expand policies checks
adri9valle Feb 20, 2019
dfdc852
Merge branch '3.9' into 3.9-491
adri9valle Feb 20, 2019
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
Prev Previous commit
Next Next commit
Show config assessment
  • Loading branch information
@adri9valle
adri9valle committed Feb 12, 2019
commit 289ae529d347c0733792e217aaf148f3cd1a9a02
68 changes: 42 additions & 26 deletions ...r/static/js/controllers/management/configuration/policy-monitoring/policy-monitoring.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,34 +162,50 @@

<!-- The configuration assessment -->
<md-card class="wz-md-card" ng-if="!JSONContent && !XMLContent && configurationSubTab === 'pm-ca'">
<md-card-content>
<div layout="row" layout-align="start center">
<div>
<span class="font-size-16">Configuration assessment</span>
<div class="wz-margin-top-10">
<span class="md-subheader small">Configuration parameters</span>
<md-card-content>
<div layout="row" layout-align="start center">
<div>
<span class="font-size-16">Configuration assessment</span>
<div class="wz-margin-top-10">
<span class="md-subheader small">Configuration parameters</span>
</div>
</div>
<span flex></span>
<span ng-class="JSONContent ? 'wz-text-active' : ''" class="wz-text-link small" ng-click="getJSON()">JSON</span>
<span class="small">&nbsp;&centerdot;&nbsp;</span>
<span ng-class="XMLContent ? 'wz-text-active' : ''" class="wz-text-link small" ng-click="getXML()">XML</span>
</div>
<md-divider class="wz-margin-top-10"></md-divider>

<div layout="row" style="padding-left: 20%;">
<!-- Configuration block -->
<div class="wz-padding-top-10" style="width:50%; padding-left:5%; float:left;padding-top: 30px;">
<!-- content -->
<wz-config-item label="Configuration assessment status" value="currentConfig['wmodules-wmodules']['wmodules'][4]['configuration-assesment'].enabled === 'yes' ? 'enabled' : 'disabled'">
</wz-config-item>
<wz-config-item label="Interval" value="currentConfig['wmodules-wmodules']['wmodules'][4]['configuration-assesment'].interval">
</wz-config-item>
<wz-config-item label="Scan on start" value="currentConfig['wmodules-wmodules']['wmodules'][4]['configuration-assesment'].scan_on_start">
</wz-config-item>
<wz-config-item label="Skip nfs" value="currentConfig['wmodules-wmodules']['wmodules'][4]['configuration-assesment'].skip_nfs">
</wz-config-item>
<!-- end content -->
</div>
<!-- End configuration block -->

<!-- Policies block -->
<div class="wz-padding-top-10" style="width:80%; float:left; margin-right:15%;">
<!-- content -->
<span style="padding-left: 30px;"><b>Policies applied</b></span>
<wz-config-item ng-repeat="profile in currentConfig['wmodules-wmodules']['wmodules'][4]['configuration-assesment'].profiles"
label="" value="profile.profile">
</wz-config-item>
<!-- end content -->
</div>
</div>
<span flex></span>
<span ng-class="JSONContent ? 'wz-text-active' : ''" class="wz-text-link small" ng-click="getJSON()">JSON</span>
<span class="small">&nbsp;&centerdot;&nbsp;</span>
<span ng-class="XMLContent ? 'wz-text-active' : ''" class="wz-text-link small" ng-click="getXML()">XML</span>
</div>
<md-divider class="wz-margin-top-10"></md-divider>

<!-- Configuration block -->
<div class="wz-padding-top-10">

<!-- content -->

<!-- <wz-config-item label="Policy monitoring service status" value="currentConfig['syscheck-rootcheck'].rootcheck.disabled === 'no' ? 'enabled' : 'disabled'">
</wz-config-item> -->

<!-- end content -->

</div>
<!-- End configuration block -->
</md-card-content>
</md-card-content>
<!-- end policies block-->

</md-card>
<!-- End configuration assessment -->

Expand Down
2 changes: 1 addition & 1 deletion ...AppForWazuh/appserver/static/js/controllers/management/configuration/welcome/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h3 class="wz-text-link" ng-click="switchConfigTab('database-output')">Database
<md-list layout="row" layout-wrap>
<md-list-item flex="100" flex-gt-md="50" flex-gt-lg="33" class="md-2-line">
<div class="md-list-item-text">
<h3 class="wz-text-link" ng-click="switchConfigTab('policy-monitoring', [{component:'syscheck',configuration:'rootcheck'}])">Policy
<h3 class="wz-text-link" ng-click="switchConfigTab('policy-monitoring', [{component:'syscheck',configuration:'rootcheck'}, {component:'wmodules',configuration:'wmodules'}])">Policy
monitoring</h3>
<p>Configuration to ensure compliance with security policies, standards and hardening guides</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion SplunkAppForWazuh/appserver/static/js/directives/wz-config-item/wz-config-item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div ng-if="value || value === 0" layout="column" layout-gt-md="row" layout-align-gt-md="start center" class="wz-configuration-item">
<div flex-gt-md="30" class="wz-configuration-label">
<div ng-if="label" flex-gt-md="30" class="wz-configuration-label">
{{ label }}
</div>
<div ng-if="!isArray" flex-gt-md="50" class="wz-configuration-value">
Expand Down