tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
31,696 Commits 34 Branches 30 Tags
Commit Graph

31696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Barbero
0428aeab23 Merge remote-tracking branch 'origin/develop' into ent-9282-13952-bug-en-filtrado-ipam 2022-08-09 07:26:52 +02:00
artica
0579dc9162 Auto-updated build strings. 2022-08-09 01:00:20 +02:00
Daniel Barbero
d9227fae0e fix console report pandora_enterprise#6367 2022-08-08 13:51:07 +02:00
Ramon Novoa
f198e37876 Add support for IPAM XML files. 
The Data Server can now process IPAM data coming from Satellite Servers
through XML files.
 2022-08-08 13:50:25 +02:00
Daniel Barbero
743b1c295f Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-08-08 12:26:27 +02:00
Daniel Barbero
1e4fa95730 discovery server to none pandora_enterprise#9282 2022-08-08 12:24:04 +02:00
Daniel Maya
626d5b1d0d #9277 new translations 2022-08-08 12:11:56 +02:00
Daniel Maya
ea18fda67a #9151 resize multiselect 2022-08-08 12:04:29 +02:00
Calvo
ced2a0837c Fix fixed ip switch issues 2022-08-08 10:23:11 +02:00
Calvo
db72108b0e Satellite agent management 2022-08-08 09:53:03 +02:00
Daniel Barbero
d099420220 Merge remote-tracking branch 'origin/develop' into ent-9201-mergeador-bloqueo-pandora_db 2022-08-08 07:44:07 +02:00
artica
ca73c60579 Auto-updated build strings. 2022-08-08 01:00:17 +02:00
artica
5ca696572a Auto-updated build strings. 2022-08-07 01:00:18 +02:00
artica
362a86740a Auto-updated build strings. 2022-08-06 01:00:19 +02:00
Calvo
2c8b9b3aa5 Satellite agent management 2022-08-05 21:49:42 +02:00
Jimmy Olano
5ad550a935 Merge branch 'ent-9092-errata-url-icono-de-ayuda-creacion-modulos-SNMP' into 'develop' 
Fix URL Typo

pandora_enterprise#9092

See merge request artica/pandorafms!5042
 2022-08-05 19:30:10 +00:00
Diego Muñoz-Reja
da1838d3bb Merge branch 'ent-8884-meter-os_version-cogiendo-de-recon-de-red' into 'develop' 
Add support for OS version detection via SNMP.

See merge request artica/pandorafms!5038
 2022-08-05 12:58:53 +00:00
José González
f1979e30c2 Fix URL Typo 2022-08-05 11:03:10 +02:00
artica
e9668c1746 Auto-updated build strings. 2022-08-05 01:00:20 +02:00
Daniel Barbero
638d073967 add check locked bbdd in merge process pandora_enterprise#9201 2022-08-04 15:11:51 +02:00
alejandro.campos@artica.es
120003ab20 added dynamic token filter to view 2022-08-04 14:05:06 +02:00
Daniel Barbero
057ffc5003 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-08-04 11:44:38 +02:00
Daniel Barbero
38c7bcc061 fix errors ipam pandora_enterprise#9282 2022-08-04 10:10:20 +02:00
alejandro.campos@artica.es
af63bfe948 implemented visual editor for satellite conf and added some changes on editor 2022-08-04 09:14:05 +02:00
artica
56196b12c7 Auto-updated build strings. 2022-08-04 01:00:20 +02:00
Ramon Novoa
66a95adb0c Add support for OS version detection via SNMP. 
sysDescr is retrieved via SNMP if available and stored in
tagente.os_version. Ref. pandora_enterprise#8884.
 2022-08-03 13:32:42 +02:00
Diego Muñoz-Reja
4968101d59 Merge branch 'ent-8762-alert-server-token-para-controlar-encolado-de-alertas' into 'develop' 
Add an option to control alert queuing.

See merge request artica/pandorafms!5025
 2022-08-03 10:45:11 +00:00
artica
5ffd966c7a Auto-updated build strings. 2022-08-03 01:00:21 +02:00
Rafael Ameijeiras
b0f0d6056c Merge branch 'ent-9333-cambiar-repositorio-del-paquete-perl-crypt-ssleay-del-instalador-online' into 'develop' 
cambiar-repositorio-del-paquete-perl-crypt-ssleay-del-instalador-online

