Commit Graph

34147 Commits

Author SHA1 Message Date
miguel angel rasteu c4d706f08b #11120 Change class and js code to fix the visual style 2023-05-05 13:03:38 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Jonathan 51630d32ef #10185 filters log select group 2023-05-05 11:28:58 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
miguel angel rasteu b107069bf5 #11082 Fix JS code to show de name of the service 2023-05-05 10:09:14 +02:00
Daniel Rodriguez ebd5f6c01f Merge branch 'ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados' into 'develop'
Recovered alerts skipping when threshold applies

See merge request artica/pandorafms!5653
2023-05-05 07:58:31 +00:00
Ramon Novoa 782ee0e9ac Revert "Test GitLab hooks."
This reverts commit bd643f1cef.
2023-05-05 09:37:20 +02:00
Ramon Novoa bd643f1cef Test GitLab hooks.
(cherry picked from commit c8b6be3e92)
2023-05-05 09:32:58 +02:00
Calvo 56a587791c Change correct MR 2023-05-05 09:10:49 +02:00
artica d4107cad5d Auto-updated build strings. 2023-05-05 01:00:19 +02:00
Calvo 8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
Calvo 3bbaf5e562 Alert recuperation only executes one time if in threshold interval 2023-05-04 20:17:31 +02:00
Daniel Rodriguez 23b831a707 Merge branch 'ent-10743-no-hace-el-cambio-a-el-server-master-ha-en-servidores-remotos-si-no-existe-el-servidor' into 'develop'
Improved module execution for master servers.

See merge request artica/pandorafms!5777
2023-05-04 17:18:05 +00:00
Daniel Rodriguez 38d2d66469 Merge branch 'ent-10597-pantalla-de-error-de-sistemas-no-mergeados' into 'develop'
Ent 10597 pantalla de error de sistemas no mergeados

See merge request artica/pandorafms!5705
2023-05-04 17:15:16 +00:00
Daniel Rodriguez 492032bd41 Merge branch 'ent-10157-14544-plugin-anadir-parametro-extra-para-calcular-el-de-bandwidth-max-de-port-channels' into 'develop'
Ent 10157 14544 plugin anadir parametro extra para calcular el de bandwidth max de port channels

See merge request artica/pandorafms!5810
2023-05-04 17:14:26 +00:00
daniel 77be60e4a3 fixed modules adopted pandora_enterprise#11103 2023-05-04 18:24:11 +02:00
Calvo c2e16ec94f Fix commit changes 2023-05-04 16:59:12 +02:00
Jorge Rincon 9ab9087377 #11098 The Create agent module button is enabled 2023-05-04 16:48:20 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop'
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
2023-05-04 14:37:48 +00:00
Jonathan 477dc1d14d #10597 add logo pandora maintenance 2023-05-04 16:28:51 +02:00
miguel angel rasteu b3e97d9550 #11111 Fix module_manager_editor_web that it obtains the plugin_parameter data with the id of the tagente_modulo table 2023-05-04 16:01:35 +02:00
Calvo 768d7008f4 Fix commit error 2023-05-04 15:50:38 +02:00
Calvo f2a9716c79 Fix alert recovery execute one time 2023-05-04 15:18:02 +02:00
Calvo da96d5bd1e Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados 2023-05-04 15:14:01 +02:00
Matias Didier 96305c9528 Merge branch 'ent-11110-selectores-de-tipo-select2-rotos-en-metaconsola' into 'develop'
fix select2 pandora_enterprise#11110

See merge request artica/pandorafms!5831
2023-05-04 12:39:20 +00:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
daniel 75eae248a5 fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 13:27:34 +02:00
daniel e77a63a91f fix select2 pandora_enterprise#11110 2023-05-04 12:57:01 +02:00
daniel 5b0092c019 fix legacy VC pandora_enterprise#11054 2023-05-04 12:55:52 +02:00
Calvo c74ed4914b Websocket engine test button 2023-05-04 11:37:16 +02:00
daniel 5f3cbbb12a fixed visual errors in legacy VC pandora_enterprise#11054 2023-05-04 11:14:11 +02:00
Diego Muñoz-Reja 038e21cf0c Merge branch 'ent-10744-mejorar-deteccion-de-os-con-nmap-mucho-mas-lento' into 'develop'
Remoced xprobe and modified nmap for better performance detecting OS

See merge request artica/pandorafms!5797
2023-05-04 09:01:52 +00:00
Daniel Maya 78f4126700 #11050 Fixed critical instructions 2023-05-04 10:39:51 +02:00
Pablo Aragon a6212c2777 11094-Load fields plugin module 2023-05-04 10:35:32 +02:00
miguel angel rasteu f3488e2aa4 #11095 Fix id_policy_module in url 2023-05-04 09:43:48 +02:00
artica 151358190c Auto-updated build strings. 2023-05-04 01:00:20 +02:00
Daniel Maya 8c96baf68f #11099 Fix sunburst 2023-05-03 16:44:07 +02:00
miguel angel rasteu 6813eb9d11 #11090 Fix the count that gave an error when there are no tags and the sql error when putting offset-20 when there are no tag 2023-05-03 13:24:11 +02:00
Matias Didier 5983333965 Merge branch 'ent-10908-Fallo-en-el-editor-de-tips' into 'develop'
changes regarding encoding of tables

See merge request artica/pandorafms!5763
2023-05-03 11:01:06 +00:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop'
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
2023-05-03 09:25:04 +00:00
Daniel Cebrian d2c26ba607 #11092 fixed response tactical view 2023-05-03 11:07:20 +02:00
Daniel Maya 87a55dd26a #10530 Added img 2023-05-03 09:32:52 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips'
# Conflicts:
#   pandora_console/extras/mr/63.sql
2023-05-03 07:11:28 +00:00
Jonathan 9da4f3d656 #11085 tinymce add plugins imagen link 2023-05-03 08:04:54 +02:00
artica 77ac357745 Auto-updated build strings. 2023-05-03 01:00:14 +02:00
artica b58ece6359 Auto-updated build strings. 2023-05-02 01:00:10 +02:00
artica 2e9c6a339f Auto-updated build strings. 2023-05-01 01:00:13 +02:00
artica 0bef49b5e7 Auto-updated build strings. 2023-04-30 01:00:18 +02:00
artica 459da487b8 Auto-updated build strings. 2023-04-29 01:00:23 +02:00
Calvo 8c65652c64 Fix gotty host missing on ws.php 2023-04-28 14:06:35 +02:00