19098 Commits

Author SHA1 Message Date
artica
b32c8d43ea Auto-updated build strings. 2022-12-23 01:00:49 +01:00
daniel
5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Calvo
617c044a92 Fix js snmp browser errors 2022-12-22 20:10:02 +01:00
Daniel Rodriguez
b64ce98241 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' into 'develop'
Ent 8297 mejoras en gestion de acceso a pandora md5 sha256 y salt opcional

See merge request artica/pandorafms!5343
2022-12-22 15:38:45 +00:00
Jonathan
b666a3c308 #10044 Fix limit on rows showing on monitoring snmp console traps 2022-12-22 16:32:17 +01:00
Rafael Ameijeiras
87984e2358 Merge branch 'ent-9720-widget-module-histogram-no-muestra-cambios-de-estado' into 'develop'
convert histogram in SLA + warning pandora_enterprise#9720

See merge request artica/pandorafms!5350
2022-12-22 12:39:10 +00:00
daniel
2b104ca905 phpchartjs pandora_enterprise#9554 2022-12-22 13:13:10 +01:00
daniel
baea5c36b4 fix histogram pandora_enterprise#9720 2022-12-22 12:08:03 +01:00
Daniel Rodriguez
1ed35a8769 Merge branch 'ent-10050-actualizacion-traducciones' into 'develop'
translates pandora_enterprise#10050

See merge request artica/pandorafms!5347
2022-12-22 10:40:40 +00:00
Calvo
2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
artica
71544593e7 Auto-updated build strings. 2022-12-22 01:00:18 +01:00
Jonathan
8a68018c64 #10049 fix error500 edit cluster metaconsole 2022-12-21 15:38:34 +01:00
daniel
9cfdcc765c convert histogram in SLA + warning pandora_enterprise#9720 2022-12-21 15:33:39 +01:00
Rafael Ameijeiras
9881cd82fc Merge branch 'ent-9994-no-selecciona-module-group-correctamente-al-crear-un-modulo' into 'develop'
Ent 9994 no selecciona module group correctamente al crear un modulo

See merge request artica/pandorafms!5346
2022-12-21 13:43:10 +00:00
alejandro.campos@artica.es
4ee89b5b3e fixed count query for admin user 2022-12-21 13:39:03 +01:00
daniel
b2f82807f1 translates pandora_enterprise#10050 2022-12-21 13:11:24 +01:00
Pablo Aragon
78c4f15c16 9994 Add trigger to id_module_group 2022-12-21 12:56:26 +01:00
daniel
47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Rafael Ameijeiras
9ad2556201 Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop'
Ent 1270 borrado de modulos hijos automatico

See merge request artica/pandorafms!5340
2022-12-21 11:49:39 +00:00
daniel
1dee676d5b phpchartjs pandora_enterprise#9554 2022-12-21 12:33:53 +01:00
Jonathan
fa0a38b1a7 #1270 Not delete cascade for cluster modules 2022-12-21 11:54:41 +01:00
Rafael Ameijeiras
b79d3d9a08 Merge branch 'ent-9463-Mejorar-linkado-mapas-de-red' into 'develop'
Ent 9463 mejorar linkado mapas de red

See merge request artica/pandorafms!5339
2022-12-21 10:53:29 +00:00
daniel
872b079b20 fix errors in new charts pandora_enterprise#9554 2022-12-21 11:49:57 +01:00
alejandro.campos@artica.es
3970c3b7c1 fixed 500 2022-12-21 10:43:43 +01:00
daniel
36eda00ae6 fix errors in new charts pandora_enterprise#9554 2022-12-21 10:07:18 +01:00
Daniel Rodriguez
cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop'
implement cluster in open project

See merge request artica/pandorafms!5204
2022-12-21 09:05:01 +00:00
artica
258c4c2c9f Auto-updated build strings. 2022-12-21 01:00:22 +01:00
Rafael Ameijeiras
5934b02738 Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop'
fixed csrf

See merge request artica/pandorafms!5336
2022-12-20 17:50:21 +00:00
Jose Gonzalez
ffa4ec756c Agent Group icons adding 2022-12-20 17:22:35 +01:00
Diego Muñoz-Reja
de0efc7f3a Merge branch 'ent-9965-error-sql-en-busqueda-de-widgets' into 'develop'
Fix sql error on widget search

See merge request artica/pandorafms!5323
2022-12-20 15:04:58 +00:00
alejandro.campos@artica.es
73e8495f96 removed enterprise limitation 2022-12-20 15:43:05 +01:00
daniel
ae88c33aad composer static phpchartjs pandora_enterprise#9554 2022-12-20 14:22:13 +01:00
alejandro.campos@artica.es
47cb138d9b path fix 2022-12-20 14:15:33 +01:00
Alejandro Campos
93c1c040dd Merge branch 'develop' into 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional'
# Conflicts:
#   pandora_console/extras/mr/60.sql
2022-12-20 12:05:31 +00:00
Rafael Ameijeiras
e642ca29b5 Merge branch 'ent-9922-no-se-puede-filtrar-por-tags-en-la-vista-de-alertas' into 'develop'
Fix alert list tag filter

See merge request artica/pandorafms!5315
2022-12-20 11:25:53 +00:00
Daniel Barbero
3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
alejandro.campos@artica.es
bd7480a1e1 bcrypt implementation 2022-12-20 12:22:43 +01:00
Calvo
f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Daniel Rodriguez
0f4e3d4056 Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop'
Ent 9292 13830 vista traps snmp peta con muchos elementos

See merge request artica/pandorafms!5255
2022-12-20 10:20:26 +00:00
Daniel Maya
23407892b9 #9292 fixed issues 3 2022-12-20 10:03:45 +01:00
artica
38b946c326 Auto-updated build strings. 2022-12-20 01:00:21 +01:00
Jonathan
618c07bf40 #1270 Add document module_check_childrens_and_delete function 2022-12-19 17:08:32 +01:00
Jonathan
e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
Jose Gonzalez
b0997850f4 Fix server type icon definition 2022-12-19 16:38:47 +01:00
Daniel Maya
091dda3eea #9292 fixed issues 2 2022-12-19 16:30:41 +01:00
Rafael Ameijeiras
6982d79bbd Merge branch 'ent-9912-14580-guardia-problema-ejecucion-en-la-tareas-programadas' into 'develop'
Ent 9912 14580 guardia problema ejecucion en la tareas programadas

See merge request artica/pandorafms!5296
2022-12-19 14:33:01 +00:00
Jose Gonzalez
977c358fa0 Grouped somethings 2022-12-19 15:08:53 +01:00
Daniel Maya
aa34653049 #9292 fixed issues 2022-12-19 11:51:43 +01:00
Rafael Ameijeiras
b640b9f7b9 Merge branch 'ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard' into 'develop'
new widget datamatrix pandora_enterprise#8619

See merge request artica/pandorafms!5257
2022-12-19 10:49:45 +00:00
Calvo
63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00