diff --git a/public/controllers/management/cdblists.js b/public/controllers/management/cdblists.js index c80cac42c..c7639d0db 100644 --- a/public/controllers/management/cdblists.js +++ b/public/controllers/management/cdblists.js @@ -241,7 +241,23 @@ export class CdbListsController { ); this.viewingDetail = false; this.currentList = false; + this.addingList = false; this.$scope.$emit('removeCurrentList'); if (!this.$scope.$$phase) this.$scope.$digest(); } + + addNewList() { + this.addingList = true; + this.currentList = { + name: '', + path: 'etc/lists/', + list: [], + new: true + }; + this.viewingDetail = true; + if (!this.$scope.$$phase) this.$scope.$digest(); + this.$scope.$broadcast('changeCdbList', { + currentList: this.currentList + }); + } } diff --git a/public/controllers/management/configuration.js b/public/controllers/management/configuration.js index e9aa5b5ee..90fdaa29a 100644 --- a/public/controllers/management/configuration.js +++ b/public/controllers/management/configuration.js @@ -35,6 +35,7 @@ export class ConfigurationController { this.$scope.configurationSubTab = ''; this.$scope.integrations = {}; this.$scope.selectedItem = 0; + this.$scope.showHelp = false; } /** @@ -98,6 +99,7 @@ export class ConfigurationController { * Navigate to configuration */ this.$scope.switchConfigurationTab = (configurationTab, navigate) => { + this.$scope.editionTab = ''; this.$scope.navigate = navigate; this.configurationHandler.switchConfigurationTab( configurationTab, diff --git a/public/controllers/management/decoders.js b/public/controllers/management/decoders.js index ba24f18dd..85af2c682 100644 --- a/public/controllers/management/decoders.js +++ b/public/controllers/management/decoders.js @@ -43,6 +43,7 @@ export class DecodersController { this.wzTableFilter = wzTableFilter; this.wazuhConfig = wazuhConfig; this.rulesetHandler = rulesetHandler; + this.showingLocalDecoders = false; } /** @@ -213,34 +214,34 @@ export class DecodersController { } async editDecodersConfig() { - this.$scope.editingFile = true; + this.editingFile = true; try { - this.$scope.fetchedXML = await this.rulesetHandler.getDecoderConfiguration( + this.fetchedXML = await this.rulesetHandler.getDecoderConfiguration( this.currentDecoder.file ); this.$location.search('editingFile', true); this.appState.setNavigation({ status: true }); if (!this.$scope.$$phase) this.$scope.$digest(); - this.$scope.$broadcast('fetchedFile', { data: this.$scope.fetchedXML }); + this.$scope.$broadcast('fetchedFile', { data: this.fetchedXML }); } catch (error) { - this.$scope.fetchedXML = null; + this.fetchedXML = null; this.errorHandler.handle(error, 'Fetch file error'); } } closeEditingFile() { - this.$scope.editingFile = false; + this.editingFile = false; this.appState.setNavigation({ status: true }); this.$scope.$broadcast('closeEditXmlFile', {}); } xmlIsValid(valid) { - this.$scope.xmlHasErrors = valid; + this.xmlHasErrors = valid; if (!this.$scope.$$phase) this.$scope.$digest(); } doSaveDecoderConfig() { - this.$scope.editingFile = false; + this.editingFile = false; this.$scope.$broadcast('saveXmlFile', { decoder: this.currentDecoder }); } @@ -270,4 +271,72 @@ export class DecodersController { this.$scope.$emit('removeCurrentDecoder'); if (!this.$scope.$$phase) this.$scope.$digest(); } + + addNewFile(type) { + this.editingFile = true; + this.newFile = true; + this.newFileName = ''; + this.selectedFileName = this.selectedRulesetTab; + this.selectedItem = { file: 'new file' }; + this.fetchedXML = ''; + this.type = type; + if (!this.$scope.$$phase) this.$scope.$digest(); + this.$location.search('editingFile', true); + this.appState.setNavigation({ status: true }); + this.$scope.$emit('fetchedFile', { data: this.fetchedXML }); + } + + doSaveConfig(isNewFile, fileName) { + const clusterInfo = this.appState.getClusterInfo(); + const showRestartManager = + clusterInfo.status === 'enabled' ? 'cluster' : 'manager'; + if (isNewFile && !fileName) { + this.errorHandler.handle( + 'You need to specify a file name', + 'Error creating a new file.' + ); + return false; + } else { + if (isNewFile) { + const validFileName = /(.+).xml/; + const containsNumber = /.*[0-9].*/; + if (fileName && !validFileName.test(fileName)) { + fileName = fileName + '.xml'; + } + if (containsNumber.test(fileName)) { + this.errorHandler.handle( + 'The filename can not contain numbers', + 'Error creating a new file.' + ); + return false; + } + this.selectedItem = { file: fileName }; + if (this.type === 'rules') { + this.$scope.$broadcast('saveXmlFile', { + rule: this.selectedItem, + showRestartManager + }); + } else if (this.type === 'decoders') { + this.$scope.$broadcast('saveXmlFile', { + decoder: this.selectedItem, + showRestartManager + }); + } + } else { + const objParam = + this.selectedRulesetTab === 'rules' + ? { + rule: this.selectedItem, + showRestartManager + } + : { + decoder: this.selectedItem, + showRestartManager + }; + this.$scope.$broadcast('saveXmlFile', objParam); + } + //$scope.editingFile = false; + //$scope.fetchedXML = null; + } + } } diff --git a/public/controllers/management/edition.js b/public/controllers/management/edition.js index 04b2a73bf..adf9167cc 100644 --- a/public/controllers/management/edition.js +++ b/public/controllers/management/edition.js @@ -162,8 +162,6 @@ export class EditionController { this.$scope.editConf(); }; - this.$scope.closeEditingFile = () => {}; - //listeners this.$scope.$on('wazuhShowNode', (event, parameters) => { return this.$scope.edit(parameters.node); diff --git a/public/controllers/management/management.js b/public/controllers/management/management.js index 3a4c0ef05..d37b15201 100644 --- a/public/controllers/management/management.js +++ b/public/controllers/management/management.js @@ -87,11 +87,11 @@ export class ManagementController { this.$scope.$on('removeCurrentConfiguration', () => { this.currentConfiguration = false; }); - this.$scope.$on('setRestarting', () => { + this.$rootScope.$on('setRestarting', () => { this.isRestarting = true; this.$scope.$applyAsync(); }); - this.$scope.$on('removeRestarting', () => { + this.$rootScope.$on('removeRestarting', () => { this.isRestarting = false; this.$scope.$applyAsync(); }); diff --git a/public/controllers/management/rules.js b/public/controllers/management/rules.js index 27b428dd7..2650e6c13 100644 --- a/public/controllers/management/rules.js +++ b/public/controllers/management/rules.js @@ -25,6 +25,10 @@ export function RulesController( wazuhConfig, rulesetHandler ) { + $scope.showingLocalRules = false; + $scope.switchLocalRules = () => + ($scope.showingLocalRules = !$scope.showingLocalRules); + $scope.isObject = item => typeof item === 'object'; $scope.appliedFilters = []; @@ -239,16 +243,19 @@ export function RulesController( errorHandler.handle(error, 'Fetch file error'); } }; + $scope.closeEditingFile = () => { $scope.editingFile = false; appState.setNavigation({ status: true }); $scope.$broadcast('closeEditXmlFile', {}); if (!$scope.$$phase) $scope.$digest(); }; + $scope.xmlIsValid = valid => { $scope.xmlHasErrors = valid; if (!$scope.$$phase) $scope.$digest(); }; + $scope.doSaveRuleConfig = () => { $scope.$broadcast('saveXmlFile', { rule: $scope.currentRule }); }; @@ -292,4 +299,72 @@ export function RulesController( ) ); } + + $scope.addNewFile = type => { + $scope.editingFile = true; + $scope.newFile = true; + $scope.newFileName = ''; + $scope.selectedFileName = $scope.selectedRulesetTab; + $scope.selectedItem = { file: 'new file' }; + $scope.fetchedXML = ''; + $scope.type = type; + if (!$scope.$$phase) $scope.$digest(); + $location.search('editingFile', true); + appState.setNavigation({ status: true }); + $scope.$emit('fetchedFile', { data: $scope.fetchedXML }); + }; + + $scope.doSaveConfig = (isNewFile, fileName) => { + const clusterInfo = appState.getClusterInfo(); + const showRestartManager = + clusterInfo.status === 'enabled' ? 'cluster' : 'manager'; + if (isNewFile && !fileName) { + errorHandler.handle( + 'You need to specify a file name', + 'Error creating a new file.' + ); + return false; + } else { + if (isNewFile) { + const validFileName = /(.+).xml/; + const containsNumber = /.*[0-9].*/; + if (fileName && !validFileName.test(fileName)) { + fileName = fileName + '.xml'; + } + if (containsNumber.test(fileName)) { + this.errorHandler.handle( + 'The filename can not contain numbers', + 'Error creating a new file.' + ); + return false; + } + $scope.selectedItem = { file: fileName }; + if ($scope.type === 'rules') { + $scope.$broadcast('saveXmlFile', { + rule: $scope.selectedItem, + showRestartManager + }); + } else if ($scope.type === 'decoders') { + $scope.$broadcast('saveXmlFile', { + decoder: $scope.selectedItem, + showRestartManager + }); + } + } else { + const objParam = + $scope.selectedRulesetTab === 'rules' + ? { + rule: $scope.selectedItem, + showRestartManager + } + : { + decoder: $scope.selectedItem, + showRestartManager + }; + $scope.$broadcast('saveXmlFile', objParam); + } + //$scope.editingFile = false; + //$scope.fetchedXML = null; + } + }; } diff --git a/public/directives/wz-list-manage/wz-list-manage.html b/public/directives/wz-list-manage/wz-list-manage.html index bdb8d9920..d90231479 100644 --- a/public/directives/wz-list-manage/wz-list-manage.html +++ b/public/directives/wz-list-manage/wz-list-manage.html @@ -1,7 +1,7 @@
{ $mdDialog.hide(); $('body').removeClass('md-dialog-body'); }; $scope.confirmDialog = () => { + rootScope.$emit('setRestarting', {}); + scope.$applyAsync(); $mdDialog.hide(); - $scope.myScope.$emit('setRestarting', {}); if (target === 'manager') { configHandler .restartManager() .then(data => { $('body').removeClass('md-dialog-body'); - myError.info( + errorHandler.info( 'It may take a few seconds...', data.data.data ); - $scope.myScope.$applyAsync(); + rootScope.$emit('removeRestarting', {}); + scope.$applyAsync(); }) .catch(error => { - $scope.myScope.$emit('setRestarting', {}); - myError.handle( + rootScope.$emit('removeRestarting', {}); + errorHandler.handle( error.message || error, 'Error restarting manager' ); @@ -219,21 +222,21 @@ app.directive('wzListManage', function() { .restartCluster() .then(data => { $('body').removeClass('md-dialog-body'); - myError.info( + errorHandler.info( 'It may take a few seconds...', data.data.data ); - $scope.myScope.$applyAsync(); + rootScope.$emit('removeRestarting', {}); + scope.$applyAsync(); }) .catch(error => { - $scope.myScope.$emit('setRestarting', {}); - myError.handle( + rootScope.$emit('removeRestarting', {}); + errorHandler.handle( error.message || error, 'Error restarting cluster' ); }); } - $scope.myScope.$emit('removeRestarting', {}); }; }, template: @@ -256,8 +259,9 @@ app.directive('wzListManage', function() { clickOutsideToClose: true, disableParentScroll: true, locals: { - myScope: $scope, - myError: errorHandler + scope: $scope, + errorHandler: errorHandler, + rootScope: $rootScope } }); $('body').addClass('md-dialog-body'); diff --git a/public/directives/wz-multiple-selector/wz-multiple-selector.html b/public/directives/wz-multiple-selector/wz-multiple-selector.html index 1a5e1d913..641513794 100644 --- a/public/directives/wz-multiple-selector/wz-multiple-selector.html +++ b/public/directives/wz-multiple-selector/wz-multiple-selector.html @@ -24,21 +24,21 @@
- - - -
diff --git a/public/directives/wz-table/lib/parse-value.js b/public/directives/wz-table/lib/parse-value.js index 2f449fe05..a0604526a 100644 --- a/public/directives/wz-table/lib/parse-value.js +++ b/public/directives/wz-table/lib/parse-value.js @@ -36,6 +36,11 @@ export function parseValue(key, item, instancePath) { ) { return '-'; } + + if ((item || {})[key] === '(null)') { + return '-'; + } + const isComposedString = typeof key === 'string' && key.includes('.'); const isComposedObject = typeof key === 'object' && key.value && key.value.includes('.'); 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 index 2d5c5c89c..d6f0c8d78 100644 --- a/public/directives/wz-xml-file-editor/wz-xml-file-editor.js +++ b/public/directives/wz-xml-file-editor/wz-xml-file-editor.js @@ -28,6 +28,7 @@ app.directive('wzXmlFileEditor', function() { }, controller( $scope, + $rootScope, $document, $location, $mdDialog, @@ -258,19 +259,20 @@ app.directive('wzXmlFileEditor', function() { const confirm = $mdDialog.confirm({ controller: function( $scope, - myScope, - myError, + scope, + errorHandler, + rootScope, $mdDialog, configHandler, apiReq ) { - $scope.myScope = myScope; $scope.closeDialog = () => { $mdDialog.hide(); $('body').removeClass('md-dialog-body'); }; $scope.confirmDialog = async () => { - $scope.myScope.$emit('setRestarting', {}); + rootScope.$emit('setRestarting', {}); + scope.$applyAsync(); $mdDialog.hide(); const clusterStatus = await apiReq.request( 'GET', @@ -289,43 +291,45 @@ app.directive('wzXmlFileEditor', function() { try { const data = await configHandler.restartManager(); $('body').removeClass('md-dialog-body'); - myError.info('It may take a few seconds...', data.data.data); - $scope.myScope.$applyAsync(); + errorHandler.info('It may take a few seconds...', data.data.data); + rootScope.$emit('removeRestarting', {}); + scope.$applyAsync(); } catch (error) { - myError.handle( + errorHandler.handle( error.message || error, 'Error restarting manager' ); - $scope.myScope.$emit('removeRestarting', {}); + rootScope.$emit('removeRestarting', {}); } } else if (target === 'cluster') { try { const data = await configHandler.restartCluster(); $('body').removeClass('md-dialog-body'); - myError.info('It may take a few seconds...', data.data.data); - $scope.myScope.$applyAsync(); + errorHandler.info('It may take a few seconds...', data.data.data); + rootScope.$emit('removeRestarting', {}); + scope.$applyAsync(); } catch (error) { - myError.handle( + errorHandler.handle( error.message || error, 'Error restarting cluster' ); - $scope.myScope.$emit('removeRestarting', {}); + rootScope.$emit('removeRestarting', {}); } } else { try { const data = await configHandler.restartNode(target); $('body').removeClass('md-dialog-body'); - myError.info('It may take a few seconds...', data.data.data); - $scope.myScope.$applyAsync(); + errorHandler.info('It may take a few seconds...', data.data.data); + rootScope.$emit('removeRestarting', {}); + scope.$applyAsync(); } catch (error) { - myError.handle( + errorHandler.handle( error.message || error, 'Error restarting node' ); - $scope.myScope.$emit('removeRestarting', {}); + rootScope.$emit('removeRestarting', {}); } } - $scope.myScope.$emit('removeRestarting', {}); }; }, template: @@ -348,8 +352,9 @@ app.directive('wzXmlFileEditor', function() { clickOutsideToClose: true, disableParentScroll: true, locals: { - myScope: $scope, - myError: errorHandler + scope: $scope, + errorHandler: errorHandler, + rootScope: $rootScope } }); $('body').addClass('md-dialog-body'); @@ -359,7 +364,7 @@ app.directive('wzXmlFileEditor', function() { $scope.$on('saveXmlFile', (ev, params) => saveFile(params)); $scope.$on('$destroy', function() { - $location.search('editingFile', null); + //$location.search('editingFile', null); }); }, template diff --git a/public/img/icon.svg b/public/img/icon.svg index 5823a570e..d39597317 100644 --- a/public/img/icon.svg +++ b/public/img/icon.svg @@ -1,4 +1,5 @@ - - - - wazuh_blue_full copiaLayer 1 \ No newline at end of file + + + + + diff --git a/public/img/icon_filled.svg b/public/img/icon_filled.svg new file mode 100644 index 000000000..5823a570e --- /dev/null +++ b/public/img/icon_filled.svg @@ -0,0 +1,4 @@ + + + + wazuh_blue_full copiaLayer 1 \ No newline at end of file diff --git a/public/less/typography.less b/public/less/typography.less index 02df4ffb7..35995f534 100644 --- a/public/less/typography.less +++ b/public/less/typography.less @@ -126,6 +126,15 @@ html, body, button:not(.fa):not(.fa-times), textarea, input, select, .wz-chip { } } +.wz-text-link-add { + cursor: pointer !important; + color: #006BB4 !important; + + &:hover { + text-decoration: none !important; + } +} + .wz-text-active { color: rgb(0, 121, 165); font-weight: bold; diff --git a/public/templates/agents/agents-fim.html b/public/templates/agents/agents-fim.html index 661bf2ad2..5a9c663f3 100644 --- a/public/templates/agents/agents-fim.html +++ b/public/templates/agents/agents-fim.html @@ -1,33 +1,34 @@ - +
- Show files + Show files
- - - Most active users - - - - - - - Actions - - - - + + + Most active users + + + + + + + Actions + + + + - - - Events - - - - + + + Events + + + +
@@ -69,13 +70,19 @@
- Show alerts + Show alerts
- + This agent is never connected.
@@ -94,12 +101,14 @@
- +
- Formatted + Formatted +
@@ -118,12 +127,14 @@
- +
- Formatted + Formatted +
@@ -147,7 +158,8 @@
- Formatted + Formatted +
diff --git a/public/templates/agents/agents-welcome.html b/public/templates/agents/agents-welcome.html index 1b1a9424d..230b1d289 100644 --- a/public/templates/agents/agents-welcome.html +++ b/public/templates/agents/agents-welcome.html @@ -17,50 +17,62 @@
-
+
{{ agent.name || '-' }} + +
-
- Details -
- +
+
+ Details +
+
- Name + Name {{ agent.name || '-' }}
- IP + IP {{ agent.ip || '-'}}
- Version + Version {{ agent.version || '-'}}
- OS + OS {{ agentOS || '-'}} Full OS name: {{ agentOS || '-'}}
+
-
- Last keep alive - {{agent.lastKeepAlive || '-' }} +
+ Groups
-
- Registration date - {{agent.dateAdd || '-'}} + +
+
+ Available groups: +
+
+ There are no more groups available. +
Last syscheck scan @@ -87,64 +99,6 @@
-
- Groups -
- -
-
- Available groups: -
-
- There are no more groups available. -
-
-
- {{ - group }}  -
- -
-
- Group {{addingGroupToAgent}} will be added to - agent {{agent.id}} -
-
- Cancel - Confirm -
-
-
- {{ - group }}  -
- - -
- -
- - -
- Actions -
- -
- - -
diff --git a/public/templates/agents/agents.head b/public/templates/agents/agents.head index 752c3c07c..08755ffa6 100644 --- a/public/templates/agents/agents.head +++ b/public/templates/agents/agents.head @@ -39,7 +39,8 @@ / {{agent.name}} ({{agent.id}}) / - {{ tabNames[tab] }} + {{ + tabNames[tab] }} / {{ tabNames[configurationTab] === 'Alerts' ? 'Labels' : tabNames[configurationTab] }}
@@ -58,7 +59,9 @@
- +
@@ -67,12 +70,14 @@
- + Dashboard - + Discover
@@ -80,24 +85,18 @@
- + - {{agentAutoComplete.name}} ({{agentAutoComplete.id}}) + {{agentAutoComplete.name}} + ({{agentAutoComplete.id}}) - {{agentAutoComplete.ip}} ({{agentAutoComplete.status}}) + + {{agentAutoComplete.ip}} ({{agentAutoComplete.status}}) @@ -106,65 +105,50 @@
- - - - - - -
- + {{ tabNames['general'] }} {{ tabNames['fim'] }} - {{ tabNames['syscollector'] }} + {{ + tabNames['syscollector'] }} - + {{ tabNames['pm'] }} - {{ tabNames['audit'] }} - {{ tabNames['oscap'] }} - {{ tabNames['ciscat'] }} - + {{ + tabNames['audit'] }} + {{ + tabNames['oscap'] }} + {{ + tabNames['ciscat'] }} + - + {{ tabNames['vuls'] }} - {{ tabNames['virustotal'] }} - {{ tabNames['osquery'] }} + {{ + tabNames['virustotal'] }} + {{ + tabNames['osquery'] }} - - {{ tabNames['pci'] }} - {{ tabNames['gdpr'] }} + + {{ + tabNames['pci'] }} + {{ + tabNames['gdpr'] }} @@ -173,28 +157,38 @@ -
+
{{loadingStatus}}
-
+
{{reportStatus}}
-
+
- Show files -
-
+ Show files +
+
- + There are no results for selected time range. Try another one.
@@ -204,4 +198,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/active-response/active-response.html b/public/templates/management/configuration/active-response/active-response.html index 57caa5481..0510bd74d 100644 --- a/public/templates/management/configuration/active-response/active-response.html +++ b/public/templates/management/configuration/active-response/active-response.html @@ -2,14 +2,8 @@
- - + + @@ -39,7 +33,8 @@
- {{ item.command }} + {{ + item.command }}
@@ -49,37 +44,21 @@
- + - + - + - + - + - + - + - +
@@ -98,16 +77,18 @@ - - + + + More info about this section - Active response documentation - Active response reference + Active + response documentation + Active + response reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/active-response/agents-active-response.html b/public/templates/management/configuration/active-response/agents-active-response.html index f6a0c12d9..86634ab94 100644 --- a/public/templates/management/configuration/active-response/agents-active-response.html +++ b/public/templates/management/configuration/active-response/agents-active-response.html @@ -2,14 +2,8 @@
- - + + @@ -35,22 +29,13 @@
- + - + - + - +
@@ -66,16 +51,18 @@ - - + + + More info about this section - Active response documentation - Active response reference + Active + response documentation + Active + response reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/active-response/commands.html b/public/templates/management/configuration/active-response/commands.html index e0ae1444a..e22226782 100644 --- a/public/templates/management/configuration/active-response/commands.html +++ b/public/templates/management/configuration/active-response/commands.html @@ -2,14 +2,8 @@
- - + + @@ -22,7 +16,8 @@
Command definitions
- Find here all the currently defined commands used for Active response + Find here all the currently defined commands used for + Active response
@@ -49,25 +44,15 @@
- + - + - + - + - +
@@ -85,16 +70,18 @@ - - + + + More info about this section - Active response documentation - Commands reference + Active + response documentation + Commands + reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/agentless/agentless.html b/public/templates/management/configuration/agentless/agentless.html index b7926fcd2..1763f4a35 100644 --- a/public/templates/management/configuration/agentless/agentless.html +++ b/public/templates/management/configuration/agentless/agentless.html @@ -18,10 +18,7 @@
- + @@ -51,7 +48,8 @@
- {{ item.type }} ({{ item.state }}) + {{ + item.type }} ({{ item.state }})
@@ -61,26 +59,15 @@
- + - + - + - + - +
@@ -98,13 +85,15 @@ - - + + + More info about this section - How to monitor agentless devices - Agentless reference + How + to monitor agentless devices + Agentless + reference @@ -112,4 +101,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/alerts/email-alerts.html b/public/templates/management/configuration/alerts/email-alerts.html index ccb72c1f2..77252b79e 100644 --- a/public/templates/management/configuration/alerts/email-alerts.html +++ b/public/templates/management/configuration/alerts/email-alerts.html @@ -2,14 +2,8 @@
- - + + @@ -48,37 +42,21 @@
- + - + - + - + - + - + - + - +
@@ -96,17 +74,20 @@ - - + + + More info about this section - How to configure email alerts - How to configure authenticated SMTP server - Email alerts reference + How + to configure email alerts + How + to configure authenticated SMTP server + Email + alerts reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/alerts/general-alerts.html b/public/templates/management/configuration/alerts/general-alerts.html index 5a45e95ee..f0c19b5dc 100644 --- a/public/templates/management/configuration/alerts/general-alerts.html +++ b/public/templates/management/configuration/alerts/general-alerts.html @@ -2,14 +2,8 @@
- - + + @@ -35,17 +29,11 @@
- + - + - +
@@ -60,16 +48,18 @@ - - + + + More info about this section - Use cases about alerts generation - Alerts reference + Use + cases about alerts generation + Alerts + reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/alerts/labels.html b/public/templates/management/configuration/alerts/labels.html index 3805f1021..21734be91 100644 --- a/public/templates/management/configuration/alerts/labels.html +++ b/public/templates/management/configuration/alerts/labels.html @@ -2,14 +2,8 @@
- - + + @@ -57,16 +51,18 @@ - - + + + More info about this section - Labels documentation - Labels reference + Labels + documentation + Labels + reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/alerts/reports.html b/public/templates/management/configuration/alerts/reports.html index 583ee99fa..ca3074ecd 100644 --- a/public/templates/management/configuration/alerts/reports.html +++ b/public/templates/management/configuration/alerts/reports.html @@ -2,14 +2,8 @@
- - + + @@ -39,7 +33,8 @@
- {{ item.title }} + {{ + item.title }}
@@ -49,46 +44,25 @@
- + - + - + - + - + - + - + - + - + - +
@@ -107,16 +81,18 @@ - - + + + More info about this section - How to generate automatic reports - Reports reference + How + to generate automatic reports + Reports + reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/alerts/syslog.html b/public/templates/management/configuration/alerts/syslog.html index b535546e3..5925fad59 100644 --- a/public/templates/management/configuration/alerts/syslog.html +++ b/public/templates/management/configuration/alerts/syslog.html @@ -2,14 +2,8 @@
- - + + @@ -72,16 +66,18 @@ - - + + + More info about this section - How to configure the syslog output - Syslog output reference + How + to configure the syslog output + Syslog + output reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/amazon-s3/amazon-s3.foot b/public/templates/management/configuration/amazon-s3/amazon-s3.foot index ee5366c4b..05ce3d42d 100644 --- a/public/templates/management/configuration/amazon-s3/amazon-s3.foot +++ b/public/templates/management/configuration/amazon-s3/amazon-s3.foot @@ -5,9 +5,10 @@ - + + More info about this section Using Wazuh to monitor AWS Amazon S3 module reference diff --git a/public/templates/management/configuration/cis-cat/cis-cat.foot b/public/templates/management/configuration/cis-cat/cis-cat.foot index f50cd93b2..6761b9ec9 100644 --- a/public/templates/management/configuration/cis-cat/cis-cat.foot +++ b/public/templates/management/configuration/cis-cat/cis-cat.foot @@ -5,9 +5,10 @@ - + + More info about this section CIS-CAT module documentation CIS-CAT module reference diff --git a/public/templates/management/configuration/client-buffer/client-buffer.html b/public/templates/management/configuration/client-buffer/client-buffer.html index 9b2e5f74f..b9cc7f6b2 100644 --- a/public/templates/management/configuration/client-buffer/client-buffer.html +++ b/public/templates/management/configuration/client-buffer/client-buffer.html @@ -4,8 +4,10 @@
Anti-flooding settings - Enabled - Disabled + Enabled + Disabled
Agent bucket parameters to avoid event flooding
@@ -20,14 +22,8 @@
- - + + @@ -40,7 +36,8 @@
Main settings
- These settings determine the event processing rate for the agent + These settings determine the event processing rate for + the agent
@@ -53,17 +50,11 @@
- + - + - +
@@ -78,13 +69,15 @@ - - + + + More info about this section - Anti-flooding mechanism - Client buffer reference + Anti-flooding + mechanism + Client + buffer reference @@ -92,4 +85,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/client/client.html b/public/templates/management/configuration/client/client.html index 78e6043d6..e320ba04e 100644 --- a/public/templates/management/configuration/client/client.html +++ b/public/templates/management/configuration/client/client.html @@ -18,10 +18,7 @@
- + @@ -47,29 +44,18 @@
- + - - + - + - + - @@ -114,13 +100,15 @@ - - + + + More info about this section - Checking connection with manager - Client reference + Checking + connection with manager + Client + reference @@ -128,4 +116,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/cluster/cluster.html b/public/templates/management/configuration/cluster/cluster.html index dad920333..a3b5da73b 100644 --- a/public/templates/management/configuration/cluster/cluster.html +++ b/public/templates/management/configuration/cluster/cluster.html @@ -19,10 +19,7 @@
- + @@ -45,38 +42,21 @@
- + - + - + - + - + - + - + - +
@@ -91,13 +71,15 @@ - - + + + More info about this section - How to configure the Wazuh cluster - Wazuh cluster reference + How + to configure the Wazuh cluster + Wazuh + cluster reference @@ -105,4 +87,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/config-edition/config-edition.html b/public/templates/management/configuration/config-edition/config-edition.html index abc061f1b..1153a5140 100644 --- a/public/templates/management/configuration/config-edition/config-edition.html +++ b/public/templates/management/configuration/config-edition/config-edition.html @@ -12,9 +12,6 @@ Cluster configuration
-
- Edit master/worker configuration -
@@ -23,9 +20,6 @@ Manager configuration
-
- Edit manager configuration -
@@ -33,27 +27,31 @@
- -
+
-
+ + + +
-
+
diff --git a/public/templates/management/configuration/config-groups/config-groups.html b/public/templates/management/configuration/config-groups/config-groups.html deleted file mode 100644 index a0635016f..000000000 --- a/public/templates/management/configuration/config-groups/config-groups.html +++ /dev/null @@ -1,55 +0,0 @@ -
-
-
- Edit the groups - - -
- Edit your groups configuration - -
- - -
-
- -
- -
- - -
- - - - - - - -
- - -
-
-
- Cancel - -
-
- - -
-
-
-
\ No newline at end of file diff --git a/public/templates/management/configuration/config-ruleset/config-ruleset.html b/public/templates/management/configuration/config-ruleset/config-ruleset.html deleted file mode 100644 index 528b6a722..000000000 --- a/public/templates/management/configuration/config-ruleset/config-ruleset.html +++ /dev/null @@ -1,98 +0,0 @@ -
-
-
- Edit the ruleset - - - - - - - -
-
- Edit your current local rules, decoders and CDB lists -
-
- - Local rules - Local decoders - CDB Lists - - -
- -
- - -
- -
- - - - - -
-
- - - - - -
-
- - - - - -
-
- -
-
-
- Cancel - -
-
- Cancel - - -
-
- - -
-
-
-
-
-

{{currentList.name}}

-
-
- -
-
-
\ No newline at end of file diff --git a/public/templates/management/configuration/configuration.head b/public/templates/management/configuration/configuration.head index 198f6fe90..0e717e955 100644 --- a/public/templates/management/configuration/configuration.head +++ b/public/templates/management/configuration/configuration.head @@ -1,22 +1,2 @@
- - -
-
- - -
-
- - - Overview - Edit - configuration - Edit ruleset - Edit groups - \ No newline at end of file + ng-init="switchConfigurationTab('welcome', false)"> \ No newline at end of file diff --git a/public/templates/management/configuration/configuration.pug b/public/templates/management/configuration/configuration.pug index a1d90baa2..322416495 100644 --- a/public/templates/management/configuration/configuration.pug +++ b/public/templates/management/configuration/configuration.pug @@ -3,8 +3,6 @@ include ./welcome.html include ./global-configuration/global-configuration.pug include ./cluster/cluster.html include ./config-edition/config-edition.html -include ./config-ruleset/config-ruleset.html -include ./config-groups/config-groups.html include ./registration-service/registration-service.html include ./alerts/alerts.pug include ./integrations/integrations.html diff --git a/public/templates/management/configuration/database-output/database-output.html b/public/templates/management/configuration/database-output/database-output.html index 6665306d0..5030bcc0f 100644 --- a/public/templates/management/configuration/database-output/database-output.html +++ b/public/templates/management/configuration/database-output/database-output.html @@ -31,7 +31,8 @@
Main settings
- These settings indicate the database where alerts are stored + These settings indicate the database where alerts are + stored
@@ -44,21 +45,13 @@
- + - + - + - +
@@ -73,12 +66,13 @@ - - + + + More info about this section - Database output reference + Database + output reference @@ -86,4 +80,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/global-configuration/global.html b/public/templates/management/configuration/global-configuration/global.html index 6274f0761..906e0ec2e 100644 --- a/public/templates/management/configuration/global-configuration/global.html +++ b/public/templates/management/configuration/global-configuration/global.html @@ -137,10 +137,10 @@ - - + + + More info about this section Global reference diff --git a/public/templates/management/configuration/global-configuration/remote.html b/public/templates/management/configuration/global-configuration/remote.html index 55a33ebcf..228f81db0 100644 --- a/public/templates/management/configuration/global-configuration/remote.html +++ b/public/templates/management/configuration/global-configuration/remote.html @@ -2,14 +2,8 @@
- - + + @@ -22,7 +16,8 @@
Remote settings
- Configuration to listen for events from the agents or a syslog client + Configuration to listen for events from the agents or a + syslog client
@@ -53,16 +48,16 @@ {{ item.protocol || 'udp' }} {{ item.ipv6 || '-' }} -
    -
  • {{ ip }}
    • -
- - +
    +
  • {{ ip }}
    • +
+ - -
    -
  • {{ ip }}
    • -
- - +
    +
  • {{ ip }}
    • +
+ - {{ item.local_ip || 'All interfaces' }} {{ item.queue_size || '16384' }} @@ -82,16 +77,18 @@ - - + + + More info about this section - Remote daemon reference - Remote configuration reference + Remote + daemon reference + Remote + configuration reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/integrations/integrations.html b/public/templates/management/configuration/integrations/integrations.html index ed2848372..8a410c8f9 100644 --- a/public/templates/management/configuration/integrations/integrations.html +++ b/public/templates/management/configuration/integrations/integrations.html @@ -17,12 +17,9 @@
- - - + + +
@@ -46,25 +43,15 @@
- + - + - + - + - +
@@ -81,29 +68,17 @@
- + - + - + - + - + - +
@@ -112,7 +87,8 @@
PagerDuty
- Get alerts on this streamlined incident resolution software + Get alerts on this streamlined incident resolution + software
@@ -120,25 +96,15 @@
- + - + - + - + - +
@@ -153,14 +119,17 @@ - - + + + More info about this section - How to integrate Wazuh with external APIs - VirusTotal integration documentation - Integration reference + How + to integrate Wazuh with external APIs + VirusTotal + integration documentation + Integration + reference @@ -168,4 +137,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/integrity-monitoring/integrity-monitoring.foot b/public/templates/management/configuration/integrity-monitoring/integrity-monitoring.foot index 786b0f565..9108565be 100644 --- a/public/templates/management/configuration/integrity-monitoring/integrity-monitoring.foot +++ b/public/templates/management/configuration/integrity-monitoring/integrity-monitoring.foot @@ -5,9 +5,10 @@ - + + More info about this section Integrity monitoring documentation Syscheck reference diff --git a/public/templates/management/configuration/inventory/inventory.html b/public/templates/management/configuration/inventory/inventory.html index a153fab49..4cc44a445 100644 --- a/public/templates/management/configuration/inventory/inventory.html +++ b/public/templates/management/configuration/inventory/inventory.html @@ -4,8 +4,10 @@
Inventory data - Enabled - Disabled + Enabled + Disabled
Gather relevant information about system OS, hardware, networking and packages
@@ -19,16 +21,10 @@
- - - - + + + +
@@ -53,17 +49,11 @@
- + - + - +
@@ -80,33 +70,19 @@
- + - + - + - + - + - + - +
@@ -122,13 +98,15 @@ - - + + + More info about this section - Syscollector module documentation - Syscollector module reference + Syscollector + module documentation + Syscollector + module reference @@ -136,4 +114,4 @@
-
+
\ No newline at end of file diff --git a/public/templates/management/configuration/log-collection/localfile.html b/public/templates/management/configuration/log-collection/localfile.html index 1dee2c3bf..2c4fafa08 100644 --- a/public/templates/management/configuration/log-collection/localfile.html +++ b/public/templates/management/configuration/log-collection/localfile.html @@ -1,16 +1,10 @@
- - - - + + + +
@@ -40,8 +34,10 @@ - {{ item.file || item.alias || item.command }} - {{ item.logformat }} - {{ item.targetStr }} + {{ item.file || item.alias || + item.command }} + {{ item.logformat }} - {{ + item.targetStr }}
@@ -51,47 +47,25 @@
- + - + - + - + - + - + - + - + - + - +
@@ -109,16 +83,18 @@ - - + + + More info about this section - Log data collection documentation - Localfile reference + Log + data collection documentation + Localfile + reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/log-collection/socket.html b/public/templates/management/configuration/log-collection/socket.html index 6c7308bb3..21e7030db 100644 --- a/public/templates/management/configuration/log-collection/socket.html +++ b/public/templates/management/configuration/log-collection/socket.html @@ -1,16 +1,10 @@
- - - - + + + +
@@ -39,7 +33,8 @@
- {{ item.name }} + {{ + item.name }}
@@ -49,21 +44,13 @@
- + - + - + - +
@@ -81,16 +68,18 @@ - - + + + More info about this section - Using multiple outputs - Socket reference + Using + multiple outputs + Socket + reference
- + \ No newline at end of file diff --git a/public/templates/management/configuration/open-scap/open-scap.foot b/public/templates/management/configuration/open-scap/open-scap.foot index f54ddb568..f69b02022 100644 --- a/public/templates/management/configuration/open-scap/open-scap.foot +++ b/public/templates/management/configuration/open-scap/open-scap.foot @@ -5,9 +5,10 @@ - + + More info about this section OpenSCAP module documentation OpenSCAP module reference diff --git a/public/templates/management/configuration/osquery/osquery.html b/public/templates/management/configuration/osquery/osquery.html index 1c37e1ac6..71b24a47a 100644 --- a/public/templates/management/configuration/osquery/osquery.html +++ b/public/templates/management/configuration/osquery/osquery.html @@ -5,7 +5,8 @@
Osquery Enabled - Disabled + Disabled
Expose an operating system as a high-performance relational database
@@ -19,16 +20,10 @@
- - - - + + + +
@@ -53,44 +48,36 @@
- + - + - + - + - + - +
-
+
Osquery packs
- A pack contains multiple queries to quickly retrieve system information + A pack contains multiple queries to quickly retrieve + system information
- + -
+
@@ -117,13 +104,15 @@ - - + + + More info about this section - Osquery module documentation - Osquery module reference + Osquery + module documentation + Osquery + module reference @@ -131,4 +120,4 @@ - + \ No newline at end of file diff --git a/public/templates/management/configuration/policy-monitoring/policy-monitoring.foot b/public/templates/management/configuration/policy-monitoring/policy-monitoring.foot index 0ffc1abe7..792ab63ba 100644 --- a/public/templates/management/configuration/policy-monitoring/policy-monitoring.foot +++ b/public/templates/management/configuration/policy-monitoring/policy-monitoring.foot @@ -5,9 +5,10 @@ - + + More info about this section Anomaly and malware detection documentation Policy monitoring documentation diff --git a/public/templates/management/configuration/registration-service/registration-service.html b/public/templates/management/configuration/registration-service/registration-service.html index bb7d75bc9..4f95aa062 100644 --- a/public/templates/management/configuration/registration-service/registration-service.html +++ b/public/templates/management/configuration/registration-service/registration-service.html @@ -4,7 +4,8 @@
Registration service - Enabled + Enabled Disabled
Automatic agent registration service @@ -20,10 +21,7 @@
- + @@ -49,33 +47,19 @@
- + - + - + - + - + - + - +
@@ -84,7 +68,8 @@
SSL settings
- Applied when the registration service uses SSL certificates + Applied when the registration service uses SSL + certificates
@@ -92,29 +77,17 @@
- + - + - + - + - + - +
@@ -129,13 +102,15 @@ - - + + + More info about this section - How to use the registration service - Registration service reference + How + to use the registration service + Registration + service reference @@ -143,4 +118,4 @@
-
+ \ No newline at end of file diff --git a/public/templates/management/configuration/ruleset/ruleset.foot b/public/templates/management/configuration/ruleset/ruleset.foot index ae459a0ca..65afb5e88 100644 --- a/public/templates/management/configuration/ruleset/ruleset.foot +++ b/public/templates/management/configuration/ruleset/ruleset.foot @@ -5,9 +5,10 @@ - + + More info about this section Ruleset documentation Ruleset reference diff --git a/public/templates/management/configuration/vulnerabilities/vulnerabilities.foot b/public/templates/management/configuration/vulnerabilities/vulnerabilities.foot index 0926a1b7c..59901acb5 100644 --- a/public/templates/management/configuration/vulnerabilities/vulnerabilities.foot +++ b/public/templates/management/configuration/vulnerabilities/vulnerabilities.foot @@ -5,9 +5,10 @@ - + + More info about this section Vulnerability detector documentation Vulnerability detector reference diff --git a/public/templates/management/configuration/wazuh-commands/wazuh-commands.html b/public/templates/management/configuration/wazuh-commands/wazuh-commands.html index ce60b9531..9d3858b36 100644 --- a/public/templates/management/configuration/wazuh-commands/wazuh-commands.html +++ b/public/templates/management/configuration/wazuh-commands/wazuh-commands.html @@ -18,14 +18,8 @@
- - + + @@ -65,49 +59,27 @@
- + - + - + - + - + - + - + - + - + - + - +
@@ -125,12 +97,13 @@ - - + + + More info about this section - Command module reference + Command + module reference @@ -138,4 +111,4 @@
-
+ \ No newline at end of file diff --git a/public/templates/management/configuration/welcome.html b/public/templates/management/configuration/welcome.html index ed3c36052..8d3038c45 100644 --- a/public/templates/management/configuration/welcome.html +++ b/public/templates/management/configuration/welcome.html @@ -1,13 +1,15 @@
-
-
+
+
Configuration SYNCHRONIZED NOT SYNCHRONIZED
- - Configuration +
+
+ + Edit configuration
@@ -257,8 +259,10 @@ - - + + + More info about this section Wazuh administration documentation diff --git a/public/templates/management/groups/groups.html b/public/templates/management/groups/groups.html index b7017582b..45d56d897 100644 --- a/public/templates/management/groups/groups.html +++ b/public/templates/management/groups/groups.html @@ -68,7 +68,7 @@
Cancel -
diff --git a/public/templates/management/ruleset/cdblists/cdblists-detail.html b/public/templates/management/ruleset/cdblists/cdblists-detail.html index 351bed967..a1ef7c4ac 100644 --- a/public/templates/management/ruleset/cdblists/cdblists-detail.html +++ b/public/templates/management/ruleset/cdblists/cdblists-detail.html @@ -2,11 +2,11 @@
- -
+

{{cdbctrl.currentList.name}}

@@ -15,7 +15,7 @@ -
+
Name: {{cdbctrl.currentList.name}}
diff --git a/public/templates/management/ruleset/cdblists/cdblists-list.html b/public/templates/management/ruleset/cdblists/cdblists-list.html index d856cbe59..6d9a518cb 100644 --- a/public/templates/management/ruleset/cdblists/cdblists-list.html +++ b/public/templates/management/ruleset/cdblists/cdblists-list.html @@ -1,6 +1,7 @@
- + @@ -42,11 +43,16 @@
- + +
- Formatted + Formatted
diff --git a/public/templates/management/ruleset/decoders/decoders-detail.html b/public/templates/management/ruleset/decoders/decoders-detail.html index 58cce5989..c3fc79644 100644 --- a/public/templates/management/ruleset/decoders/decoders-detail.html +++ b/public/templates/management/ruleset/decoders/decoders-detail.html @@ -1,6 +1,6 @@
-
+
@@ -11,8 +11,15 @@
+
+ +
+ -
+
Position: @@ -29,7 +36,7 @@ -
+
@@ -95,15 +102,9 @@
-
- -
-
+

Related decoders

@@ -124,18 +125,18 @@ -
+
Cancel -
-
- +
+
diff --git a/public/templates/management/ruleset/decoders/decoders-list.html b/public/templates/management/ruleset/decoders/decoders-list.html index abfe584c4..b9354dc15 100644 --- a/public/templates/management/ruleset/decoders/decoders-list.html +++ b/public/templates/management/ruleset/decoders/decoders-list.html @@ -1,20 +1,14 @@
-
+
-
- -
- + File: {{ dctrl.getFilter('file') }} @@ -28,11 +22,21 @@