From 8ae0136f155f4af3da7dc4c54774c37c2ce2500f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20=C3=81ngel=20Gonz=C3=A1lez?= Date: Thu, 8 Mar 2018 10:44:01 +0100 Subject: [PATCH 1/2] Fixed metrics --- public/less/cleaned.less | 5 +++++ public/templates/agents/agents-audit.html | 4 ++-- public/templates/agents/agents-general.html | 8 ++++---- public/templates/agents/agents-vuls.html | 4 ++-- public/templates/manager/manager-status.html | 6 +++--- public/templates/overview/overview-audit.html | 4 ++-- public/templates/overview/overview-fim.html | 4 ++-- public/templates/overview/overview-general.html | 4 ++-- public/templates/overview/overview-vuls.html | 4 ++-- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/public/less/cleaned.less b/public/less/cleaned.less index 99a4157d2..9e08f516d 100644 --- a/public/less/cleaned.less +++ b/public/less/cleaned.less @@ -392,6 +392,11 @@ visualization { padding-top: 10px; } +.wz-padding-metric { + padding-top: 10px; + padding-bottom: 10px; +} + .wz-margin-top-10 { margin-top: 10px; } diff --git a/public/templates/agents/agents-audit.html b/public/templates/agents/agents-audit.html index cf9f76704..37746d7b8 100644 --- a/public/templates/agents/agents-audit.html +++ b/public/templates/agents/agents-audit.html @@ -3,8 +3,8 @@
- - + +
New files: {{auditNewFiles}}
Read files: {{auditReadFiles}}
Modified files: {{auditModifiedFiles}}
diff --git a/public/templates/agents/agents-general.html b/public/templates/agents/agents-general.html index 2f6cdb302..a607c4133 100644 --- a/public/templates/agents/agents-general.html +++ b/public/templates/agents/agents-general.html @@ -3,8 +3,8 @@
- - + +
Name: {{agent.name}}
IP: {{agent.ip}}
Version: {{ agent.version | limitTo: 12 }}{{agent.version.length > 12 ? '...' : ''}}
@@ -15,8 +15,8 @@
- - + +
Last keep alive: {{agent.lastKeepAlive || 'Unknown' }}
Registration date: {{agent.dateAdd}}
Last syscheck scan: Scan in progress
diff --git a/public/templates/agents/agents-vuls.html b/public/templates/agents/agents-vuls.html index 4678e7d69..6e7ef6917 100644 --- a/public/templates/agents/agents-vuls.html +++ b/public/templates/agents/agents-vuls.html @@ -4,8 +4,8 @@
- - + +
Critical severity alerts: {{vulnCritical}}
High severity alerts: {{vulnHigh}}
Medium severity alerts: {{vulnMedium}}
diff --git a/public/templates/manager/manager-status.html b/public/templates/manager/manager-status.html index 62f939fa3..4e7144764 100644 --- a/public/templates/manager/manager-status.html +++ b/public/templates/manager/manager-status.html @@ -10,15 +10,15 @@

-

{{k}}

+

