Merge 3.11-7.4 (#1955)

* Fix missing fields in the Visualizations (#1913) * Fixed infinite load on Ciscat view (#1916) * Fixed infinite load on Ciscat-agent view (#1920) * Normalize the field whodata in the group reporting (#1921) * Fix registration guide (#1926) * Fix decoders file (#1929) * Add new table for windows hotfixes (#1932) * Remove visualizations legend (#1936) * XML validator false error for \< (#1895) * Add validator true to \< * Add to gitignore wazuh-registry * Minor Fix * Revert changes for package.json and gitignore
wazuh · Dec 13, 2019 · c583c05 · c583c05
1 parent 4c2db6a
commit c583c05
Show file tree

Hide file tree

Showing 11 changed files with 283 additions and 211 deletions.
diff --git a/public/controllers/agent/components/register-agent.js b/public/controllers/agent/components/register-agent.js
@@ -27,7 +27,8 @@ import {
   EuiCopy,
   EuiPage,
   EuiPageBody,
-  EuiCallOut
+  EuiCallOut,
+  EuiSpacer
 } from '@elastic/eui';
 
 import PropTypes from 'prop-types';
@@ -164,7 +165,7 @@ export class RegisterAgent extends Component {
         this.state.serverAddress
       }'${
         this.state.needsPassword
-          ? ` setenv WAZUH_PASSWORD '${this.state.wazuhPassword}' `
+          ? ` WAZUH_PASSWORD '${this.state.wazuhPassword}'`
           : ' '
       } && sudo installer -pkg ./wazuh-agent.pkg -target /`,
       winText: `Invoke-WebRequest -Uri https://packages.wazuh.com/3.x/windows/wazuh-agent-${
@@ -246,25 +247,26 @@ export class RegisterAgent extends Component {
       <div>
         <EuiPage restrictWidth="1000px" style={{ background: 'transparent' }}>
           <EuiPageBody>
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <EuiTitle>
-                  <h2>Deploy a new agent</h2>
-                </EuiTitle>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButtonEmpty
-                  size="s"
-                  onClick={() => this.props.addNewAgent(false)}
-                  iconType="cross"
-                >
-                  close
-                </EuiButtonEmpty>
-              </EuiFlexItem>
-            </EuiFlexGroup>
             <EuiFlexGroup>
               <EuiFlexItem>
                 <EuiPanel>
+                  <EuiFlexGroup>
+                    <EuiFlexItem>
+                      <EuiTitle>
+                        <h2>Deploy a new agent</h2>
+                      </EuiTitle>
+                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}>
+                      <EuiButtonEmpty
+                        size="s"
+                        onClick={() => this.props.addNewAgent(false)}
+                        iconType="cross"
+                      >
+                        close
+                      </EuiButtonEmpty>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                  <EuiSpacer></EuiSpacer>
                   <EuiFlexItem>
                     <EuiSteps steps={this.cleanSteps(steps)} />
                   </EuiFlexItem>

diff --git a/public/directives/wz-xml-file-editor/wz-xml-file-editor.js b/public/directives/wz-xml-file-editor/wz-xml-file-editor.js
@@ -88,6 +88,7 @@ app.directive('wzXmlFileEditor', function() {
           const text = $scope.xmlCodeBox.getValue();
           let xml = replaceIllegalXML(text);
           xml = xml.replace(/..xml.+\?>/, '');
+          xml = xml.replace(/\\</gm, '');
           const xmlDoc = parser.parseFromString(
             `<file>${xml}</file>`,
             'text/xml'

diff --git a/public/factories/tab-visualizations.js b/public/factories/tab-visualizations.js
@@ -22,7 +22,7 @@ export class TabVisualizations {
       pm: 4,
       vuls: 10,
       oscap: 13,
-      ciscat: 11,
+      ciscat: 3,
       audit: 9,
       gdpr: 6,
       pci: 6,
@@ -41,7 +41,7 @@ export class TabVisualizations {
       pm: 5,
       vuls: 10,
       oscap: 11,
-      ciscat: 11,
+      ciscat: 3,
       audit: 6,
       pci: 5,
       gdpr: 5,

diff --git a/public/less/common.less b/public/less/common.less
@@ -1002,7 +1002,6 @@ discover-app-w .container-fluid {
 .registerAgent{
   min-height: calc(~'100vh - 100px');
   background: #fafbfd;
-  padding-top: 25px;
 }
 
 .navBarLogo {

diff --git a/public/templates/agents/agents-syscollector.html b/public/templates/agents/agents-syscollector.html
diff --git a/public/templates/management/ruleset/files/files.html b/public/templates/management/ruleset/files/files.html
@@ -56,15 +56,15 @@ <h1 class="euiTitle euiTitle--medium">Manage {{mctrl.globalRulesetTab}} files</h
             </div>
         </div>
 
-                <wz-table ng-if="filesctrl.filesSubTab === 'rules' && mctrl.onlyLocalFiles" flex path="'/rules/files'"
+                <wz-table ng-if="mctrl.globalRulesetTab === 'rules' && mctrl.onlyLocalFiles" flex path="'/rules/files'"
                     implicit-filter="[{name: 'path', value: 'etc/rules'}]" keys="[{value: 'file', width: '25%'}]"
                     allow-click="true" row-sizes="[16,13,11]" implicit-sort="'path'" />
-                <wz-table ng-if="filesctrl.filesSubTab === 'rules' && !mctrl.onlyLocalFiles" flex path="'/rules/files'"
+                <wz-table ng-if="mctrl.globalRulesetTab === 'rules' && !mctrl.onlyLocalFiles" flex path="'/rules/files'"
                     keys="[{value: 'file', width: '25%'}]" allow-click="true" row-sizes="[16,13,11]" />
-                <wz-table ng-if="filesctrl.filesSubTab === 'decoders' && mctrl.onlyLocalFiles" flex
+                <wz-table ng-if="mctrl.globalRulesetTab === 'decoders' && mctrl.onlyLocalFiles" flex
                     path="'/decoders/files'" implicit-filter="[{name: 'path', value: 'etc/decoders'}]"
                     keys="[{value: 'file', width: '25%'}]" allow-click="true" row-sizes="[16,13,11]"  implicit-sort="'path'" />
-                <wz-table ng-if="filesctrl.filesSubTab === 'decoders' && !mctrl.onlyLocalFiles" flex
+                <wz-table ng-if="mctrl.globalRulesetTab === 'decoders' && !mctrl.onlyLocalFiles" flex
                     path="'/decoders/files'" keys="[{value: 'file', width: '25%'}]" allow-click="true"
                     row-sizes="[16,13,11]" implicit-sort="'file'" />
         </div>

diff --git a/server/controllers/wazuh-reporting.js b/server/controllers/wazuh-reporting.js
@@ -2045,6 +2045,7 @@ export class WazuhReportingCtrl {
                         row.push(x.path);
                         columns.forEach(y => {
                           if (y !== '') {
+                            y = y !== "check_whodata" ? y : 'whodata';
                             row.push(x[y] ? 'yes' : 'no');
                           }
                         });

diff --git a/server/integration-files/known-fields.js b/server/integration-files/known-fields.js
@@ -624,6 +624,24 @@ export const knownFields = [
     aggregatable: true,
     readFromDocValues: true
   },
+  {
+    name: 'data.aws.awsRegion',
+    type: 'string',
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true
+  },
+  {
+    name: 'data.aws.region',
+    type: 'string',
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true
+  },
   {
     name: 'data.aws.account_id',
     type: 'string',
@@ -3678,6 +3696,15 @@ export const knownFields = [
     aggregatable: true,
     readFromDocValues: true
   },
+  {
+    name: 'data.docker.Action',
+    type: 'string',
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true
+  },
   {
     name: 'data.docker.Actor.Attributes.container',
     type: 'string',
@@ -3731,5 +3758,14 @@ export const knownFields = [
     searchable: true,
     aggregatable: true,
     readFromDocValues: true
+  },
+  {
+    name: 'data.docker.Type',
+    type: 'string',
+    count: 0,
+    scripted: false,
+    searchable: true,
+    aggregatable: true,
+    readFromDocValues: true
   }
 ];
diff --git a/server/integration-files/visualizations/overview/overview-fim.js b/server/integration-files/visualizations/overview/overview-fim.js
@@ -16,7 +16,7 @@ export default [
     _source: {
       title: 'Events summary',
       visState:
-        '{"title":"Events summary","type":"line","params":{"type":"line","grid":{"categoryLines":true,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Alerts"}}],"seriesParams":[{"show":"true","type":"line","mode":"normal","data":{"label":"Alerts","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Alerts"}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp"}}]}',
+        '{"title":"Events summary","type":"line","params":{"type":"line","grid":{"categoryLines":true,"style":{"color":"#eee"}},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Alerts"}}],"seriesParams":[{"show":"true","type":"line","mode":"normal","data":{"label":"Alerts","id":"1"},"valueAxis":"ValueAxis-1","drawLinesBetweenPoints":true,"showCircles":true}],"addTooltip":true,"addLegend":false,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Alerts"}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp"}}]}',
       uiStateJSON: '{}',
       description: '',
       version: 1,

diff --git a/server/integration-files/visualizations/overview/overview-general.js b/server/integration-files/visualizations/overview/overview-general.js
@@ -209,7 +209,7 @@ export default [
     _source: {
       title: 'Alerts',
       visState:
-        '{"title":"Alerts","type":"area","params":{"type":"area","grid":{"categoryLines":true,"valueAxis":"ValueAxis-1"},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Alerts"}}],"seriesParams":[{"show":"true","type":"area","mode":"stacked","data":{"label":"Alerts","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"cardinal","valueAxis":"ValueAxis-1"}],"addTooltip":true,"addLegend":true,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Alerts"}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","timeRange":{"from":"now-15m","to":"now"},"useNormalizedEsInterval":true,"interval":"auto","time_zone":"Europe/Madrid","drop_partials":false,"customInterval":"2h","min_doc_count":1,"extended_bounds":{},"customLabel":""}}]}',
+        '{"title":"Alerts","type":"area","params":{"type":"area","grid":{"categoryLines":true,"valueAxis":"ValueAxis-1"},"categoryAxes":[{"id":"CategoryAxis-1","type":"category","position":"bottom","show":true,"style":{},"scale":{"type":"linear"},"labels":{"show":true,"truncate":100},"title":{}}],"valueAxes":[{"id":"ValueAxis-1","name":"LeftAxis-1","type":"value","position":"left","show":true,"style":{},"scale":{"type":"linear","mode":"normal"},"labels":{"show":true,"rotate":0,"filter":false,"truncate":100},"title":{"text":"Alerts"}}],"seriesParams":[{"show":"true","type":"area","mode":"stacked","data":{"label":"Alerts","id":"1"},"drawLinesBetweenPoints":true,"showCircles":true,"interpolate":"cardinal","valueAxis":"ValueAxis-1"}],"addTooltip":true,"addLegend":false,"legendPosition":"right","times":[],"addTimeMarker":false},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{"customLabel":"Alerts"}},{"id":"2","enabled":true,"type":"date_histogram","schema":"segment","params":{"field":"timestamp","timeRange":{"from":"now-15m","to":"now"},"useNormalizedEsInterval":true,"interval":"auto","time_zone":"Europe/Madrid","drop_partials":false,"customInterval":"2h","min_doc_count":1,"extended_bounds":{},"customLabel":""}}]}',
       uiStateJSON:
         '{"spy":{"mode":{"name":null,"fill":false}},"vis":{"legendOpen":false}}',
       description: '',

diff --git a/util/csv-key-equivalence.js b/util/csv-key-equivalence.js
@@ -119,5 +119,7 @@ export const KeyEquivalence = {
   compliance: 'Compliance',
   rules: 'Rules',
   reason: 'Reason',
-  registerIP: 'Register IP'
+  registerIP: 'Register IP',
+  'hotfix': 'Update code',
+  'scan.time': 'Registered by Wazuh at'
 };