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

37365 Commits

Author SHA1 Message Date
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
Daniel Cebrian cf203a1a45 Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-12-11 09:32:50 +01: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
miguel angel rasteu d034116dd3 #11495 Fix report 2023-12-11 09:26:57 +01: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
miguel angel rasteu 8e69326e3c Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-11 08:43:37 +01: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
Jorge Rincon 725c5d964c #12620 fixed blacklist items in setup 2023-12-07 13:09:42 +01:00
Daniel Maya b99b0d4708 #12606 Fixed period 2023-12-07 12:49:20 +01: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
alejandro.campos@artica.es d229e06d77 Merge remote-tracking branch 'origin/develop' into ent-11711-Comprobar-versiones-de-dependencias-antes-de-actualizar 2023-12-05 18:04:24 +01:00
daniel 98f22dac72 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-05 16:48:33 +01:00
daniel 5c6f11511c fix error events sound modal pandora_enterprise#12607 2023-12-05 16:48:12 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es 457f8e9448 some changes in discovery 2023-12-05 16:07:14 +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 Cebrian 75720df6fa #12176 fixed empty news board 2023-12-05 13:23:37 +01: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
alejandro.campos@artica.es 08e514e12c Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' of brutus.artica.es:artica/pandorafms into ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline 2023-12-05 12:40:50 +01:00
alejandro.campos@artica.es 28d230433a upload image 2023-12-05 12:40:21 +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
Enrique Martin 1a473d3846 Added applications images 2023-12-05 12:33:42 +01:00
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