31834 Commits

Author SHA1 Message Date
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
Ramon Novoa
47fba1d6f4 Add thread-monitoring modules to specific module groups. 2022-12-21 18:15:43 +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
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
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