{{k}}
- - + +
Total agents: {{agentsCountTotal}}
diff --git a/public/templates/overview/overview-audit.html b/public/templates/overview/overview-audit.html index eb216e2f3..64726dcb7 100644 --- a/public/templates/overview/overview-audit.html +++ b/public/templates/overview/overview-audit.html @@ -3,8 +3,8 @@
- - + + New files: {{auditNewFiles}} Read files: {{auditReadFiles}} Modified files: {{auditModifiedFiles}} diff --git a/public/templates/overview/overview-fim.html b/public/templates/overview/overview-fim.html index 0e390ff10..cb4a76978 100644 --- a/public/templates/overview/overview-fim.html +++ b/public/templates/overview/overview-fim.html @@ -4,8 +4,8 @@
- - + +
Files added: {{fimAdded}}
Files modified: {{fimModified}}
Files deleted: {{fimDeleted}}
diff --git a/public/templates/overview/overview-general.html b/public/templates/overview/overview-general.html index 2ff253d44..0ca223af9 100644 --- a/public/templates/overview/overview-general.html +++ b/public/templates/overview/overview-general.html @@ -4,8 +4,8 @@
- - + +
Alerts: {{totalAlerts}}
Level 12 or above alerts: {{level12}}
Authentication failure: {{authFailure}}
diff --git a/public/templates/overview/overview-vuls.html b/public/templates/overview/overview-vuls.html index b5565564c..9b7a81150 100644 --- a/public/templates/overview/overview-vuls.html +++ b/public/templates/overview/overview-vuls.html @@ -4,8 +4,8 @@
- - + +
Critical severity alerts: {{vulnCritical}}
High severity alerts: {{vulnHigh}}
Medium severity alerts: {{vulnMedium}}
From 5ab2f937c83260f9a9f9b209a847d6fc635857ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20=C3=81ngel=20Gonz=C3=A1lez?= Date: Thu, 8 Mar 2018 11:12:19 +0100 Subject: [PATCH 2/2] Fixed ruleset --- public/directives/wz-table/wz-table.html | 20 ++++++++-------- public/directives/wz-table/wz-table.less | 23 +++++++++---------- .../manager/ruleset/ruleset-decoders.html | 4 ++-- .../manager/ruleset/ruleset-rules.html | 4 ++-- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/public/directives/wz-table/wz-table.html b/public/directives/wz-table/wz-table.html index 4d6f3e7bc..06eb2e141 100644 --- a/public/directives/wz-table/wz-table.html +++ b/public/directives/wz-table/wz-table.html @@ -26,13 +26,13 @@
{{parseItem(item,key) || '---'}}
-
-
+
+
{{parseItem(item,key) || '---'}}
-
+

Overview

@@ -46,11 +46,11 @@
Level - {{item.level}} + {{item.level}}
File - {{item.file}} + {{item.file}}
@@ -61,7 +61,7 @@

Groups

- {{group}} + {{group}}
@@ -71,7 +71,7 @@

PCI DSS

- {{pci}} + {{pci}}
@@ -101,13 +101,13 @@
{{parseItem(decoder,key) || '---'}}
-
-
+
+
{{parseItem(decoder,key) || '---'}}
-
+

Overview

diff --git a/public/directives/wz-table/wz-table.less b/public/directives/wz-table/wz-table.less index 96746014f..c55518c5f 100644 --- a/public/directives/wz-table/wz-table.less +++ b/public/directives/wz-table/wz-table.less @@ -88,18 +88,17 @@ padding-right: 0px !important; } -// Style for text who applies filters when hovering -.listHover { - &:hover { - font-weight: bold; - } +.wz-table-height-fixed { + height: 220px; + overflow: hidden; } -md-list, -md-list-item, -wz-table { - &.active { - background-color: rgb(0,121,165); - color: white !important; - } +// Style for text who applies filters when hovering +.wz-table-hover:hover { + font-weight: bold; +} + +.wz-table-card-active { + background-color: rgb(0,121,165); + color: white !important; } diff --git a/public/templates/manager/ruleset/ruleset-decoders.html b/public/templates/manager/ruleset/ruleset-decoders.html index ae0776fb1..047a679bf 100644 --- a/public/templates/manager/ruleset/ruleset-decoders.html +++ b/public/templates/manager/ruleset/ruleset-decoders.html @@ -37,11 +37,11 @@ - Rules - Decoders diff --git a/public/templates/manager/ruleset/ruleset-rules.html b/public/templates/manager/ruleset/ruleset-rules.html index b3a9409e1..cfa9296a3 100644 --- a/public/templates/manager/ruleset/ruleset-rules.html +++ b/public/templates/manager/ruleset/ruleset-rules.html @@ -72,11 +72,11 @@ - Rules - Decoders