Commit Graph

30254 Commits

Author SHA1 Message Date
Rafael Ameijeiras dca4c98660 Merge branch 'ent-12697-monitor-detail-view-no-funciona-el-filtrado-por-campo-search' into 'develop'
Ent 12697 monitor detail view no funciona el filtrado por campo search

See merge request artica/pandorafms!6808
2023-12-26 08:43:30 +00:00
miguel angel rasteu 1108f657ea #12701 Fix recursion filter token in angent module view 2023-12-26 09:16:12 +01:00
artica bc7ae01e13 Auto-updated build strings. 2023-12-26 01:00:19 +01:00
artica 2efc95587f Auto-updated build strings. 2023-12-25 01:00:19 +01:00
artica 7e91d94faa Auto-updated build strings. 2023-12-24 01:00:17 +01:00
artica 3a5fe1acb0 Auto-updated build strings. 2023-12-23 01:00:25 +01:00
daniel 88308da560 fix search events pandora_enterprise#12704 2023-12-22 13:43:13 +01:00
Daniel Maya 7390336da0 #12697 Fixed search 2023-12-22 12:55:21 +01:00
artica 2d06d5f94d Auto-updated build strings. 2023-12-22 01:00:27 +01:00
artica 82bc2c3f98 Updated version and build strings. 2023-12-21 17:13:20 +01:00
Rafael Ameijeiras c4b6183074 Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop'
Fix servers name

See merge request artica/pandorafms!6794
2023-12-21 15:16:13 +00:00
Jonathan 3499965f80 #12599 change icon about 2023-12-21 16:15:01 +01:00
miguel angel rasteu 53da63d7b6 #12132 Fix MR 2023-12-21 16:03:49 +01:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
Jonathan 59866d9949 #12398 remove transactional_view 2023-12-21 12:39:10 +01:00
Jonathan 158a52a1ce #12398 fix url 2023-12-21 12:36:54 +01:00
Diego Muñoz-Reja 6114c6a37a Merge branch 'ent-12236-varios-bugs-en-modulos-predictivos-de-politica' into 'develop'
Policy capacity planning modules. JS errors

See merge request artica/pandorafms!6650
2023-12-21 10:57:42 +00:00
artica ffec658ee8 Auto-updated build strings. 2023-12-21 01:00:28 +01:00
miguel angel rasteu d84300f2c7 #11494 Add widget in database 2023-12-20 13:21:43 +01:00
Calvo ca33be4495 Fix servers name 2023-12-20 11:58:31 +01:00
Rafael Ameijeiras 8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop'
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
2023-12-20 10:21:51 +00:00
Calvo b543376f1c Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-20 09:15:18 +01:00
artica e947ac4f00 Auto-updated build strings. 2023-12-20 01:00:27 +01:00
Daniel Rodriguez 477a9d665e Merge branch 'ent-12067-huevo-de-pascua-piensa-en-verde' into 'develop'
Ent 12067 huevo de pascua piensa en verde

See merge request artica/pandorafms!6698
2023-12-19 18:05:44 +00:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Calvo e41dc13ac2 WIP: Policy synthetic op: Creating modules 2023-12-19 18:37:49 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature

See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
Rafael Ameijeiras 46b315fbaf Merge branch 'ent-12643-conteo-paginacion-de-eventos-no-funciona' into 'develop'
Ent 12643 conteo paginacion de eventos no funciona

See merge request artica/pandorafms!6781
2023-12-19 15:05:05 +00:00
Rafael Ameijeiras 6a904f4e59 Merge branch 'ent-12269-el-editor-de-widgets-no-me-dice-que-tipo-de-widget-estoy-editando' into 'develop'
Ent 12269 el editor de widgets no me dice que tipo de widget estoy editando

See merge request artica/pandorafms!6590
2023-12-19 14:59:13 +00:00
Daniel Maya f1f8f40241 #12324 Fixed group status 2023-12-19 15:02:29 +01:00
daniel e07f66885d Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde
Conflicts:
	pandora_console/index.php
2023-12-19 14:56:04 +01:00
daniel d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
Conflicts:
	pandora_console/include/javascript/pandora.js
2023-12-19 14:41:12 +01:00
Jonathan a21b332b1d #12391 sunburst widget fix style 2023-12-19 12:57:13 +01:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
Rafael Ameijeiras 8cc159f19f Merge branch 'ent-12665-error-500-al-crear-un-custom-graph' into 'develop'
fix rerors selectors pandora_enterprise#12665

See merge request artica/pandorafms!6788
2023-12-19 07:57:28 +00:00
Rafael Ameijeiras a4eed65758 Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop'
Ent 12200 huevo de pascua efecto nieve

See merge request artica/pandorafms!6675
2023-12-19 07:56:55 +00:00
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
Daniel Maya e5b513f018 #12200 Fixed Christmas 2023-12-18 16:44:27 +01:00
daniel ae43f8a948 fix rerors selectors pandora_enterprise#12665 2023-12-18 16:29:56 +01:00
Enrique Martin 321a0075f9 Fixed report custom graph search 2023-12-18 16:12:08 +01: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
Daniel Maya 0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01: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
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
daniel 9b0bee3b36 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:35:39 +01:00
Jonathan 7ae77773e6 #12597 popup open 2023-12-18 11:28:09 +01:00
daniel 8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
daniel d56e3a5496 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:14:55 +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
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
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 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
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 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
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