See merge request artica/pandorafms!5037
 2022-08-02 11:11:46 +00:00
Rafael Ameijeiras
ad630a6b66 cambiar-repositorio-del-paquete-perl-crypt-ssleay-del-instalador-online 2022-08-02 13:08:13 +02:00
Daniel Barbero
2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
artica
4d2f892160 Auto-updated build strings. 2022-08-02 01:00:21 +02:00
Jimmy Olano
8d7b02069a Merge branch 'ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado' into 'develop' 
not group by event status pandora_enterprise#8043

pandora_enterprise#8043

See merge request artica/pandorafms!5031
 2022-08-01 18:46:38 +00:00
Diego Muñoz-Reja
4cbd23d911 Merge branch 'ent-8836-post-macros-para-custom-data-de-eventos-no-funcionan-sin-base64' into 'develop' 
Ent 8836 post macros para custom data de eventos no funcionan sin base64

See merge request artica/pandorafms!4879
 2022-08-01 13:02:00 +00:00
Daniel Barbero
c4d085c24c fixed error dashboards pandora_enterprise#9229 2022-08-01 13:46:11 +02:00
Daniel Barbero
13c1f78463 Merge remote-tracking branch 'origin/develop' into ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados 2022-08-01 13:00:49 +02:00
Daniel Barbero
e11d46ea60 Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado 
Conflicts:
	pandora_console/include/ajax/events.php
 2022-08-01 07:08:00 +02:00
Jimmy Olano
2a5d075d03 Merge branch 'ent-9290-pete-sql-al-buscar-eventos-por-custom-data' into 'develop' 
fix error collation events pandora_enterprise#9290

pandora_enterprise#9290

See merge request artica/pandorafms!5030
 2022-08-01 00:22:53 +00:00
artica
59bb85e931 Auto-updated build strings. 2022-08-01 01:00:18 +02:00
Jimmy Olano
1b07631f5f Merge branch 'ent-9305-comentarios-se-agrupan-incorrectamente-en-vista-de-eventos' into 'develop' 
fix error custom data show all in tab events pandora_enterprise#9305

pandora_enterprise#9305

See merge request artica/pandorafms!5028
 2022-07-31 22:20:00 +00:00
artica
f4c686844b Auto-updated build strings. 2022-07-31 01:00:16 +02:00
artica
04e9c8de43 Auto-updated build strings. 2022-07-30 01:00:20 +02:00
Luis
33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal' 
# Conflicts:
#   pandora_console/extras/mr/56.sql
 2022-07-29 11:20:22 +00:00
Daniel Rodriguez
9751167f56 Merge branch 'ent-9273-comprobacion-base-de-datos-de-historico-del-setup-provoca-error-504' into 'develop' 
fixed history timeout pandora_enterprise#9273

See merge request artica/pandorafms!5034
 2022-07-29 08:38:12 +00:00
Daniel Barbero Martin
bd69105d7e fix label color vc black theme pandora_enterprise#9321 2022-07-29 09:37:38 +02:00
Daniel Barbero Martin
fe1a2cd962 collation mysql8 pandora_enterprise#9290 2022-07-29 08:46:17 +02:00
Daniel Barbero Martin
b60ab583bf Merge remote-tracking branch 'origin/develop' into ent-9290-pete-sql-al-buscar-eventos-por-custom-data 2022-07-29 08:43:58 +02:00
artica
7d4ba6191c Auto-updated build strings. 2022-07-29 01:00:22 +02:00
Jimmy Olano
86ad06a3bb Merge branch 'ent-9304-columna-custom-data-se-muestra-incorrectamente-en-vista-de-eventos' into 'develop' 
fix error custom data events list pandora_enterprise#9304

pandora_enterprise#9304

See merge request artica/pandorafms!5027
 2022-07-28 16:25:27 +00:00
Daniel Barbero Martin
d8bac6dde9 fixed show modal label VC in list item pandora_enterprise#9321 2022-07-28 14:30:08 +02:00