Commit Graph

37205 Commits

Author SHA1 Message Date
artica 43fbc6eca4 Auto-updated build strings. 2023-12-19 01:00:37 +01:00
Rafael Ameijeiras de6747f53d Merge branch 'ent-12597-popup-en-la-open' into 'develop'
Ent 12597 popup en la open

See merge request artica/pandorafms!6784
2023-12-18 15:51:22 +00:00
Rafael Ameijeiras 2fef90895e Merge branch 'ent-12465-guardia-16501-fallo-en-edicion-de-grupo-ldap' into 'develop'
Ent 12465 guardia 16501 fallo en edicion de grupo ldap

See merge request artica/pandorafms!6685
2023-12-18 14:52:25 +00:00
Rafael Ameijeiras e86132a89d Merge branch 'ent-12456-dashboard-widgert-colmena-de-agentes-agent-hive-se-ve-con-con-OS-description-largos' into 'develop'
Ent 12456 dashboard widgert colmena de agentes agent hive se ve con con os description largos

See merge request artica/pandorafms!6669
2023-12-18 14:52:02 +00:00
Rafael Ameijeiras bf03440a31 Merge branch 'ent-12667-error-500-al-cargar-la-consola-de-pandora-open' into 'develop'
Ent 12667 error 500 al cargar la consola de pandora open

See merge request artica/pandorafms!6783
2023-12-18 14:51:43 +00:00
Daniel Rodriguez cba7c03115 Merge branch 'ent-11711-Comprobar-versiones-de-dependencias-antes-de-actualizar' into 'develop'
oum update checks

See merge request artica/pandorafms!6598
2023-12-18 14:07:28 +00:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
alejandro.campos@artica.es 7e4016579a minor change 2023-12-18 12:47:54 +01:00
Matias Didier ec24bb3a01 Merge branch 'ent-12198-easter-egg-bienvenida-dinamica' into 'develop'
Ent 12198 easter egg bienvenida dinamica

See merge request artica/pandorafms!6687
2023-12-18 11:38:57 +00:00
Daniel Maya 7c0a2b4e97 #12456 Fixed os text style 2 2023-12-18 12:00:14 +01:00
Rafael Ameijeiras 72dca5c80a Merge branch 'ent-12600-cambios-instalador-online-variable-consola' into 'develop'
change package links

See merge request artica/pandorafms!6733
2023-12-18 10:30:22 +00:00
Jonathan 7ae77773e6 #12597 popup open 2023-12-18 11:28:09 +01:00
Jonathan 82e4eb46e0 #12667 move translate string to open 2023-12-18 10:51:48 +01:00
Rafael Ameijeiras 3dd082c60f Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop'
Ent 12647 Salto de linea en nombre de evento

See merge request artica/pandorafms!6777
2023-12-18 07:52:31 +00:00
Rafael Ameijeiras b7de3a1f8f Merge branch 'ent-12531-plugin-de-monitorizacion-de-seguridad-para-windows' into 'develop'
12531 adding security plugin for windows

See merge request artica/pandorafms!6763
2023-12-18 07:34:58 +00:00
Diego Muñoz-Reja 5a9f888ecc Merge branch 'ent-12649-traza-olvidada' into 'develop'
Ent 12649 traza olvidada

See merge request artica/pandorafms!6779
2023-12-18 07:07:12 +00:00
artica 0336f87b24 Auto-updated build strings. 2023-12-18 01:00:22 +01:00
artica 2d379f6700 Auto-updated build strings. 2023-12-17 01:00:20 +01:00
artica 9037819ceb Auto-updated build strings. 2023-12-16 01:00:26 +01:00
Daniel Maya e6981fb436 #12456 Fixed os text style 2023-12-15 12:59:56 +01:00
Matias Didier 9158b43945 Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop'
move extension translate_string and file_repo pandora_enterprise#12333

See merge request artica/pandorafms!6706
2023-12-15 11:49:11 +00:00
Daniel Rodriguez 3fe41179e0 Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline

See merge request artica/pandorafms!6740
2023-12-15 09:22:10 +00:00
Daniel Maya 971db37147 #12649 remove trace 2023-12-15 10:19:52 +01:00
Rafael Ameijeiras fef77d12bf Merge branch 'ent-12201-eastern-egg-setup' into 'develop'
Ent 12201 eastern egg setup

See merge request artica/pandorafms!6701
2023-12-15 07:43:17 +00:00
Diego Muñoz-Reja fe3aa7f745 Merge branch 'ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map' into 'develop'
Ent 11166 vista de datos de netflow por defecto network usage map

