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

25418 Commits

Author SHA1 Message Date
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
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 19b74922a8 Merge branch 'ent-9587-busqueda-doble-en-vista-de-agentes' into 'develop' 
Ent 9587 busqueda doble en vista de agentes

See merge request artica/pandorafms!5360
 2022-12-28 09:56:34 +00:00
Rafael Ameijeiras 7c0b6330bd Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop' 
Ent 9997 quitar using module component de la edicion de modulo

See merge request artica/pandorafms!5354
 2022-12-28 09:49:42 +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
Rafael Ameijeiras 46c59c3880 Merge branch 'ent-9827-bug-external-link-vacio-pantalla-de-inicio-de-usuario' into 'develop' 
Ent 9827 bug external link vacio pantalla de inicio de usuario

See merge request artica/pandorafms!5356
 2022-12-28 09:40:33 +00:00
Rafael Ameijeiras db7205fed3 Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop' 
Ent 9996 descripcion incorrecta al crear modulo ssh

See merge request artica/pandorafms!5351
 2022-12-28 09:37:04 +00:00
Jonathan 3caaf3a2a5 #9587 agent view - filter alerts when filter on list of modules 2022-12-28 10:03:31 +01: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
Jonathan 1536b8dbf8 #9827 no redirection on login when url empty on config user 2022-12-23 12:07: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
Daniel Rodriguez 05687a9ef2 Merge branch 'ent-1841-filtro-por-so-en-politicas-cepsa' into 'develop' 
SO filter on policy

See merge request artica/pandorafms!5331
 2022-12-23 09:38:29 +00:00
Pablo Aragon fe548936a0 10048 Exclude id_alert_action from query 2022-12-23 10:29:18 +01:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +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
Pablo Aragon b4dfc5993f 9991 Change Skin label to Theme 2022-12-22 11:01:21 +01:00
Rafael Ameijeiras 925749dc5f Merge branch 'ent-9052-lista-de-modulos-de-un-agente-ordenar-filtros-y-controles' into 'develop' 
Ent 9052 lista de modulos de un agente ordenar filtros y controles

See merge request artica/pandorafms!5327
 2022-12-22 09:35:41 +00:00
artica 71544593e7 Auto-updated build strings. 2022-12-22 01:00:18 +01:00
Pablo Aragon d83abafaaa 9996 Edit description when create ssh module 2022-12-21 17:05:01 +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
Rafael Ameijeiras 64510a6e31 Merge branch 'ent-9059-vista-de-grupos-de-agentes-acortar-y-ordenar-filtro' into 'develop' 
Ent 9059 vista de grupos de agentes acortar y ordenar filtro

See merge request artica/pandorafms!5322
 2022-12-21 13:41:31 +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
Jonathan f62116bf92 #1270 deleche children modules on checked 2022-12-21 08:44:11 +01: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
Rafael Ameijeiras 7091654e65 Merge branch 'ent-9844-bug-en-el-filtro-de-alertas' into 'develop' 
Fix alert list view search bug

See merge request artica/pandorafms!5319
 2022-12-20 17:49:07 +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
Rafael Ameijeiras e0b5abba31 Merge branch 'ent-9738-14457-Cambio-de-nodo-en-Informe-SQL-no-funciona-tras-edicion-META' into 'develop' 
fixed report update

See merge request artica/pandorafms!5334
 2022-12-20 13:38:54 +00: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
Rafael Ameijeiras 434fd17277 Merge branch 'ent-9908-Fallo-en-filtro-de-eventos-metaconsola-al-modificar-el-autorrefresco' into 'develop' 
fix bug when loading filters from base64 string

See merge request artica/pandorafms!5332
 2022-12-20 12:54:56 +00:00
alejandro.campos@artica.es 5520daead9 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' of brutus.artica.es:artica/pandorafms into ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional 2022-12-20 13:41:44 +01:00
alejandro.campos@artica.es 90e5205b16 changed admin pass encryption 2022-12-20 13:41:25 +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 96d08a3c7a Merge branch 'ent-9978-permission-for-massive-operation-in-enterpriseacl-does-not-work' into 'develop' 
Ent 9978 permission for massive operation in enterpriseacl does not work

See merge request artica/pandorafms!5316
 2022-12-20 11:49:08 +00:00
Rafael Ameijeiras 9e0cff685a Merge branch 'ent-9953-No-se-puede-añadir-informacion-GIS-de-los-agentes-manualmente-desde-a-consola-php8' into 'develop' 
minor fix

See merge request artica/pandorafms!5333
 2022-12-20 11:47:43 +00:00
Daniel Barbero 2e48d51714 change version 768-MR60 pandora_enterprise#9554 2022-12-20 12:32:41 +01:00
alejandro.campos@artica.es 22b63222c9 bcrypt implementation 2022-12-20 12:27:58 +01: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
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 e18277bc89 Merge branch 'ent-9847-cambiar-plugins-de-inventario-remoto-de-windows-para-que-usen-pandorawmic-2' into 'develop' 
added updates to mr with new code to update the scripts and changed the code...

See merge request artica/pandorafms!5337
 2022-12-19 14:33:52 +00: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
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
Daniel Barbero 105109f0fb add icon datamatrix widget pandora_enterprise#8619 2022-12-19 09:37:01 +01:00
artica 87c8dac3af Auto-updated build strings. 2022-12-19 01:00:16 +01:00
artica de5aae51e0 Auto-updated build strings. 2022-12-18 01:00:18 +01:00
artica acc527dc1a Auto-updated build strings. 2022-12-17 01:00:20 +01:00
Daniel Barbero 1d01b8257d WIP pandora_enterprise#9554 2022-12-16 14:28:04 +01:00
alejandro c6637d59e4 added also the updates in the mr and updated the inserts in pandoradb_data.sql for the motherboards, monitors, printers, product_key, product_id inventory plugins. 2022-12-16 12:19:30 +01:00
alejandro.campos@artica.es 7e507d454b change password field length 2022-12-16 12:12:11 +01:00
alejandro.campos@artica.es 2922276654 minor change 2022-12-16 11:38:40 +01:00
alejandro.campos@artica.es 8f3f8679d5 Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open 2022-12-16 11:29:00 +01:00
alejandro.campos@artica.es 11c4319dd7 added link to node name 2022-12-16 11:19:23 +01:00
alejandro.campos@artica.es 69631da08a added link to node name 2022-12-16 11:17:47 +01:00
alejandro.campos@artica.es 38d279581a added link to node name 2022-12-16 11:09:04 +01:00
Daniel Barbero 445dc8d973 fixed js render 2022-12-16 10:39:12 +01:00