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

31974 Commits

Author SHA1 Message Date
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
Ramon Novoa 380c7150e1 Add support for thread stats. 
ProducerConsumerServer generates per-thread statistics that are
collected as part of the Pandora FMS's self-monitoring.
 2022-12-20 13:18:46 +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
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
KANAYAMA Akihiro c56343b76e adjust pandora_snmp_bandwidth.pl to current content 2022-12-20 11:54:17 +09:00
KANAYAMA Akihiro 1c032e0b67 pull new changes to pandora_snmp_bandwidth.pl 2022-12-20 09:57:23 +09: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
alejandro.campos@artica.es eb1d17d3b0 fix 2022-12-19 17:05:49 +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
Rafael Ameijeiras a600e540bf Merge branch 'ent-10019-problemas-en-la-generacion-de-paquetes' into 'develop' 
Ent 10019 problemas en la generacion de paquetes

See merge request artica/pandorafms!5335
 2022-12-19 10:51:46 +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
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01: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 Maya 1d3d460ad5 #10023 Fixed duplex 2 2022-12-16 10:48:03 +01:00
Daniel Maya 1e6c2fcdf7 #10023 Fixed duplex 2022-12-16 10:43:07 +01:00
Daniel Barbero 445dc8d973 fixed js render 2022-12-16 10:39:12 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
Jonathan 97c967ede8 Disable enter on profiles create/edit for duplicate profile name check 2022-12-16 09:53:10 +01:00
alejandro 5c41b88ed2 added updates to mr with new code to update the scripts and changed the code of the windows tmodule_inventory inserts in pandoradb_data.sql 2022-12-16 09:00:01 +01:00
artica 48c8f31352 Auto-updated build strings. 2022-12-16 01:00:18 +01:00
Diego Muñoz-Reja 7a5226b825 Merge branch 'ent-9323-14021-Modificar-el-display-de-valores-de-informe' into 'develop' 
implemented float formatting and option in reports to change visualization format

See merge request artica/pandorafms!5219
 2022-12-15 15:36:12 +00:00
Jonathan 14b884b53d Trim duplicate profile before post to save 2022-12-15 15:37:46 +01:00