tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-15 14:58:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
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
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 Maya
c9cac037f1 #9783 Fixed networkmap 3 2022-12-19 09:01:02 +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
jose.gonzalez@pandorafms.com
2b896bcd17 Minor fixes over module data tables 2022-12-16 12:55:56 +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
Daniel Barbero
62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
artica
48c8f31352 Auto-updated build strings. 2022-12-16 01:00:18 +01:00
alejandro.campos@artica.es
4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
Alejandro Campos
960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
Rafael Ameijeiras
32c07afdf4 Merge branch 'ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api' into 'develop' 
Added ACL to apì get tree agents plugin user and plugin pass

See merge request artica/pandorafms!5214
 2022-12-15 13:38:29 +00:00
alejandro.campos@artica.es
4ea10b5a5b changed user password hashing 2022-12-15 13:24:51 +01:00
jose.gonzalez@pandorafms.com
4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
jose.gonzalez@pandorafms.com
d43ae677a3 Changed icons and minor fixes 2022-12-15 12:41:38 +01:00
Luis
0351886e1b ACL api get tree agents 2022-12-15 12:39:06 +01:00
alejandro.campos@artica.es
26426c1bfa fixed csrf 2022-12-15 08:48:48 +01:00
artica
de946e56e8 Auto-updated build strings. 2022-12-15 01:00:18 +01:00