3.9.3 Improve process table in inventory tab (#786)

wazuh · Jul 15, 2019 · 6155bb0 · 6155bb0
1 parent 7515357
commit 6155bb0
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ All notable changes to the Wazuh app for Splunk project will be documented in th
 
 - Support for Wazuh v3.9.3
 
+### Changed
+
+ - Extend information for syscollector [#785](https://github.com/wazuh/wazuh-splunk/issues/785)
+
 ### Fixed
 
 - Fixed agent bar that was not applying filters correctly when refreshing [#743](https://github.com/wazuh/wazuh-splunk/pull/743).

diff --git a/SplunkAppForWazuh/appserver/static/js/controllers/agents/inventory/inventory.html b/SplunkAppForWazuh/appserver/static/js/controllers/agents/inventory/inventory.html
@@ -197,13 +197,13 @@
         </div>
         <div layout="row" ng-if="agent && syscollector" class="wz-margin-top-10 wz-margin-bottom-40-inv">
           <wazuh-table flex ng-if="agent && agent.os && agent.os.platform === 'windows'"
-            path="'/syscollector/' + agent.id + '/processes'" row-sizes="[10,8,6]" extra-limit="100"
-            keys="['name','cmd','priority','nlwp']">
-          </wazuh-table>
-          <wazuh-table flex ng-if="agent && agent.os && agent.os.platform !== 'windows'"
-            path="'/syscollector/' + agent.id + '/processes'" row-sizes="[10,8,6]" extra-limit="100"
-            keys="['name','euser','nice','state']">
-          </wazuh-table>
+          path="'/syscollector/' + agent.id + '/processes'" row-sizes="[10,8,6]" extra-limit="100"
+          keys="['name','pid','ppid','cmd','vm_size','priority','nlwp']">
+        </wazuh-table>
+        <wazuh-table flex ng-if="agent && agent.os && agent.os.platform !== 'windows'"
+          path="'/syscollector/' + agent.id + '/processes'" row-sizes="[10,8,6]" extra-limit="100"
+          keys="['name','euser','egroup','pid','ppid','cmd','argvs','vm_size','size','session','nice','state']">
+        </wazuh-table>
         </div>
       </md-card-content>
       <div layout="row" class="ruleset-csv-formater formatted-div-inventory">

diff --git a/SplunkAppForWazuh/appserver/static/js/services/key-equivalence/keyEquivalenceService.js b/SplunkAppForWazuh/appserver/static/js/services/key-equivalence/keyEquivalenceService.js
@@ -78,7 +78,56 @@ define(['../module'], function(module) {
           expanded: 'Expanded',
           title: 'Title',
           result: 'Result',
-          agents: 'Agents'
+          agents: 'Agents',
+          'os.arch': 'OS version architecture',
+          'os.build': 'OS version build',
+          'os.codename': 'OS code name',
+          'os.major': 'OS version major',
+          'os.minor': 'OS version minor',
+          'os.platform': 'OS platform',
+          'os.uname': 'OS uname',
+          event: 'Event',
+          euser: 'Effective user',
+          egroup: 'Effective group',
+          vm_size: 'VM size',
+          processor: 'Processor',
+          session: 'Session',
+          tty: 'TTY',
+          pid: 'PID',
+          ppid: 'Parent PID',
+          argvs: 'Argvs',
+          nice: 'Priority',
+          size: 'Size',	
+          inode: 'Inode',
+          uid: 'User ID',
+          gid: 'Group ID',
+          mtime: 'Last modified',
+          priority: 'Priority',
+          cmd: 'CMD',
+          nlwp: 'NLWP',
+          references: 'References',
+          remediation: 'Remediation',
+          directory: 'Path(s)',
+          rationale: 'Rationale',
+          registry: 'Registry',
+          location: 'Location',
+          mtu: 'MTU',
+          t: 'tracing stop',
+          P: 'Parked',
+          I: 'Idle',
+          D: 'Uninterruptible sleep (usually IO)',
+          R: 'Running or runnable (on run queue)',
+          S: 'Interruptible sleep (waiting for an event to complete)',
+          T: 'Stopped, either by a job control signal or because it is being traced.',
+          W: 'paging (not valid since the 2.6.xx kernel)',
+          X: 'Dead (should never be seen)',
+          Z: 'Defunct ("zombie") process, terminated but not reaped by its parent.',
+          '<': 'High-priority (not nice to other users)',
+          N: 'Low-priority (nice to other users)',
+          L: 'Has pages locked into memory (for real-time and custom IO)',
+          s: 'Is a session leader',
+          l: 'Is multi-threaded (using CLONE_THREAD, like NPTL pthreads do)',
+          '+': 'Is in the foreground process group'
         }
       }
     }

diff --git a/SplunkAppForWazuh/default/package.conf b/SplunkAppForWazuh/default/package.conf
@@ -1,6 +1,6 @@
 [app]
 version = 3.9.3
-revision = 33 
+revision = 34
 
 [wazuh]
 version = 3.9.3