2616 Commits

Author SHA1 Message Date
fbsanchez
17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
Daniel Rodriguez
110052a21f Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop'
Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos

See merge request artica/pandorafms!4666
2022-02-02 09:37:15 +00:00
fbsanchez
5b06942caf DANGER COMMIT, uses schema collation instead forced one 2022-02-01 15:18:45 +01:00
Jose Gonzalez
40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez
d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
alejandro.campos@artica.es
2b6a9f0277 show agent and module name tip 2022-01-31 15:43:56 +01:00
alejandro.campos@artica.es
d210390a3d truncate texts in module massive operations 2022-01-27 17:30:20 +01:00
fbsanchez
1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc
4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop'
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
2022-01-25 10:28:18 +00:00
vgilc
b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop'
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
2022-01-25 10:27:25 +00:00
vgilc
fa0e3c4abb Merge branch 'ent-8208-bug-filtros-en-vista-de-alertas' into 'develop'
Fix monitoring alert detail filter for defautl actions

See merge request artica/pandorafms!4558
2022-01-25 10:24:42 +00:00
fbsanchez
35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
Jose Gonzalez
3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Barbero Martin
6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Calvo
891c88f458 Fix meta alert action filter counter 2022-01-18 15:34:56 +01:00
Daniel Barbero Martin
a0a74cf7bb add new chart histogram 2022-01-18 13:01:49 +01:00
Daniel Maya
b2fe6780ac Fixed links in networkmaps 2022-01-18 11:39:37 +01:00
Daniel Barbero Martin
4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma
Conflicts:
	pandora_console/include/styles/pandora.css
2022-01-18 10:17:19 +01:00
Daniel Maya
e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Calvo
8c86dbbc50 Fix meta alerts list action filter 2022-01-17 09:17:39 +01:00
fbsanchez
fee3f4ab96 php8 review + mdpf update 2022-01-12 14:22:16 +01:00
Calvo
f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Calvo
daf0b4e6e9 Fix alert view with default actions node and meta 2021-12-27 19:01:53 +01:00
Daniel Rodriguez
0ed9406796 Merge branch 'ent-8171-Filtro-Server-type-limitado-en-vista-Monitores-metaconsola' into 'develop'
Ent 8171 filtro server type limitado en vista monitores metaconsola

See merge request artica/pandorafms!4574
2021-12-27 17:09:29 +00:00
Daniel Rodriguez
eb3d36489c Merge branch 'ent-8270-Fallos-al-borrar-relaciones-en-mapas-de-red' into 'develop'
Ent 8270 fallos al borrar relaciones en mapas de red

See merge request artica/pandorafms!4566
2021-12-27 16:17:09 +00:00
Daniel Barbero Martin
f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +01:00
fbsanchez
f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
Daniel Maya
57cd3d7309 #8171 Fixed server type in metaconsole 2021-12-07 16:21:20 +01:00
Daniel Maya
fb80350f99 #8270 Fixed delete links 2021-12-02 13:46:29 +01:00
fbsanchez
cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-02 10:43:30 +01:00
Daniel Barbero Martin
a02c8a7988 wip reports alert actions 2021-12-01 15:15:45 +01:00
Daniel Barbero Martin
40d801a947 Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:16:19 +01:00
Daniel Rodriguez
198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop'
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
2021-11-29 11:08:00 +00:00
fbsanchez
5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/install.php
2021-11-29 09:54:55 +01:00
Daniel Barbero Martin
960c2de6c3 wip reports alert actions 2021-11-26 14:06:10 +01:00
Daniel Barbero Martin
cb0039d7a7 wip reports alert actions 2021-11-26 13:52:15 +01:00
Jose Gonzalez
98f519958c Fix merge 2021-11-23 12:25:58 +01:00
Daniel Rodriguez
3e5b34325b Merge branch 'ent-8169-No-funciona-recursión-de-grupos-en-vista-de-Monitores-de-Metaconsola' into 'develop'
Ent 8169 no funciona recursión de grupos en vista de monitores de metaconsola

See merge request artica/pandorafms!4513
2021-11-16 09:12:40 +00:00
Daniel Rodriguez
d094987eda Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop'
Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
2021-11-15 11:29:33 +00:00
Daniel Rodriguez
e16a398c1a Merge branch 'ent-7900-trazas-en-estado-agente-y-pandora-alert' into 'develop'
Deleted js traces

See merge request artica/pandorafms!4354
2021-11-15 11:13:50 +00:00
Daniel Rodriguez
650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop'
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
2021-11-15 11:00:07 +00:00
Daniel Rodriguez
ddb156564d Merge branch 'ent-7962-bug-visual-monitor-detail' into 'develop'
Fixed tip position and code style

Closes pandora_enterprise#7962

See merge request artica/pandorafms!4488
2021-11-15 10:10:53 +00:00
José González
bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez
c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Maya
031e0a2cd7 #8169 Fixed group recursion with standar user 2021-11-02 11:08:15 +01:00
Calvo
f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
Jose Gonzalez
070c920e0e Fixed tip position and code style 2021-10-20 13:01:13 +02:00
Calvo
7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
Jose Gonzalez
4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
fbsanchez
dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00