Commit Graph

34147 Commits

Author SHA1 Message Date
Matias Didier 56614f8df0 Merge branch 'ent-10474-mejorar-visualmente-mapa-dinamico-sunburst' into 'develop'
Ent 10474 mejorar visualmente mapa dinamico sunburst

See merge request artica/pandorafms!5800
2023-04-28 11:01:17 +00:00
Calvo 7ef41d6273 Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados 2023-04-28 11:11:36 +02:00
Daniel Maya 77b5b7af45 #10157 Fix max_interfaces 2023-04-28 10:51:21 +02:00
Jonathan e1f473f985 #10638 format numbers network link 2023-04-28 10:51:02 +02:00
Daniel Maya 44ffd0f75b #10157 Added max parameter 2023-04-28 10:27:45 +02:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Jonathan d0281443a4 #10185 MR 63.sql 2023-04-28 10:07:55 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes'
# Conflicts:
#   pandora_console/include/styles/pandora.css
2023-04-28 08:07:10 +00:00
miguel angel rasteu c1e35a5d17 #10081 Add option homescreen in metaconsole again 2023-04-28 09:51:30 +02:00
Jonathan afa26e45db #10185 change MR 63 to 64.sql 2023-04-28 09:16:29 +02:00
Daniel Rodriguez 0bc18b47db Merge branch 'ent-10420-14668-errores-en-usuarios-ldap-ad-con-apostrofes' into 'develop'
Ent 10420 14668 errores en usuarios ldap ad con apostrofes

See merge request artica/pandorafms!5687
2023-04-28 07:03:37 +00:00
Daniel Rodriguez 6570f0b98d Merge branch 'ent-10053-No-existe-borrado-en-cascada-de-modulos-usando-CLI' into 'develop'
implemented module cascade deletion

See merge request artica/pandorafms!5641
2023-04-28 07:00:59 +00:00
Daniel Rodriguez d5450853f5 Merge branch 'ent-10833-15134-bug-en-chromium-111-0-5563-64-1' into 'develop'
update composer

See merge request artica/pandorafms!5674
2023-04-28 06:11:25 +00:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop'
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
2023-04-28 06:07:10 +00:00
Daniel Rodriguez 06b58d3dfc Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop'
Ent 10191 nuevas alertas sonoras son poco usables

See merge request artica/pandorafms!5689
2023-04-28 06:04:18 +00:00
artica 153294a9b0 Auto-updated build strings. 2023-04-28 01:00:28 +02:00
Diego Muñoz-Reja ddda7a71bf Merge branch 'ent-10777-encolamiento-ficheros-xml-con-tildes' into 'develop'
Changed xml agent filename to hash to avoid special chars problems

See merge request artica/pandorafms!5773
2023-04-27 15:51:14 +00:00
miguel angel rasteu 728cc27396 #11068 Add option change to critical status 2023-04-27 15:34:42 +02:00
miguel angel rasteu 2fe3662724 #11064 Fixed a conditional in the jquery code that generates the toggle which was not executed when the value of the is_metaconsole variable was 1 2023-04-27 12:34:56 +02:00
alejandro.campos@artica.es ccc66f3e65 keep inprocess status based on extra id 2023-04-27 12:22:22 +02:00
alejandro.campos@artica.es 9a97f5c40c keep inprocess status based on extra id 2023-04-27 12:11:28 +02:00
Daniel Maya e4b17428b7 #10474 visual changes 2023-04-27 10:05:20 +02:00
miguel angel rasteu 88d6e0e4f1 #11067 Add to the title the ip_target of the module when it exists. 2023-04-27 09:58:16 +02:00
artica 0b5672980d Auto-updated build strings. 2023-04-27 01:00:23 +02:00
Calvo 829ed3e33a Remoced xprobe and modified nmap for better performance detecting OS 2023-04-26 18:05:21 +02:00
Rafael Ameijeiras da0aa3c7e7 Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil-2' into 'develop'
Ent 9555 revision visual ui de la vista movil 2

See merge request artica/pandorafms!5779
2023-04-26 11:52:16 +00:00
Matias Didier 3a318436a9 Merge branch 'ent-11029-poner-remote_config-a-1-por-defecto-en-el-pandora_server-conf' into 'develop'
Changed default remote_config on server to 1

