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

37008 Commits

Author SHA1 Message Date
Enrique Martin a2f60a1d22 Updated MR changes 2023-12-12 12:12:24 +01:00
Jonathan 49fd9435dd Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-11 10:13:46 +01:00
Rafael Ameijeiras 071427e60b Merge branch 'ent-12274-pandora-gotty-no-se-levanta-automaticamente-con-el-cron-en-ubuntu' into 'develop' 
fix pgrep process in ubuntu

See merge request artica/pandorafms!6658
 2023-12-11 08:54:30 +00:00
Rafael Ameijeiras fcd37cba14 Merge branch 'ent-12342-nuevos-valores-de-configuracion-por-defecto-para-los-agentes' into 'develop' 
Ent-12342-nuevos-valores-de-configuracion-por-defecto-para-los-agentes

See merge request artica/pandorafms!6710
 2023-12-11 08:30:04 +00:00
Rafael Ameijeiras be553ed170 Merge branch 'ent-11954-16123-borrado-de-acciones-no-deseadas-con-bulk' into 'develop' 
Ent 11954 16123 borrado de acciones no deseadas con bulk

See merge request artica/pandorafms!6380
 2023-12-11 08:29:29 +00:00
Rafael Ameijeiras 1e2f573a3b Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop' 
Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona

See merge request artica/pandorafms!6673
 2023-12-11 08:28:56 +00:00
Rafael Ameijeiras ce298c1e8f Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop' 
change url pandorarc name

See merge request artica/pandorafms!6649
 2023-12-11 08:24:46 +00:00
Rafael Ameijeiras 62538643e4 Merge branch 'ent-12334-query-para-borrar-el-campo-transactional_agent-de-tagente' into 'develop' 
queries remove field transactional_agent pandora_enterprise#12334

See merge request artica/pandorafms!6643
 2023-12-11 08:24:04 +00:00
Rafael Ameijeiras 781a3656cc Merge branch 'ent-11494-nuevo-widget-service-level-detail' into 'develop' 
Ent 11494 nuevo widget service level detail

See merge request artica/pandorafms!6438
 2023-12-11 08:21:13 +00:00
artica 5351af2f7a Auto-updated build strings. 2023-12-11 01:00:22 +01:00
artica 16f75809f1 Auto-updated build strings. 2023-12-10 01:00:20 +01:00
artica ef339a1bbe Auto-updated build strings. 2023-12-09 01:00:21 +01:00
artica d83a64da9c Auto-updated build strings. 2023-12-08 01:00:28 +01:00
Matias Didier 385989f185 Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop' 
VC Public links pandora_enterprise#12329

See merge request artica/pandorafms!6633
 2023-12-07 15:27:57 +00:00
daniel 06dcafaf0f Merge remote-tracking branch 'origin/develop' into ent-12334-query-para-borrar-el-campo-transactional_agent-de-tagente 
Conflicts:
	pandora_console/extras/mr/67.sql
 2023-12-07 11:44:59 +01:00
Diego Muñoz-Reja 4d8aa8f697 Merge branch 'ent-11886-errata-minimun-en-informes' into 'develop' 
Ent 11886 errata minimun en informes

See merge request artica/pandorafms!6386
 2023-12-07 09:59:29 +00:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
Diego Muñoz-Reja b1b3cced7d Merge branch 'ent-11903-16107-borrar-listado-mapas-gis' into 'develop' 
Ent 11903 16107 borrar listado mapas gis

See merge request artica/pandorafms!6393
 2023-12-07 09:27:38 +00:00
Diego Muñoz-Reja 0c1b01f5b7 Merge branch 'ent-12138-eliminar-agent-access-graph-2' into 'develop' 
Ent 12138 eliminar agent access graph 2

See merge request artica/pandorafms!6742
 2023-12-07 09:25:51 +00:00
miguel angel rasteu 0337afcdaf #12138 Fix SQL code 2023-12-07 10:21:57 +01:00
artica 62901b6a70 Auto-updated build strings. 2023-12-07 01:00:21 +01:00
artica 0481af6b50 Auto-updated build strings. 2023-12-06 01:00:26 +01:00
Matias Didier 875dba559d Merge branch 'ent-12209-module-histogram-widget-no-coge-bien-los-estados-del-modulo' into 'develop' 
Module histogram only events pandora_enterprise#12209

See merge request artica/pandorafms!6607
 2023-12-05 13:03:09 +00:00
daniel 066cb857e9 fix error histogram pandora_enterprise#12209 2023-12-05 13:15:54 +01:00
miguel angel rasteu 21ea0f5196 #11494 Fix MTRS 2023-12-05 12:53:32 +01:00
daniel 10515e88df Merge remote-tracking branch 'origin/develop' into ent-12209-module-histogram-widget-no-coge-bien-los-estados-del-modulo 2023-12-05 12:37:17 +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
alejandro.campos@artica.es d601103df3 fix url 2023-12-05 11:49:43 +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
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
miguel angel rasteu 3c99a2e49a #11494 Fix Av. bug 2023-12-01 13:29:51 +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