tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,908 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

36908 Commits

Author SHA1 Message Date
daniel 34784752b7 fix error js load modal filter sound events pandora_enterprise#12607 2023-12-05 11:47:37 +01:00
artica cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Daniel Rodriguez 868598b1b2 Merge branch 'ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db' into 'develop' 
delete agents pandora_db pandora_enterprise#12293

See merge request artica/pandorafms!6656
 2023-12-04 13:39:10 +00:00
Daniel Rodriguez a7abf4add7 Merge branch 'ent-12382-16531-permitir-cambiar-la-url-del-pdf-para-que-el-chromium-pueda-acceder-a-ella' into 'develop' 
fix chart_generator pdf pandora_enterprise#12382

See merge request artica/pandorafms!6679
 2023-12-04 13:38:18 +00:00
Daniel Rodriguez 9922c29579 Merge branch 'ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db' into 'develop' 
Ent-12548-token-last_compact_offset-se-anade-en-cada-ejecucion-del-pandora_db

See merge request artica/pandorafms!6726
 2023-12-04 11:53:16 +00:00
Diego Muñoz-Reja 3952c259d4 Merge branch 'ent-12062-16257-16240-caracteres-extranos-bloquean-modulo-plugin-con-o-sin-politica' into 'develop' 
Ent 12062 16257 16240 caracteres extranos bloquean modulo plugin con o sin politica

See merge request artica/pandorafms!6545
 2023-12-04 09:22:13 +00:00
Rafael Ameijeiras 3f2d9e0cb1 Merge branch 'ent-12507-hay-macros-de-eventos-que-no-funcionan-en-el-eventserver' into 'develop' 
Added function to pretty print json

See merge request artica/pandorafms!6704
 2023-12-04 08:20:22 +00:00
Rafael Ameijeiras a7ca102c5e Merge branch 'ent-12078-grafica-del-log-viewer-con-fecha-erronea-y-caracteres-extranos' into 'develop' 
Ent 12078 grafica del log viewer con fecha erronea y caracteres extranos

See merge request artica/pandorafms!6472
 2023-12-04 08:19:43 +00:00
Rafael Ameijeiras e91230b165 Merge branch 'ent-12440-16596-agregar-acl-operation-events-events-no-hace-nada' into 'develop' 
Ent 12440 16596 agregar acl operation events events no hace nada

See merge request artica/pandorafms!6713
 2023-12-04 08:12:48 +00:00
Rafael Ameijeiras 38672764a3 Merge branch 'ent-12341-agent-basic-options' into 'develop' 
Ent 12341 agent basic options

See merge request artica/pandorafms!6681
 2023-12-04 08:12:23 +00:00
Rafael Ameijeiras 7a238c34d6 Merge branch 'ent-12533-16681-error-al-aplicar-filtro-de-evento-personalizado-en-widget-list-of-latest-events' into 'develop' 
Ent 12533 16681 error al aplicar filtro de evento personalizado en widget list of latest events

See merge request artica/pandorafms!6716
 2023-12-04 08:11:49 +00:00
Rafael Ameijeiras 5e588b1ef1 Merge branch 'ent-12558-error-SQL-al-copiar-módulo-web-de-tipo-check-server-status-code' into 'develop' 
Ent 12558 error sql al copiar módulo web de tipo check server status code

See merge request artica/pandorafms!6717
 2023-12-04 08:11:23 +00:00
Rafael Ameijeiras fdb58daf2d Merge branch 'ent-12247-vistas-tacticas-de-seguridad-fase-2-vulnerabilidades-y-hardening' into 'develop' 
Ent 12247 Vistas tácticas de seguridad fase 2 (vulnerabilidades y hardening)

See merge request artica/pandorafms!6707
 2023-12-04 08:11:03 +00:00
artica 3eac0f9661 Auto-updated build strings. 2023-12-04 01:00:21 +01:00
artica a2ea6f33f3 Auto-updated build strings. 2023-12-03 01:00:20 +01:00
artica 69229987f8 Auto-updated build strings. 2023-12-02 01:00:24 +01:00
Rafael Ameijeiras aa9aa40ebd Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop' 
Ent 12213 cambiar update manager por warp update

See merge request artica/pandorafms!6546
 2023-12-01 10:07:07 +00:00
Rafael Ameijeiras e52c596c82 Merge branch 'ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos' into 'develop' 
fix error move agents to metaconsole pandora_enterprise#12086

See merge request artica/pandorafms!6661
 2023-12-01 10:06:51 +00:00
daniel b31f24aca4 remove conf agents pandora_enterprise#12293 2023-12-01 11:05:01 +01:00
Rafael Ameijeiras bc2c27d839 Merge branch 'ent-12052-filtro-de-vista-alert-details-no-muestra-las-alertas-de-los-agentes-que-tienen-grupo' into 'develop' 
Ent 12052 filtro de vista alert details no muestra las alertas de los agentes que tienen grupo

See merge request artica/pandorafms!6463
 2023-12-01 10:04:46 +00:00
