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

17279 Commits

Author SHA1 Message Date
Enrique Martin 2cf0e301c5 Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop' 
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view

See merge request artica/pandorafms!5369
 2023-01-05 11:46:53 +00:00
Enrique Martin 9ccc4d1531 Merge branch 'ent-9910-bug-visual' into 'develop' 
Ent 9910 bug visual

See merge request artica/pandorafms!5372
 2023-01-05 11:44:16 +00:00
Enrique Martin ca7c745a82 Merge branch 'ent-10075-14724-reporte-en-pdf-no-muestra-de-sla-compliance-y-status' into 'develop' 
Ent 10075 14724 reporte en pdf no muestra de sla compliance y status

See merge request artica/pandorafms!5364
 2023-01-05 11:36:16 +00:00
Jonathan e55d4f3019 #9787 Alert general Acknowledged recovery 2023-01-05 10:36:14 +01:00
Daniel Cebrian 28ce3c4c86 #9679 added id user in review logs 2023-01-05 09:44:59 +01:00
Daniel Cebrian c19b13fd3b #9817 fixed create/delete profile in user editor 2023-01-05 08:58:22 +01:00
artica a54599caba Auto-updated build strings. 2023-01-05 01:01:14 +01:00
Enrique Martin 78c565cbc1 Merge branch 'ent-10101-comprobar-varchar60-antes-de-hacer-el-cambio-de-md5-sha' into 'develop' 
Ent 10101 comprobar varchar60 antes de hacer el cambio de md5 sha

See merge request artica/pandorafms!5371
 2023-01-04 15:46:02 +00:00
Daniel Maya 0e6d02acbe #10101 Fixed password_hash 2 2023-01-04 16:23:56 +01:00
Jonathan bc6893b83e #9362 Change sql for count modules from tagente_datos 2023-01-04 11:36:26 +01:00
Jonathan 6f2b50af56 #9362 Change getInforTAgenteDatos count alert 2023-01-04 11:16:51 +01:00
Jonathan e311602520 #9440 Change permissions on planned_downtimes_additem to AR 2023-01-04 09:52:47 +01:00
artica c889f092ce Auto-updated build strings. 2023-01-04 01:01:11 +01:00
Daniel Cebrian 49ebd5b576 fixed visual bug in calendar 2023-01-03 17:31:28 +01:00
Daniel Maya 13aa76af1e #10101 Fixed password_hash 2023-01-03 17:08:28 +01:00
Diego Muñoz-Reja 9d915e63a0 Merge branch 'ent-9868-eliminar-footer-reemplazar-por-seccion-about' into 'develop' 
Ent 9868 eliminar footer reemplazar por seccion about

See merge request artica/pandorafms!5363
 2023-01-03 15:20:12 +00:00
Jonathan b9d6898639 #9758 update_alert_count on enable/disable alerts 2023-01-03 15:09:18 +01:00
artica 587ff9e541 Auto-updated build strings. 2023-01-03 01:01:03 +01:00
artica 5c173e3360 Auto-updated build strings. 2023-01-02 01:01:15 +01:00
artica db9ccab429 Auto-updated build strings. 2023-01-01 01:00:55 +01:00
artica 0a6a234f39 Auto-updated build strings. 2022-12-31 01:01:06 +01:00
Calvo 88aed19d30 Api auth bearer token working 2022-12-30 16:11:49 +01:00
Calvo c608ef6fcf Api auth bearer token 2022-12-30 15:55:46 +01:00
Calvo 38838cd4e0 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-30 15:25:57 +01:00
Pablo Aragon f310ce49a9 10075 Compatibility SLA report with php8 2022-12-30 10:21:43 +01:00
artica ebae22636e Auto-updated build strings. 2022-12-30 01:01:07 +01:00
Rafael Ameijeiras 2ac254961c Merge branch 'ent-9966-acceso-a-nodos-con-usuario-no-admin' into 'develop' 
Added metaconsole_access_node value to new_user API function

See merge request artica/pandorafms!5309
 2022-12-29 20:32:33 +00:00
Calvo 867749f9d3 Fix inventory blacklist open 2022-12-29 18:14:43 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Calvo c14842a4f9 WIP:Api auth with bearer token 2022-12-29 17:20:34 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
artica 0217a02da7 Auto-updated build strings. 2022-12-29 01:01:57 +01:00
Calvo fc7187ed0c Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 18:32:49 +01:00
Rafael Ameijeiras 96257faf31 Merge branch 'ent-9556-14267-Conteo-y-paginacion-incorrecto-en-vista-de-Dashboards' into 'develop' 
fixed count query for admin user

See merge request artica/pandorafms!5348
 2022-12-28 11:35:18 +00:00
Rafael Ameijeiras 0549a71e41 Merge branch 'ent-10049-bug-al-editar-agente-de-cluster-desde-tree-view-de-meta' into 'develop' 
Ent 10049 bug al editar agente de cluster desde tree view de meta

See merge request artica/pandorafms!5349
 2022-12-28 10:27:58 +00:00
Rafael Ameijeiras 6b4bc8b9b0 Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop' 
Ent 9903 no permitir nombres de perfiles duplicados

See merge request artica/pandorafms!5321
 2022-12-28 10:01:46 +00:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Rafael Ameijeiras b9d33a6315 Merge branch 'ent-10044-bugs-vista-snmp-traps' into 'develop' 
Ent 10044 bugs vista snmp traps

See merge request artica/pandorafms!5353
 2022-12-28 09:58:38 +00:00
Rafael Ameijeiras 1cb7149db3 Merge branch 'ent-10048-bug-mail-to-admin-en-monitoring-alert-details' into 'develop' 
Ent 10048 bug mail to admin en monitoring alert details

See merge request artica/pandorafms!5355
 2022-12-28 09:58:08 +00:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' 
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
 2022-12-28 09:42:23 +00:00
Rafael Ameijeiras 171fb5ed46 Merge branch 'ent-9825-no-se-suben-imagenes-por-file-manager-en-meta' into 'develop' 
Ent 9825 no se suben imagenes por file manager en meta

See merge request artica/pandorafms!5358
 2022-12-28 09:41:37 +00:00
artica ffb5172509 Auto-updated build strings. 2022-12-28 01:00:58 +01:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
daniel 8273450332 phpchartjs pandora_enterprise#9554 2022-12-27 12:48:09 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
Pablo Aragon 6a528496cd 9825 Add function get file via POST 2022-12-27 08:41:15 +01:00
artica 46a924c4f4 Auto-updated build strings. 2022-12-27 01:00:48 +01:00
artica e613ed0d1b Auto-updated build strings. 2022-12-26 01:00:52 +01:00
artica 73de629e73 Auto-updated build strings. 2022-12-25 01:00:31 +01:00
artica d5c8ba741f Auto-updated build strings. 2022-12-24 01:00:27 +01:00
daniel c32483a38a phpchartjs pandora_enterprise#9554 2022-12-23 11:34:35 +01:00
Pablo Aragon 9073349e94 10048 Exclude id_alert_action from query 2022-12-23 11:10:36 +01:00
Pablo Aragon fe548936a0 10048 Exclude id_alert_action from query 2022-12-23 10:29:18 +01:00
Rafael Ameijeiras c25ad3d4ea Merge branch 'ent-9932-errores-en-consola-del-navegador-de-filtro-del-snmp-browser' into 'develop' 
Fi browser console reporting errors

See merge request artica/pandorafms!5330
 2022-12-23 07:43:21 +00:00
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
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
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
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