Adapt Syscollector for MacOS agents

wazuh · Jun 10, 2019 · a4bf7ef · a4bf7ef
1 parent d29347b
commit a4bf7ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/public/templates/agents/agents-syscollector.html b/public/templates/agents/agents-syscollector.html
@@ -66,7 +66,7 @@
                 </wz-table-eui>
             </md-card-content>
         </md-card>
-        <md-card flex class="wz-md-card">
+        <md-card flex class="wz-md-card" ng-if="agent && agent.os && agent.os.platform !== 'darwin'>
             <md-card-content>
                 <span class="wz-headline-title">
                     <react-component name="EuiIcon" props="{type:'inputOutput'}" /> Network ports
@@ -123,9 +123,13 @@
                 </div>
 
                 <div layout="row" ng-if="agent && syscollector && !load" class="wz-margin-top-10">
-                    <wz-table-eui flex ng-if="agent && agent.os && agent.os.platform !== 'windows'"
+                    <wz-table-eui flex
+                        ng-if="agent && agent.os && agent.os.platform !== 'windows' && agent.os.platform !== 'darwin'"
                         path="'/syscollector/' + agent.id + '/packages'" initial-sort-field="'name'"
                         keys="['name',{value:'architecture',width: '10%'},'version',{value:'vendor',width: '30%'},{value:'description',width: '30%'}]" />
+                    <wz-table-eui flex ng-if="agent && agent.os && agent.os.platform === 'darwin'"
+                        path="'/syscollector/' + agent.id + '/packages'" initial-sort-field="'name'"
+                        keys="['name','version','format',{value:'location',width: '30%'},{value:'description',width: '20%'}]" />
                     <wz-table-eui flex ng-if="agent && agent.os && agent.os.platform === 'windows'"
                         path="'/syscollector/' + agent.id + '/packages'"
                         keys="['name',{value:'architecture',width: '10%'},'version',{value:'vendor',width: '30%'}]" />
@@ -144,7 +148,7 @@
     </div>
 
     <div layout="row" class="layout-padding wz-padding-top-0"
-        ng-if="agent && agent.status === 'Active' && hasSize(syscollector)">
+        ng-if="agent && agent.status === 'Active' && hasSize(syscollector) && agent.os && agent.os.platform !== 'darwin'">
         <md-card flex class="wz-md-card">
             <md-card-content>
                 <span class="wz-headline-title">

diff --git a/util/csv-key-equivalence.js b/util/csv-key-equivalence.js
@@ -100,5 +100,6 @@ export const KeyEquivalenece = {
   rationale: 'Rationale',
   registry: 'Registry',
   date: 'Date',
-  value: 'Value'
+  value: 'Value',
+  location: 'Location'
 };