daniel 95fb500fb5 Merge remote-tracking branch 'origin/develop' into ent-12293-16468-borrado-de-agentes-deshabilitados-mediante-el-pandora_db 2023-12-01 10:33:21 +01:00
miguel angel rasteu b89f182e19 #12213 Resolve conflicts 2023-12-01 10:31:50 +01:00
daniel b10a9e8274 Merge remote-tracking branch 'origin/develop' into ent-12086-giss-simbolo-en-bloque-de-modulo-de-tipo-dataserver-se-pierde-al-mover-agentes-a-otros-nodos 
Conflicts:
	pandora_console/include/api.php
 2023-12-01 10:31:17 +01:00
Rafael Ameijeiras 0ed2a6f946 Merge branch 'ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update' into 'develop' 
Ent 12516 cambio de modelo en actualizaciones solo lts por defecto mostrar informacion sobre versiones en warp update

See merge request artica/pandorafms!6715
 2023-12-01 09:27:45 +00:00
miguel angel rasteu f847de7437 Merge branch 'develop' into ent-12052-filtro-de-vista-alert-details-no-muestra-las-alertas-de-los-agentes-que-tienen-grupo 2023-12-01 10:27:23 +01:00
Rafael Ameijeiras d8063fd008 Merge branch 'ent-11652-en-detalles-de-alertas-el-contenido-no-se-adapta-al-espacio-adicional-disponible-al-colapsar' into 'develop' 
Ent 11652 en detalles de alertas el contenido no se adapta al espacio adicional disponible al colapsar

See merge request artica/pandorafms!6397
 2023-12-01 09:23:23 +00:00
Rafael Ameijeiras c91d76706a Merge branch 'ent-12175-fallo-visual-vista-tactica-eventos-recuperados' into 'develop' 
Ent 12175 fallo visual vista tactica eventos recuperados

See merge request artica/pandorafms!6617
 2023-12-01 09:22:56 +00:00
Rafael Ameijeiras 269a4ddfa9 Merge branch 'ent-12123-cve-2023-44089-xss-en-consola-visual' into 'develop' 
Ent 12123 cve 2023 44089 xss en consola visual

See merge request artica/pandorafms!6497
 2023-12-01 09:22:31 +00:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
miguel angel rasteu ec8d16e49b #11652 Resolve conflicts 2023-12-01 10:07:41 +01:00
miguel angel rasteu fb2e433b5c #12175 Resolve conflicts 2023-12-01 10:00:51 +01:00
Daniel Rodriguez 39c6420d2c Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' 
Ent 11763 15982 regex en busqueda de eventos

See merge request artica/pandorafms!6512
 2023-12-01 08:44:46 +00:00
miguel angel rasteu 0ef4685569 #12123 Resolve conflicts 2023-12-01 09:35:50 +01:00
artica 3b6eac4284 Auto-updated build strings. 2023-12-01 01:00:28 +01:00
felix.suarez 07d6a4cdf6 Avoid add last_compact_offset when is zero 2023-11-30 09:19:50 -06:00
Rafael Ameijeiras b0b05a833d Merge branch 'ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894' into 'develop' 
Ent 12495 volver al comportamiento anterior en temas de permisos politicas 10894

See merge request artica/pandorafms!6700
 2023-11-30 15:11:38 +00:00
Jorge Rincon 6edc90ec87 #12516 The modal is added to the online updates view. 
lts_updates token is added to pandoradb_data.sql
 2023-11-30 15:59:57 +01:00
Jonathan f780d0bd2a #12533 enable event list no group (Default all) 2023-11-30 15:58:39 +01:00
Diego Muñoz-Reja 6cde922505 Merge branch 'ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre' into 'develop' 
change service modules async to generic pandora_enterprise#11681

See merge request artica/pandorafms!6654
 2023-11-30 14:03:07 +00:00
Matias Didier 874e60bf55 Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop' 
Ent 12248 mover token de configuracion s flow a la seccion de netflow

See merge request artica/pandorafms!6621
 2023-11-30 13:05:46 +00:00
Diego Muñoz-Reja c4e5a3bebd Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop' 
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso

See merge request artica/pandorafms!6501
 2023-11-30 12:48:00 +00:00
Daniel Maya e4b369c769 Merge branch 'develop' into ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894 2023-11-30 13:30:29 +01:00
Daniel Cebrian 01e1ecefac #12247 fixed name graphs 2023-11-30 13:06:05 +01:00
Jonathan ee6717aa06 #12341 limit invnetory on windows basic options 2023-11-30 12:53:59 +01:00
Matias Didier 8cfb0353dd Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop' 
fix sound alerts severity filter pandora_enterprise#12378

See merge request artica/pandorafms!6663
 2023-11-30 11:41:30 +00:00
Jonathan 607d7e36e5 #12341 enable invetory .vbs 2023-11-30 12:11:12 +01:00
Jorge Rincon 313407dcc5 Merge branch 'develop' into ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update 2023-11-30 11:53:35 +01:00
Jorge Rincon f9fd33fa2e #12516 Fixed set token configuration lts updates 2023-11-30 11:50:19 +01:00
Jonathan f600648cc0 #12341 fix agent_version 2023-11-30 11:43:54 +01:00
daniel 75606f679e Merge remote-tracking branch 'origin/develop' into ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre 
Conflicts:
	pandora_console/extras/mr/67.sql
 2023-11-30 11:27:20 +01:00