From 316c7b4dea5bfe5b915123fd08f4034f1ce40871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20=C3=81ngel?= <jesus.gonzalez@wazuh.com>
Date: Tue, 24 Jul 2018 15:08:37 +0200
Subject: [PATCH] Filtering syscollector output

---
 public/controllers/agents.js                  | 11 +++++++---
 .../templates/agents/agents-syscollector.html | 20 +++++++++++++++----
 public/templates/agents/agents.head           |  2 +-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/public/controllers/agents.js b/public/controllers/agents.js
index 52a8e891e..9dfd1712b 100644
--- a/public/controllers/agents.js
+++ b/public/controllers/agents.js
@@ -192,9 +192,14 @@ function (
 
             $scope.switchTab($scope.tab, true);
 
-            $scope.syscollector = {
-                hardware: data[3].data.data,
-                os: data[4].data.data
+            if(!data[3] || !data[3].data || !data[3].data.data || typeof data[3].data.data !== 'object' || !Object.keys(data[3].data.data).length ||
+               !data[4] || !data[4].data || !data[4].data.data || typeof data[4].data.data !== 'object' || !Object.keys(data[4].data.data).length){
+                $scope.syscollector = null;
+            } else {
+                $scope.syscollector = {
+                    hardware: data[3].data.data,
+                    os: data[4].data.data
+                };
             }
 
             $scope.load = false;
diff --git a/public/templates/agents/agents-syscollector.html b/public/templates/agents/agents-syscollector.html
index 3b582d35d..453395882 100644
--- a/public/templates/agents/agents-syscollector.html
+++ b/public/templates/agents/agents-syscollector.html
@@ -1,5 +1,17 @@
 <md-content flex layout="column" ng-if="tab === 'syscollector'" ng-show="!load">
-    <div layout="row" class="layout-padding">
+    <div layout="row" layout-align="layout-padding" ng-if="!syscollector">
+        <md-card flex class="wz-md-card" flex>
+            <md-card-content class="wz-text-center">
+                <i class="fa fa-fw fa-info-circle" aria-hidden="true"></i> <span class="wz-headline-title">Inventory disabled</span>
+                <md-divider class="wz-margin-top-10"></md-divider>
+                <div layout="column" class="wz-padding-top-10">
+                    <p>Inventory (syscollector) is disabled for this agent. Visit the documentation on <a target="_blank" href="https://documentation.wazuh.com/current/user-manual/reference/ossec-conf/wodle-syscollector.html">this link</a> to learn about how to enable it.
+                    </p>
+                </div>
+            </md-card-content>
+        </md-card>
+    </div>
+    <div layout="row" class="layout-padding" ng-if="syscollector">
         <md-card flex class="wz-md-card">
             <md-card-content>
                 <span class="wz-headline-title">OS information</span>
@@ -31,7 +43,7 @@
 
             </md-card-content>
         </md-card>
-        <md-card flex class="wz-md-card">
+        <md-card flex class="wz-md-card" ng-if="syscollector">
             <md-card-content>
                 <span class="wz-headline-title">Hardware information</span>
                 <md-divider class="wz-margin-top-10"></md-divider>
@@ -55,7 +67,7 @@
         </md-card>
     </div>
 
-    <div layout="row" class="md-padding">
+    <div layout="row" class="md-padding" ng-if="syscollector">
         <input placeholder="Filter packages..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid"
             aria-invalid="false" wz-enter="search(custom_search)">
         <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-40" ng-click="search(custom_search)">
@@ -63,7 +75,7 @@
         </button>
     </div>
 
-    <div layout="row" ng-if="agent" class="md-padding">
+    <div layout="row" ng-if="agent && syscollector" class="md-padding">
         <wazuh-table 
             flex 
             path="'/syscollector/' + agent.id + '/packages'" 
diff --git a/public/templates/agents/agents.head b/public/templates/agents/agents.head
index 7641ae8c5..a1cf29123 100644
--- a/public/templates/agents/agents.head
+++ b/public/templates/agents/agents.head
@@ -103,7 +103,7 @@
         <md-nav-item class="wz-nav-item" md-nav-click="switchTab('general')" name="general">General</md-nav-item>
         <md-nav-item class="wz-nav-item" md-nav-click="switchTab('fim')" name="fim">File integrity</md-nav-item>
         <md-nav-item class="wz-nav-item" md-nav-click="switchTab('configuration')" name="configuration">Configuration</md-nav-item>
-        <md-nav-item ng-show="syscollector && syscollector.os && syscollector.os.sysname" class="wz-nav-item" md-nav-click="switchTab('syscollector')" name="syscollector">Inventory</md-nav-item>
+        <md-nav-item class="wz-nav-item" md-nav-click="switchTab('syscollector')" name="syscollector">Inventory</md-nav-item>
     </md-nav-bar>
     <!-- End Host monitoring navigation bar -->