Commit Graph

37513 Commits

Author SHA1 Message Date
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
Jonathan f35e7d52ed #12643 fix pagination 2023-12-15 11:34:27 +01:00
alejandro.campos@artica.es 47fd35c53f fix tags filter 2023-12-15 10:48:10 +01:00
Daniel Cebrian 8df792f11b #12571 custom graphs refactored 2023-12-15 10:41:21 +01: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
daniel 70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
daniel 0584b9afd0 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-15 09:12:39 +01:00
daniel e14a2bcb67 fix times sound events pandora_enterprise#12607 2023-12-15 09:11:05 +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
Daniel Maya a008c7486c #12026 Fixed widget 2023-12-14 17:28:34 +01:00
daniel cf692ba7ef fix times sound events pandora_enterprise#12607 2023-12-14 17:07:03 +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
Jonathan c6d29ea60e #12435 external link users fix 2023-12-14 16:59:39 +01: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 9e3c17bf2c Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-14 16:32:33 +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 ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
daniel f78c7495e5 fixed modal close click button execute twice function close pandora_enterprise#12447 2023-12-14 13:18:53 +01:00
alejandro.campos@artica.es 7398982912 fix multiple selector 2023-12-14 12:27:00 +01:00
alejandro.campos@artica.es 9258de7edc fix multiple selector 2023-12-14 12:25:21 +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
daniel 2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/styles/pandora.css
2023-12-14 11:05:29 +01:00
daniel 27d76a0890 fix error cv item module graph periodicity mode pandora_enterprise#9640 2023-12-14 11:03:45 +01:00
Jonathan 065b096f14 #12366 user list 5 users bug styles 2023-12-14 10:03:58 +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 6e150c1bc2 #12560 alert update manager 2023-12-14 08:59:13 +01:00
Jonathan 53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00