Added metrics

SplunkAppForWazuh/appserver/static/js/controllers/overview/ciscat/ciscatCtrl.js

@@ -19,7 +19,9 @@ define([
       constructor($urlTokenModel, $scope, $currentDataService, $state) {
         this.scope = $scope
         this.state = $state
+        this.addFilter = $currentDataService.addFilter
         this.getFilters = $currentDataService.getSerializedFilters
+
         this.filters = this.getFilters()
         this.submittedTokenModel = $urlTokenModel.getSubmittedTokenModel()
         this.timePicker = new TimePicker('#timePicker',$urlTokenModel.handleValueChange)
@@ -44,22 +46,25 @@ define([
           /**
           * Metrics
           */
-          new SearchHandler(`lastNotChecked`,`${this.filters} sourcetype=wazuh rule.id=80790 | stats count`,`filesAddedToken`,'$result.count$','lastNotChecked',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastPass`,`${this.filters} sourcetype=wazuh rule.id=80784 | stats count`,`readFilesToken`,'$result.count$','lastPass',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastScanScore`,`${this.filters} sourcetype=wazuh rule.id=80781 | stats count`,`filesModifiedToken`,'$result.count$','lastScanScore',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastScanDate`,`${this.filters} sourcetype=wazuh rule.id=80791 | stats count`,'filesDeletedToken','$result.count$','lastScanDate',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastErrors`,`${this.filters} sourcetype=wazuh rule.id=80791 | stats count`,'filesDeletedToken','$result.count$','lastErrors',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastFails`,`${this.filters} sourcetype=wazuh rule.id=80791 | stats count`,'filesDeletedToken','$result.count$','lastFails',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastUknown`,`${this.filters} sourcetype=wazuh rule.id=80791 | stats count`,'filesDeletedToken','$result.count$','lastUknown',this.submittedTokenModel,this.scope),
-          new SearchHandler(`lastScanBenchmark`,`${this.filters} sourcetype=wazuh rule.id=80791 | stats count`,'filesDeletedToken','$result.count$','lastScanBenchmark',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastNotChecked`,`${this.filters} | search data.cis.notchecked=* | table data.cis.notchecked | head 1`,`filesAddedToken`,'$result.data.cis.notchecked$','lastNotChecked',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastPass`,`${this.filters} | search data.cis.pass=* | table data.cis.pass | head 1`,`lastPass`,'$result.data.cis.pass$','lastPass',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastScanScore`,`${this.filters} | search data.cis.score=* | table data.cis.score | head 1`,`lastScanScore`,'$result.data.cis.score$','lastScanScore',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastScanDate`,`${this.filters}  | search data.cis.timestamp=* | table data.cis.timestamp | head 1`,'lastScanDate','$result.data.cis.timestamp$','lastScanDate',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastErrors`,`${this.filters} | search data.cis.error=* | table data.cis.error | head 1`,'lastErrors','$result.data.cis.error$','lastErrors',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastFails`,`${this.filters} | search data.cis.fail=* | table data.cis.fail | head 1`,'lastFails','$result.data.cis.fail$','lastFails',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastUnknown`,`${this.filters} | search data.unknown.fail=* | table data.cis.unknown | head 1`,'lastUnknown','$result.data.cis.unknown$','lastUknown',this.submittedTokenModel,this.scope),
+          new SearchHandler(`lastScanBenchmark`,`${this.filters} rule.groups=ciscat | search data.cis.benchmark=* | table data.cis.benchmark | head 1`,'lastScanBenchmark','$result.data.cis.benchmark$','lastScanBenchmark',this.submittedTokenModel,this.scope),
           /**
           * Visualizations
           */
           new ColumnChart('topCiscatGroups',`${this.filters} sourcetype=wazuh rule.groups=\"ciscat\" | top data.cis.group`,'topCiscatGroups'),
-          new LinearChart('scanResultEvolution',`${this.filters} sourcetype=wazuh rule.groups=\"ciscat\" agent.name=* | top agent.name`,'scanResultEvolution'),
-          new Table('alertsSummary',`${this.filters} sourcetype=wazuh rule.groups=\"ciscat\" | stats count sparkline by data.cis.rule_title, data.cis.remediation,data.cis.group | sort count desc | rename "data.cis.rule_title" as "Title", rename " data.cis.remediation" as "Remediation", rename "data.cis.group" as "Group" `,'alertsSummary')
+          new LinearChart('scanResultEvolution',`${this.filters} sourcetype=wazuh rule.groups=\"ciscat\" | timechart count by data.cis.result usenull=f`,'scanResultEvolution'),
+          new Table('alertsSummary',`${this.filters} sourcetype=wazuh rule.groups=\"ciscat\" | stats count sparkline by data.cis.rule_title, data.cis.remediation,data.cis.group | sort count desc | rename "data.cis.rule_title" as "Title",  "data.cis.remediation" as "Remediation",  "data.cis.group" as "Group" `,'alertsSummary')
         ]
       }
+      $onInit(){
+        this.addFilter(`{"rule.groups":"ciscat", "implicit":true}`)
+      }
     }
     app.controller('ciscatCtrl', Audit)
   })

SplunkAppForWazuh/appserver/static/js/controllers/overview/ciscat/overview-ciscat.html

@@ -41,7 +41,7 @@
           <span class="wz-text-bold" ng-bind="lastFails"></span>
         </div>
         <div class="wz-text-truncatable" flex>Last unknown:
-          <span class="wz-text-bold" ng-bind="lastUknown"></span>
+          <span class="wz-text-bold" ng-bind="lastUnknown"></span>
         </div>
         <div class="wz-text-truncatable" flex>Last scan benchmark:
           <span class="wz-text-bold" ng-bind="lastScanBenchmark"></span>