See merge request artica/pandorafms!5764
2023-04-26 09:30:59 +00:00
Diego Muñoz-Reja 8c05f1af03 Merge branch 'ent-10558-15096-proteccion-en-cascada-servicios' into 'develop'
Check CPS for modules and parents to inhabilate alerts

See merge request artica/pandorafms!5744
2023-04-26 09:10:39 +00:00
Diego Muñoz-Reja 3e0c06b4b7 Merge branch 'ent-10769-Errores-en-Trap-console-y-Trap-editor' into 'develop'
several minor fixes

See merge request artica/pandorafms!5638
2023-04-26 08:57:03 +00:00
Jorge Rincon 4b74dc7e78 #10623 removal of the default text in the textarea description 2023-04-26 09:38:03 +02:00
artica 8effae4991 Auto-updated build strings. 2023-04-26 01:00:20 +02:00
Calvo 300e1c4581 Fix correlation server connection with nodes with encrypt enabled 2023-04-25 19:16:30 +02:00
Matias Didier f0194286d6 Merge branch 'ent-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente-2' into 'develop'
Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente 2

See merge request artica/pandorafms!5778
2023-04-25 15:39:49 +00:00
miguel angel rasteu 8108a84ba7 Fix incompatibility with Firefox 2023-04-25 16:47:52 +02:00
Pablo Aragon abf5e027c5 9555-Subservice remove href 2023-04-25 16:40:06 +02:00
Pablo Aragon d998610d66 9555-Services href 2023-04-25 16:04:17 +02:00
Diego Muñoz-Reja ed6364d3c0 Merge branch 'ent-11024-pete-sql-en-remote-components' into 'develop'
Ent 11024 pete sql en remote components

See merge request artica/pandorafms!5755
2023-04-25 13:47:34 +00:00
Daniel Cebrian d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02:00
Rafael Ameijeiras 1bf69af3c8 Merge branch 'ent-10960-falta-tabla-tsesion_filter-en-la-instalacion-de-la-version-769' into 'develop'
Ent 10960 falta tabla tsesion filter en la instalacion de la version 769

See merge request artica/pandorafms!5731
2023-04-25 13:28:10 +00:00
Rafael Ameijeiras 58af8f8d46 Merge branch 'ent-10899-consola-mete-entities-en-los-custom-fields-del-inventario' into 'develop'
Ent 10899 consola mete entities en los custom fields del inventario

See merge request artica/pandorafms!5699
2023-04-25 13:27:07 +00:00
Rafael Ameijeiras 5d943510be Merge branch 'ent-10363-15056-CPS-Disabled-desaparece-al-deshabilitarlo-en-Opciones-Avanzadas-de-Modulo' into 'develop'
minor fix in cps selector

See merge request artica/pandorafms!5665
2023-04-25 13:26:26 +00:00
Rafael Ameijeiras d08d5319dc Merge branch 'ent-10471-When-a-group-is-deleted-SNMP-alerts-that-used-it-disappear' into 'develop'
added limitation to group deletion

See merge request artica/pandorafms!5643
2023-04-25 13:25:03 +00:00
Pablo Aragon 38849e6ed2 9555-Change media queries 2023-04-25 14:36:30 +02:00
Diego Muñoz-Reja 3b28dbf150 Merge branch 'ent-10500-giss-no-se-guardan-algunas-opciones-del-menu-de-paso-a-historico-en-la-metaconsola' into 'develop'
Ent 10500 giss no se guardan algunas opciones del menu de paso a historico en la metaconsola

See merge request artica/pandorafms!5742
2023-04-25 12:23:54 +00:00
Kevin b17e0f3637 Added safe_input to some some create_event vars 2023-04-25 14:21:19 +02:00
Jonathan d1361e38cb #11047 fix macro in plugin section node+meta 2023-04-25 14:20:44 +02:00
Pablo Aragon 6540a229e1 10755-Horizontal graph legend & interfaz graph 2023-04-25 13:31:59 +02:00
Ramon Novoa 925d3fa6a2 Improved module execution for master servers.
Previously, master servers executed modules from any agent whose
assigned server had crashed. Now they execute modules from any agent
whose assigned server cannot execute them (e.g., the server is running
but the required component is disabled).
2023-04-25 12:28:38 +02:00
Daniel Cebrian e1f995744b #10998 fixed acl edit my user 2023-04-25 10:57:21 +02:00
Jorge Rincon 1c41a91c14 #10869 removed the group_id from the url, in the detail agent filter 2023-04-25 10:19:30 +02:00