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

Using dynamic values for description. Grammar fix #765

Merged
merged 2 commits into from
Aug 1, 2018
Merged

Using dynamic values for description. Grammar fix #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e760bd0
Using dynamic values for description. Grammar fix
Jul 31, 2018
b43cd28
Removed unused deps
Jul 31, 2018
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
20 changes: 11 additions & 9 deletions public/controllers/agents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
*
* Find more information about this on the LICENSE file.
*/
import beautifier from '../utils/json-beautifier';
import { uiModules } from 'ui/modules'
import FilterHandler from '../utils/filter-handler'
import generateMetric from '../utils/generate-metric'
import TabNames from '../utils/tab-names'
import { metricsAudit, metricsVulnerability, metricsScap, metricsCiscat, metricsVirustotal } from '../utils/agents-metrics'
import * as FileSaver from '../services/file-saver'
import beautifier from '../utils/json-beautifier';
import { uiModules } from 'ui/modules';
import FilterHandler from '../utils/filter-handler';
import generateMetric from '../utils/generate-metric';
import TabNames from '../utils/tab-names';
import { metricsAudit, metricsVulnerability, metricsScap, metricsCiscat, metricsVirustotal } from '../utils/agents-metrics';
import * as FileSaver from '../services/file-saver';

import TabDescription from '../../server/reporting/tab-description';

const app = uiModules.get('app/wazuh', []);

