From b0ef1d14db39021d1063c435642b8228dee2da0c Mon Sep 17 00:00:00 2001
From: Adri Valle <adri9valle@gmail.com>
Date: Tue, 30 Apr 2019 18:19:44 +0200
Subject: [PATCH] Minor fixes (#685)

---
 .../appserver/static/css/styles/common.css    |  45 ++++++++
 .../integrity-monitoring.html                 |   2 +
 .../overview/sca/overview-sca.html            | 101 ++++++++++--------
 .../overview/sca/overviewSCACtrl.js           |  29 +++--
 .../js/directives/wz-table/wz-table.html      |  12 +--
 5 files changed, 130 insertions(+), 59 deletions(-)

diff --git a/SplunkAppForWazuh/appserver/static/css/styles/common.css b/SplunkAppForWazuh/appserver/static/css/styles/common.css
index 6072c2b8f..707b6faf2 100644
--- a/SplunkAppForWazuh/appserver/static/css/styles/common.css
+++ b/SplunkAppForWazuh/appserver/static/css/styles/common.css
@@ -1082,6 +1082,11 @@ md-toast {
   text-overflow: ellipsis;        
 }
 
+.wz-text-sca {
+  width: calc(100% - 100px) !important;
+  line-height: initial;
+}
+
 .wz-text-truncatable-container {
   overflow: hidden;
   width: auto;
@@ -1787,4 +1792,44 @@ label.wz-icon-loupe  input {
   margin: 10px 5px;
   display: block;
   color: gray;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > path:nth-child(6) {
+  visibility: hidden !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > path:nth-child(8) {
+  visibility: hidden !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > path:nth-child(10) {
+  visibility: hidden !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > path:nth-child(12) {
+  visibility: hidden !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > path:nth-child(14) {
+  visibility: hidden !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > path:nth-child(16) {
+  visibility: hidden !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > text:nth-child(20) {
+  font-size: 25px !important;
+}
+
+.wz-md-card:not(.fullscreen) .vis-sca #radialGauge > div > div > svg > text:not(:nth-child(20)) {
+  visibility: hidden !important;
+}
+
+.vis-sca .viz-panel {
+  width: 15% !important;
+}
+
+#scoreByPolicy .lazy-view-container {
+  height: 80% !important;
 }
\ No newline at end of file
diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/management/configuration/integrity-monitoring/integrity-monitoring.html b/SplunkAppForWazuh/appserver/static/js/controllers/management/configuration/integrity-monitoring/integrity-monitoring.html
index bef340b6a..2a93504ff 100644
--- a/SplunkAppForWazuh/appserver/static/js/controllers/management/configuration/integrity-monitoring/integrity-monitoring.html
+++ b/SplunkAppForWazuh/appserver/static/js/controllers/management/configuration/integrity-monitoring/integrity-monitoring.html
@@ -256,6 +256,8 @@
                 </wz-config-item>
                 <wz-config-item label="Recursion level" value="currentConfig['syscheck-syscheck'].syscheck.directories[selectedItem].recursion_level">
                 </wz-config-item>
+                <wz-config-item label="Follow symbolic link" value="currentConfig['syscheck-syscheck'].syscheck.directories[selectedItem].opts.includes('follow_symbolic_link') ? 'yes' : 'no'">
+                  </wz-config-item>
               </div>
 
             </div>
diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overview-sca.html b/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overview-sca.html
index 14b5cdbce..4a5948198 100644
--- a/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overview-sca.html
+++ b/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overview-sca.html
@@ -52,59 +52,51 @@
     <div>
 
 
-      
-        <div layout="row" layout-align="center stretch" style="height:300px;">
-            <md-card flex="25" class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
-              <md-card-content class="wazuh-column">
-                <span class="wz-headline-title">Overall Score
-                  <span class="wz-text-link" style="float:right;" ng-click="expand(5,'overallScore')"><i
-                      class="fa fa-fw fa-expand"></i></span>
-                </span>
-                <md-divider class="wz-margin-top-10"></md-divider>
-                <div id='overallScore'></div>
-              </md-card-content>
-            </md-card>
-
-            
-            <md-card flex="75" class="wz-md-card" ng-class="{'fullscreen': expandArray[6]}">
-                <md-card-content class="wazuh-column">
-                  <span class="wz-headline-title">Score by policy
-                    <span class="wz-text-link" style="float:right;" ng-click="expand(6,'scoreByPolicy')"><i
-                        class="fa fa-fw fa-expand"></i></span>
-                  </span>
-                  <md-divider class="wz-margin-top-10"></md-divider>
-                  <div id='scoreByPolicy'></div>
-                </md-card-content>
-              </md-card>
-          </div>
-
       <!-- First row -->
+      <div layout="row" layout-align="center stretch" style="height:300px;">
+        <md-card flex="100" class="wz-md-card" ng-class="{'fullscreen': expandArray[6]}">
+          <md-card-content class="wazuh-column">
+            <span class="wz-headline-title">Score by policy 
+              <span class="wz-text-link" style="float:right;" ng-click="expand(6,'scoreByPolicy')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
+            </span>
+            <md-divider class="wz-margin-top-10"></md-divider>
+            <div class="vis-sca" id='scoreByPolicy'></div>
+          </md-card-content>
+        </md-card>
+      </div>
+
+      <!-- Second row -->
       <div layout="row" layout-align="center stretch" class="height-390">
-        <md-card flex="30" class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
+        <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[0]}">
           <md-card-content class="wazuh-column">
             <span class="wz-headline-title">Results distribution
-              <span class="wz-text-link" style="float:right;" ng-click="expand(0,'resultDistribution')"><i
-                  class="fa fa-fw fa-expand"></i></span>
+              <span class="wz-text-link" style="float:right;" ng-click="expand(0,'resultDistribution')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
             </span>
             <md-divider class="wz-margin-top-10"></md-divider>
             <div id='resultDistribution'></div>
           </md-card-content>
         </md-card>
-        <md-card flex="35" class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
+        <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[1]}">
           <md-card-content class="wazuh-column">
             <span class="wz-headline-title">Top 5 passed checks
-              <span class="wz-text-link" style="float:right;" ng-click="expand(1,'top5Passed')"><i
-                  class="fa fa-fw fa-expand"></i></span>
+              <span class="wz-text-link" style="float:right;" ng-click="expand(1,'top5Passed')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
             </span>
             <md-divider class="wz-margin-top-10"></md-divider>
             <div id='top5Passed'></div>
           </md-card-content>
         </md-card>
-        <md-card flex="35" class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
+        <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[2]}">
           <md-card-content class="wazuh-column">
             <span class="wz-headline-title">Top 5 failed checks
-              <span class="wz-text-link" style="float:right;" ng-click="expand(2,'top5Failed')"><i
-                  class="fa fa-fw fa-expand"></i></span>
+              <span class="wz-text-link" style="float:right;" ng-click="expand(2,'top5Failed')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
             </span>
             <md-divider class="wz-margin-top-10"></md-divider>
             <div id='top5Failed'></div>
@@ -114,28 +106,51 @@
       </div>
 
 
-
-      <!-- Second row -->
+      <!-- Thrid row -->
       <div layout="row" layout-align="center stretch">
-        <md-card flex="100" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
+      <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[5]}">
+          <md-card-content class="wazuh-column">
+            <span class="wz-headline-title">Top 5 agents
+              <span class="wz-text-link" style="float:right;" ng-click="expand(5,'top5Agents')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
+            </span>
+            <md-divider class="wz-margin-top-10"></md-divider>
+            <div id='top5Agents'></div>
+          </md-card-content>
+        </md-card>
+        <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[3]}">
           <md-card-content class="wazuh-column">
             <span class="wz-headline-title">Result distribution by policy
-              <span class="wz-text-link" style="float:right;" ng-click="expand(3,'resultDistributionByPolicy')"><i
-                  class="fa fa-fw fa-expand"></i></span>
+              <span class="wz-text-link" style="float:right;" ng-click="expand(3,'resultDistributionByPolicy')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
             </span>
             <md-divider class="wz-margin-top-10"></md-divider>
             <div id='resultDistributionByPolicy'></div>
           </md-card-content>
         </md-card>
+        <md-card flex="33" class="wz-md-card" ng-class="{'fullscreen': expandArray[7]}">
+            <md-card-content class="wazuh-column">
+              <span class="wz-headline-title">Score evolution over time
+                <span class="wz-text-link" style="float:right;" ng-click="expand(7,'resultDistributionByPolicy')">
+                    <wz-svg icon="expand"></wz-svg>
+                </span>
+              </span>
+              <md-divider class="wz-margin-top-10"></md-divider>
+              <div id='overTimePolicy'></div>
+            </md-card-content>
+          </md-card>
       </div>
 
-      <!-- Third row -->
+      <!-- Fourth row -->
       <div layout="row" layout-align="center stretch" class="height-390">
         <md-card flex="100" class="wz-md-card" ng-class="{'fullscreen': expandArray[4]}">
           <md-card-content class="wazuh-column">
             <span class="wz-headline-title">Alerts summary
-              <span class="wz-text-link" style="float:right;" ng-click="expand(4,'alertsSummary')"><i
-                  class="fa fa-fw fa-expand"></i></span>
+              <span class="wz-text-link" style="float:right;" ng-click="expand(4,'alertsSummary')">
+                <wz-svg icon="expand"></wz-svg>
+              </span>
             </span>
             <md-divider class="wz-margin-top-10"></md-divider>
             <div id='alertsSummary'></div>
diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overviewSCACtrl.js b/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overviewSCACtrl.js
index f960b0604..00089e5c8 100644
--- a/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overviewSCACtrl.js
+++ b/SplunkAppForWazuh/appserver/static/js/controllers/overview/sca/overviewSCACtrl.js
@@ -17,6 +17,7 @@ define([
   '../../../services/visualizations/chart/gauge-chart',
   '../../../services/visualizations/chart/pie-chart',
   '../../../services/visualizations/chart/area-chart',
+  '../../../services/visualizations/chart/linear-chart',
   '../../../services/visualizations/table/table',
   '../../../services/visualizations/inputs/time-picker',
 ], function(
@@ -26,6 +27,7 @@ define([
   GaugeChart,
   PieChart,
   AreaChart,
+  LinearChart,
   Table,
   TimePicker,
 ) {
@@ -104,14 +106,6 @@ define([
         /**
          * Visualizations
          */ 
-        new SingleValue(
-          'overallScore',
-          `${
-            this.filters
-          }  | stats sum(data.sca.failed) as failed, sum(data.sca.passed) as passed | eval total=((passed/(failed+passed))*100) | eval total2=round(total,1) | eval total3=(total2 + "%") | table total3 `,
-          'overallScore',
-          this.scope
-        ),
         new GaugeChart(
           'scoreByPolicy',
           `${
@@ -154,6 +148,14 @@ define([
           'top5Failed',
           this.scope
         ),
+        new PieChart(
+          'top5Agents',
+          `${
+            this.filters
+          }  | top agent.name limit=5`,
+          'top5Agents',
+          this.scope 
+        ),
         new AreaChart( 
           'alertLevelEvolution',
           `${
@@ -162,11 +164,19 @@ define([
           'alertLevelEvolution',
           this.scope
         ),
+        new LinearChart(
+          'overTimePolicy',
+          `${
+            this.filters
+          } | timechart count by data.sca.policy`,
+          'overTimePolicy',
+          this.scope
+        ),
         new Table(
           'alertsSummary',
           `${
             this.filters
-          } | stats count by data.sca.policy,data.sca.passed,data.sca.failed | fields - count`,
+          } | stats count by data.sca.policy,data.sca.passed,data.sca.failed | fields - count | rename data.sca.policy as Policy data.sca.passed as Passed data.sca.failed as Failed | sort - Passed`,
           'alertsSummary',
           this.scope
         )
@@ -180,7 +190,6 @@ define([
           'Configuration assessment',
           this.filters,
           [
-            'overallScore',
             'scoreByPolicy',
             'resultDistribution',
             'alertsOverTime',
diff --git a/SplunkAppForWazuh/appserver/static/js/directives/wz-table/wz-table.html b/SplunkAppForWazuh/appserver/static/js/directives/wz-table/wz-table.html
index e83508c94..865af97a7 100644
--- a/SplunkAppForWazuh/appserver/static/js/directives/wz-table/wz-table.html
+++ b/SplunkAppForWazuh/appserver/static/js/directives/wz-table/wz-table.html
@@ -250,28 +250,28 @@
           <md-card>
             <div layout="column" ng-if="!item.result" class="wz-margin-top-10 expandedDiv">
                 <span class="tSize16">Check not applicable due to:</span>
-                <p class="wz-margin-top-10 pExpanded">{{ item.reason }}</p>
+                <p class="wz-margin-top-10 pExpanded wz-text-sca">{{ item.reason }}</p>
             </div>
             <div layout="column" ng-if="item.rationale" class="wz-margin-top-10 expandedDiv">
               <span class="tSize16">Rationale</span>
-              <p class="wz-margin-top-10 pExpanded">{{item.rationale}}</p>
+              <p class="wz-margin-top-10 pExpanded wz-text-sca">{{item.rationale}}</p>
             </div>
             <div layout="column" ng-if="item.remediation" class="wz-margin-top-10 expandedDiv">
               <span class="tSize16">Remediation</span>
-              <p class="wz-margin-top-10 pExpanded">{{item.remediation}}</p>
+              <p class="wz-margin-top-10 pExpanded wz-text-sca">{{item.remediation}}</p>
             </div>
             <div layout="column" ng-if="item.description" class="wz-margin-top-10 expandedDiv">
               <span class="tSize16">Description</span>
-              <p class="wz-margin-top-10 pExpanded">{{item.description}}</p>
+              <p class="wz-margin-top-10 pExpanded wz-text-sca">{{item.description}}</p>
             </div>
             <div layout="column" ng-if="item.directory" class="wz-margin-top-10 expandedDiv">
               <span class="tSize16">Path(s)</span>
-              <p class="wz-margin-top-10 pExpanded">{{ item.directory }}</p>
+              <p class="wz-margin-top-10 pExpanded wz-text-sca">{{ item.directory }}</p>
             </div>
             <div layout="column" ng-if="item.rules.length > 0" class="wz-margin-top-10 expandedDiv">
               <span class="tSize16">Checks</span>
               <ul class="noDot pExpanded">
-                <li ng-repeat="r in item.rules">
+                <li class="wz-text-sca wz-margin-top-20" ng-repeat="r in item.rules">
                   {{r.rule}}
                 </li>
               </ul>