See merge request artica/pandorafms!6427
2023-12-15 07:19:46 +00:00
Diego Muñoz-Reja b545cfec23 Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop'
Optimiized monitors view

See merge request artica/pandorafms!6627
2023-12-15 07:18:13 +00:00
artica d81805d2c2 Auto-updated build strings. 2023-12-15 01:00:29 +01:00
Daniel Cebrian 67ffe8627b #12647 fixed line break in event list 2023-12-14 19:08:34 +01:00
Daniel Cebrian d84faad8cf #12631 added field ignore_unknown in api modules and cli 2023-12-14 18:11:34 +01:00
Rafael Ameijeiras e3d408ea44 Merge branch 'ent-12365-nueva-automonitorizacion-de-logs-erronea' into 'develop'
Fix opensearch total documents automonitorization

See merge request artica/pandorafms!6773
2023-12-14 16:05:23 +00:00
daniel 4c11595899 fix name token easter eggs pandora_enterprise#12201 2023-12-14 16:48:10 +01:00
daniel 27a83a8eb5 Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
Conflicts:
	pandora_console/include/functions_config.php
2023-12-14 16:36:11 +01:00
daniel 06f6c7d16f Merge remote-tracking branch 'origin/develop' into ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map
Conflicts:
	pandora_console/operation/network/network_usage_map.php
2023-12-14 16:13:25 +01:00
Rafael Ameijeiras abe950e7d7 Merge branch 'ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event' into 'develop'
Ent-11731-cli-error-servidor-no-asignado-e-intervalo-incorrecto-al-crear-agente-con-create_event

Closes pandora_enterprise#11731

See merge request artica/pandorafms!6293
2023-12-14 15:11:27 +00:00
Rafael Ameijeiras 2420c79500 Merge branch 'ent-12447-errores-al-aplicar-parches' into 'develop'
fix error update manager pandora_enterprise#12447

Closes pandora_enterprise#12447

See merge request artica/pandorafms!6721
2023-12-14 14:36:36 +00:00
daniel f78c7495e5 fixed modal close click button execute twice function close pandora_enterprise#12447 2023-12-14 13:18:53 +01:00
Diego Muñoz-Reja 60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop'
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
2023-12-14 11:19:25 +00:00
Matias Didier 352434d69a Merge branch 'ent-12132-bug-en-welcome-tips-con-muchos-tips' into 'develop'
Ent 12132 bug en welcome tips con muchos tips

See merge request artica/pandorafms!6557
2023-12-14 11:03:37 +00:00
Calvo 036425ddda Fix opensearch total documents automonitorization 2023-12-14 11:40:26 +01:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
2023-12-14 11:21:51 +01:00
Rafael Ameijeiras e71a104e74 Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop'
Draft: Ent 12566 Mejoras en visualización de eventos

See merge request artica/pandorafms!6735
2023-12-14 08:57:44 +00:00
Rafael Ameijeiras d5b3bd1c02 Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop'
Ent 12483 varios bugs en la vista de campos personalizados

See merge request artica/pandorafms!6689
2023-12-14 08:42:02 +00:00
Rafael Ameijeiras f3d190a8bb Merge branch 'ent-8365-ncm-fase-3' into 'develop'
Ent 8365 ncm fase 3

See merge request artica/pandorafms!6612
2023-12-14 08:40:31 +00:00
Rafael Ameijeiras dcdd3e139e Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop'
Ent 12468 instrucciones se rompen en vista de eventos

See merge request artica/pandorafms!6711
2023-12-14 08:39:44 +00:00
Jonathan 53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00
artica dffdbff8b1 Auto-updated build strings. 2023-12-14 01:00:28 +01:00
Daniel Cebrian fed0d92805 #12566 fixed colums module_custom_id and event_custom_id length_ 2023-12-13 19:53:14 +01:00
alejandro.campos@artica.es a72326a006 Merge remote-tracking branch 'origin/develop' into ent-11711-Comprobar-versiones-de-dependencias-antes-de-actualizar 2023-12-13 18:48:16 +01:00
Rafael Ameijeiras 7c3cdd1d11 Merge branch 'ent-11510-vista-de-inventario-hace-el-filtrado-antes-de-escoger-todos-los-campos' into 'develop'
Ent 11510 vista de inventario hace el filtrado antes de escoger todos los campos

See merge request artica/pandorafms!6402
2023-12-13 16:33:34 +00:00
Rafael Ameijeiras c5687ee1fd Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop'
fix error empty clusters pandora_enterprise#12511

See merge request artica/pandorafms!6719
2023-12-13 16:32:17 +00:00