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

37376 Commits

Author SHA1 Message Date
alejandro.campos@artica.es cfc1992d26 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es 9622b61557 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:40 +01:00
Diego Muñoz-Reja b2bcae6571 Merge branch 'ent-11966-no-se-envian-imagenes-correctamente-utilizando-la-macro-_moduledata_x_' into 'develop' 
Fix _moduledata_x when data is a b64 image

See merge request artica/pandorafms!6585
 2023-12-05 11:18:54 +00:00
Enrique Martin 2d1b2bf6d2 Added new dashboard widgets 2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es e7f18709b7 optimization 2023-12-05 12:07:23 +01:00
alejandro.campos@artica.es d601103df3 fix url 2023-12-05 11:49:43 +01:00
daniel 34784752b7 fix error js load modal filter sound events pandora_enterprise#12607 2023-12-05 11:47:37 +01:00
alejandro.campos@artica.es 433ce7971f minor change 2023-12-05 11:38:11 +01:00
alejandro.campos@artica.es 60137eb300 changes in discovery extensions 2023-12-05 11:32:19 +01:00
miguel angel rasteu 6455314f0c Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-05 11:16:42 +01:00
daniel ee3df634d6 fix error histogram and events history graph pandora_enterprise#12209 2023-12-05 10:35:02 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
alejandro.campos@artica.es c9c3426b16 minor change 2023-12-05 08:30:00 +01:00
daniel 77cf0ce6ca 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-05 08:02:55 +01:00
artica cdb3308e7a Auto-updated build strings. 2023-12-05 01:00:24 +01:00
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
Daniel Cebrian ea474ecd89 #12566 changes in events table 2023-12-04 15:05:01 +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
alejandro.campos@artica.es 4a64f023fe Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es 75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
rafael 7125fd9a8f change package links 2023-12-04 11:26:50 +01: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
Enrique Martin 988841084c Fixed log modules generation 2023-12-04 00:00:41 +01:00
Enrique Martin 7892eb5c0c Added log modules 2023-12-03 23:52:55 +01:00
Enrique Martin 55aee67df3 Added GIS maps creation 2023-12-03 23:23:57 +01:00
Enrique Martin b14c77862e Added new items to visual consoles 2023-12-03 21:43:00 +01:00
Enrique Martin 14fc8ef2b1 Added new items to visual consoles and fixed unknown modules on creation 2023-12-03 21:30:17 +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
Daniel Cebrian 5609bc2313 #12581 fixed strong size in visual console 2023-12-01 13:45:17 +01:00
miguel angel rasteu 3c99a2e49a #11494 Fix Av. bug 2023-12-01 13:29:51 +01:00
Jonathan 1fb98d34ae #12296 fix conflict merge develop 2023-12-01 11:59:03 +01:00
Jonathan e2eaf6e01e #12381 fix conflict merge develop 2023-12-01 11:22:15 +01:00
Calvo fd48d6eba6 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-01 11:16:56 +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
miguel angel rasteu 41b92cc55f Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-01 10:34:43 +01: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