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

36876 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Rafael Ameijeiras 6a998c79ae Merge branch 'ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente' into 'develop' 
Ent 12095 correlacion de alertas con field event user comment no funciona adecuadamente

See merge request artica/pandorafms!6639
 2023-11-30 09:24:33 +00:00
Rafael Ameijeiras 57a9e6b3bf Merge branch 'ent-12188-script-mode-de-plugins-de-inventario-no-esta-funcionando' into 'develop' 
add code lost inventory server pandora_enterprise#12188

See merge request artica/pandorafms!6667
 2023-11-30 09:23:33 +00:00
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop' 
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
 2023-11-30 09:23:16 +00:00
Rafael Ameijeiras 0957a87dcb Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop' 
Ent 11705 15916 campo editable en vista de eventos

See merge request artica/pandorafms!6486
 2023-11-30 09:18:28 +00:00
Rafael Ameijeiras 98d414f262 Merge branch 'ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards' into 'develop' 
Ent 10983 Selector de rango de fechas para múltiples elementos a la vez en dashboards

See merge request artica/pandorafms!6413
 2023-11-30 08:58:15 +00:00
Jorge Rincon ac4b45646d #12516 Modal update lts added 2023-11-30 09:30:50 +01:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
Jonathan e8272c0006 #11763 Fix merge conflict 2023-11-30 07:57:25 +01:00
artica 9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
Daniel Rodriguez 7f4a928f35 Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop' 
Hide test button and setup in ITSM pandora_enterprise#12243

See merge request artica/pandorafms!6629
 2023-11-29 17:52:26 +00:00
Daniel Cebrian c0218ad75c Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-29 15:45:07 +01:00
Daniel Maya 544997d30c Merge branch 'develop' into ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente 2023-11-29 15:44:04 +01:00
Diego Muñoz-Reja eebab43e36 Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop' 
Ent 11907 incluir distro y version en about y diagnostic info

See merge request artica/pandorafms!6420
 2023-11-29 14:34:05 +00:00
Jorge Rincon 38a79fa6a6 #12516 fixed modal body padding 2023-11-29 15:30:41 +01:00
Rafael Ameijeiras e46fc163a9 Merge branch 'ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo' into 'develop' 
Ent 12451 nuevas alertas por defecto de telegram y vonage con mensaje erroneo

See merge request artica/pandorafms!6664
 2023-11-29 14:27:28 +00:00
Rafael Ameijeiras 60d9fffe22 Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' 
Ent 12137 propuesta de refactoring visual de vista ppal de agente

See merge request artica/pandorafms!6520
 2023-11-29 14:26:53 +00:00