Expand All @@ -24,11 +26,11 @@ app.controller('agentsController',
function (
$timeout, $scope, $location, $rootScope,
appState, apiReq, AgentsAutoComplete, errorHandler,
tabVisualizations, vis2png, shareAgent, commonData,
tabVisualizations, shareAgent, commonData,
reportingService, visFactoryService, csvReq,
wzTableFilter
) {

$scope.TabDescription = TabDescription;
$rootScope.reportStatus = false;

$location.search('_a',null)
Expand Down
7 changes: 4 additions & 3 deletions public/controllers/overview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,23 @@
*
* Find more information about this on the LICENSE file.
*/
import $ from 'jquery';
import { uiModules } from 'ui/modules'
import FilterHandler from '../utils/filter-handler'
import generateMetric from '../utils/generate-metric'
import TabNames from '../utils/tab-names'
import { metricsGeneral, metricsFim, metricsAudit, metricsVulnerability, metricsScap, metricsCiscat, metricsVirustotal, metricsAws } from '../utils/overview-metrics'

import TabDescription from '../../server/reporting/tab-description';

const app = uiModules.get('app/wazuh', []);

app.controller('overviewController',
function ($scope, $location, $rootScope, appState,
genericReq, errorHandler, apiReq, tabVisualizations,
errorHandler, apiReq, tabVisualizations,
commonData, reportingService, visFactoryService,
wazuhConfig
) {

$scope.TabDescription = TabDescription;
$rootScope.reportStatus = false;

$location.search('_a',null)
Expand Down
32 changes: 11 additions & 21 deletions public/templates/agents/agents-welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,17 @@ <h3 class="euiTitle">Host monitoring</h3>
<wz-welcome-card
class="euiFlexItem" logo="'app_logging.svg'" title="'File integrity'"
switch-tab="switchTab('fim')" current-tab="'fim'"
description="'Wazuh’s File integrity monitoring (FIM) watches specified files triggering
alerts when these files are modified.'"
description="TabDescription.fim.description"
></wz-welcome-card>
<wz-welcome-card
class="euiFlexItem" logo="'app_devtools.svg'"
title="'Configuration'" switch-tab="switchTab('configuration')" current-tab="'configuration'"
description="'Agents can be configured remotely by using the agent.conf file. Check the agent configuration here.'"
description="TabDescription.configuration.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="syscollector && syscollector.os && syscollector.os.sysname" class="euiFlexItem" logo="'app_index_pattern.svg'"
title="'Inventory'" switch-tab="switchTab('syscollector')" current-tab="'syscollector'"
description="'Scan the system to retrieve OS, hardware and installed packages related information.'"
description="TabDescription.syscollector.description"
></wz-welcome-card>
</div>
</div>
Expand All @@ -100,27 +99,22 @@ <h3 class="euiTitle">System audit</h3>
<wz-welcome-card
class="euiFlexItem" logo="'app_advanced_settings.svg'"
title="'Policy monitoring'" switch-tab="switchTab('pm')" current-tab="'pm'"
description="'Policy monitoring is the process of verifying that all systems conform to
a set of predefined rules regarding configuration settings and approved
application usage.'"
description="TabDescription.pm.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.audit" class="euiFlexItem" logo="'app_monitoring.svg'"
title="'Audit'" switch-tab="switchTab('audit')" current-tab="'audit'"
description="'The Linux auditd system is an extensive auditing facility, which we will
only touch on here.'"
description="TabDescription.audit.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.oscap" class="euiFlexItem" logo="'app_discover.svg'"
title="'Open SCAP'" switch-tab="switchTab('oscap')" current-tab="'oscap'"
description="'SCAP jointly uses several specifications in order to automate continuous
monitoring, vulnerability management, and reporting on results of security
compliance scans.'"
description="TabDescription.oscap.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.ciscat" class="euiFlexItem" logo="'app_management.svg'"
title="'CIS-CAT'" switch-tab="switchTab('ciscat')" current-tab="'ciscat'"
description="'Integrated CIS benchmark assessments into Wazuh agents.'"
description="TabDescription.ciscat.description"
></wz-welcome-card>
</div>
</div>
Expand All @@ -139,12 +133,12 @@ <h3 class="euiTitle">Security</h3>
<wz-welcome-card
class="euiFlexItem" logo="'app_security.svg'"
title="'Vulnerabilities'" switch-tab="switchTab('vuls')" current-tab="'vuls'"
description="'Detect applications that are known to be vulnerable (affected by a CVE).'"
description="TabDescription.vuls.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.virustotal" class="euiFlexItem" logo="'app_saved_objects.svg'"
title="'Virustotal'" switch-tab="switchTab('virustotal')" current-tab="'virustotal'"
description="'Scans monitored files for malicious content.'"
description="TabDescription.virustotal.description"
></wz-welcome-card>
</div>
</div>
Expand All @@ -159,16 +153,12 @@ <h3 class="euiTitle">Compliance</h3>
<wz-welcome-card
ng-if="extensions.pci" class="euiFlexItem" logo="'app_apm.svg'"
title="'PCI DSS'" switch-tab="switchTab('pci')" current-tab="'pci'"
description="'Wazuh helps to implement PCI DSS by performing log analysis, file integrity
checking, policy monitoring, intrusion detection, real-time alerting
and active response.'"
description="TabDescription.pci.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.gdpr" class="euiFlexItem" logo="'app_visualize.svg'"
title="'GDPR'" switch-tab="switchTab('gdpr')" current-tab="'gdpr'"
description="'The General Data Protection Regulation took effect on 25th May 2018.
Wazuh helps with most technical requirements, taking advantage of
features such as File Integrity or Policy monitoring.'"
description="TabDescription.gdpr.description"
></wz-welcome-card>
</div>
</div>
Expand Down
31 changes: 10 additions & 21 deletions public/templates/overview/overview-welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,12 @@ <h3 class="euiTitle">Host monitoring</h3>
<wz-welcome-card
class="euiFlexItem" logo="'app_logging.svg'" title="'File integrity'"
switch-tab="switchTab('fim')" current-tab="'fim'"
description="'Wazuh’s File integrity monitoring (FIM) watches specified files triggering
alerts when these files are modified.'"
description="TabDescription.fim.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.aws" class="euiFlexItem" logo="'app_index_pattern.svg'"
title="'AWS'" switch-tab="switchTab('aws')" current-tab="'aws'"
description="'Amazon CloudTrail support is now a built-in Wazuh capability, giving you
the ability to search, analyze, and alert on AWS CloudTrail events.'"
description="TabDescription.aws.description"
></wz-welcome-card>
</div>
</div>
Expand All @@ -60,27 +58,22 @@ <h3 class="euiTitle">System audit</h3>
<wz-welcome-card
class="euiFlexItem" logo="'app_advanced_settings.svg'"
title="'Policy monitoring'" switch-tab="switchTab('pm')" current-tab="'pm'"
description="'Policy monitoring is the process of verifying that all systems conform to
a set of predefined rules regarding configuration settings and approved
application usage.'"
description="TabDescription.pm.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.audit" class="euiFlexItem" logo="'app_monitoring.svg'"
title="'Audit'" switch-tab="switchTab('audit')" current-tab="'audit'"
description="'The Linux auditd system is an extensive auditing facility, which we will
only touch on here.'"
description="TabDescription.audit.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.oscap" class="euiFlexItem" logo="'app_discover.svg'"
title="'Open SCAP'" switch-tab="switchTab('oscap')" current-tab="'oscap'"
description="'SCAP jointly uses several specifications in order to automate continuous
monitoring, vulnerability management, and reporting on results of security
compliance scans.'"
description="TabDescription.oscap.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.ciscat" class="euiFlexItem" logo="'app_management.svg'"
title="'CIS-CAT'" switch-tab="switchTab('ciscat')" current-tab="'ciscat'"
description="'Integrated CIS benchmark assessments into Wazuh agents.'"
description="TabDescription.ciscat.description"
></wz-welcome-card>
</div>
</div>
Expand All @@ -99,12 +92,12 @@ <h3 class="euiTitle">Security</h3>
<wz-welcome-card
class="euiFlexItem" logo="'app_security.svg'"
title="'Vulnerabilities'" switch-tab="switchTab('vuls')" current-tab="'vuls'"
description="'Detect applications that are known to be vulnerable (affected by a CVE).'"
description="TabDescription.vuls.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.virustotal" class="euiFlexItem" logo="'app_saved_objects.svg'"
title="'Virustotal'" switch-tab="switchTab('virustotal')" current-tab="'virustotal'"
description="'Scans monitored files for malicious content.'"
description="TabDescription.virustotal.description"
></wz-welcome-card>
</div>
</div>
Expand All @@ -119,16 +112,12 @@ <h3 class="euiTitle">Compliance</h3>
<wz-welcome-card
ng-if="extensions.pci" class="euiFlexItem" logo="'app_apm.svg'"
title="'PCI DSS'" switch-tab="switchTab('pci')" current-tab="'pci'"
description="'Wazuh helps to implement PCI DSS by performing log analysis, file integrity
checking, policy monitoring, intrusion detection, real-time alerting
and active response.'"
description="TabDescription.pci.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.gdpr" class="euiFlexItem" logo="'app_visualize.svg'"
title="'GDPR'" switch-tab="switchTab('gdpr')" current-tab="'gdpr'"
description="'The General Data Protection Regulation took effect on 25th May 2018.
Wazuh helps with most technical requirements, taking advantage of
features such as File Integrity or Policy monitoring.'"
description="TabDescription.gdpr.description"
></wz-welcome-card>
</div>
</div>
Expand Down
Loading