Daniel Barbero
f273813869
new widget datamatrix pandora_enterprise#8619
2022-11-10 12:05:25 +01:00
Daniel Barbero
4b4f92b11b
new widget datamatrix pandora_enterprise#8619
2022-11-08 16:30:25 +01:00
Daniel Rodriguez
3417ec9421
Merge branch 'ent-9526-Rendimiento-al-editar-informes-sql-query' into 'develop'
...
fix performance issue
See merge request artica/pandorafms!5199
2022-11-07 16:05:58 +00:00
jose.gonzalez@pandorafms.com
f99a7dc511
Adaptations
2022-11-07 14:04:07 +01:00
alejandro.campos@artica.es
514b350e14
fixed performance problems
2022-11-03 18:20:39 +01:00
Daniel Barbero
ccc2e830f4
add sound events to metaconsole pandora_enterprise#8854
2022-11-03 15:12:50 +01:00
Daniel Barbero
33b1c0ab8f
add new filter pandora_enterprise#9135
2022-11-03 12:00:58 +01:00
Daniel Barbero
94fb25d104
Merge remote-tracking branch 'origin/develop' into ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion
2022-11-02 13:42:13 +01:00
Daniel Barbero
59f0bba7f3
fix styles events list dashboards pandora_enterprise#9705
2022-10-27 09:07:04 +02:00
alejandro.campos@artica.es
8d611a8e7f
implemented float formatting and option in reports to change visualization format
2022-10-26 18:25:16 +02:00
Daniel Barbero
3273fc23ed
Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
...
Conflicts:
pandora_console/extras/mr/58.sql
2022-10-26 09:42:02 +02:00
jose.gonzalez@pandorafms.com
00de0faac3
Adapted views
2022-10-24 19:55:22 +02:00
Diego Muñoz-Reja
aff8fdb005
Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop'
...
new group by events for extraid pandora_enterprise#9425
See merge request artica/pandorafms!5147
2022-10-24 15:19:21 +00:00
Daniel Rodriguez
a3dc8be0e5
Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop'
...
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd
See merge request artica/pandorafms!5140
2022-10-21 10:42:16 +00:00
Diego Muñoz-Reja
423d4b8763
Merge branch 'ent-9641-mejorar-heatmaps' into 'develop'
...
Ent 9641 mejorar heatmaps
See merge request artica/pandorafms!5196
2022-10-21 09:29:40 +00:00
Daniel Barbero
47a2e01a33
Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya
...
Conflicts:
pandora_console/extras/mr/58.sql
2022-10-18 07:59:26 +02:00
alejandro.campos@artica.es
08ab924160
fix performance issue
2022-10-17 18:08:48 +02:00
Diego Muñoz-Reja
4c74f1bee7
Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop'
...
fixed response events pandora_enterprise#9423
See merge request artica/pandorafms!5141
2022-10-17 10:49:01 +00:00
Daniel Maya
f3bae30f55
#9641 heatmap changes
2022-10-14 13:53:05 +02:00
Daniel Barbero
a21048c4c5
Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra
2022-10-14 08:11:51 +02:00
Daniel Barbero
9c93a99fb2
add mode maintenance VC pandora_enterprise#4822
2022-10-13 11:03:49 +02:00
Daniel Barbero
d90005d0f5
Merge remote-tracking branch 'origin/develop' into ent-8597-13156-anadir-opciones-en-busqueda-de-eventos
2022-10-10 16:37:45 +02:00
Daniel Barbero
38dea9e01b
Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra
2022-10-10 11:27:28 +02:00
Daniel Maya
a674bdceb0
#9595 Fixed order
2022-10-03 10:16:00 +02:00
Daniel Barbero
8438045cf6
filter recursive groups in events pandora_enterprise#2133
2022-09-29 12:54:46 +02:00
Daniel Barbero
3dea1f3146
filter events multiselector nodes pandora_enterprise#8597
2022-09-29 09:17:37 +02:00
Daniel Barbero
8d8140faa4
add new macros response events pandora_enterprise#9423
2022-09-28 09:30:30 +02:00
Daniel Barbero
755432b381
Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo
2022-09-28 08:52:43 +02:00
Daniel Barbero
9e2c6edfeb
new group by events for extraid pandora_enterprise#9425
2022-09-27 15:08:09 +02:00
Daniel Barbero
fbce8b7533
fixed response events pandora_enterprise#9423
2022-09-27 09:51:37 +02:00
Calvo
2a4176085f
Fix alerts meta datatables
2022-09-26 09:22:19 +02:00
Daniel Barbero
225646cd9d
fixed response events pandora_enterprise#9423
2022-09-23 13:55:01 +02:00
Daniel Maya
795308367f
#9254 load password with ajax
2022-09-23 13:24:46 +02:00
Calvo
522607ec40
Fix meta alert datatable order
2022-09-19 14:14:33 +02:00
Calvo
bc5f1d0dce
Fix meta alert datatable order
2022-09-19 14:02:50 +02:00
Calvo
c177ee2e2e
Fix meta alert datatable order
2022-09-16 15:01:52 +02:00
Calvo
56c5f324b0
Fix alerts metaconsole datatable order
2022-09-15 18:01:16 +02:00
Calvo
544497d2ba
Fix alerts list pagination on meta
2022-09-09 13:07:36 +02:00
Daniel Maya
53cbb4d3da
#9107 conflict resolved
2022-08-29 10:13:39 +02:00
Daniel Barbero
e11d46ea60
Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado
...
Conflicts:
pandora_console/include/ajax/events.php
2022-08-01 07:08:00 +02:00
Daniel Barbero Martin
e3e9f86119
not group by event status pandora_enterprise#8043
2022-07-26 10:55:11 +02:00
Daniel Barbero Martin
bdd9612812
fix error custom data show all in tab events pandora_enterprise#9305
2022-07-22 10:13:57 +02:00
Jimmy Olano
33f6ae1875
Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop'
...
Alerts list datatable
Ref: pandora_enterprise#8797
See merge request artica/pandorafms!5018
2022-07-22 02:39:35 +00:00
Daniel Rodriguez
5d674b76b6
Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop'
...
new filter search eventspandora_enterprise#8942
See merge request artica/pandorafms!5007
2022-07-21 10:15:49 +00:00
Diego Muñoz-Reja
288e6f3a53
Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop'
...
Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados
See merge request artica/pandorafms!4993
2022-07-19 13:07:45 +00:00
Daniel Barbero Martin
027f61daff
Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
...
Conflicts:
pandora_console/extras/mr/56.sql
2022-07-19 10:18:04 +02:00
Calvo
642c60428c
Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola
2022-07-19 09:40:56 +02:00
Calvo
34333f9f88
Alerts list datatable
2022-07-15 12:15:37 +02:00
Daniel Maya
987678b339
#9107 Fixed filter event
2022-07-15 11:38:46 +02:00
Daniel Barbero Martin
12f73d86fd
new filter search eventspandora_enterprise#8942
2022-07-05 17:02:40 +02:00
Daniel Barbero Martin
033027f360
modal sound events pandora_enterprise#9095
2022-07-04 17:09:30 +02:00
Daniel Barbero Martin
2dc16a2a19
modal sound events pandora_enterprise#9095
2022-07-01 13:08:39 +02:00
Daniel Barbero Martin
e28bfe9f3f
modal sound events pandora_enterprise#9095
2022-06-30 17:17:05 +02:00
Jimmy Olano
efa0640d8c
Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop'
...
legend combined graph module view pandora_enterprise#9121
pandora_enterprise#9121
See merge request artica/pandorafms!4986
2022-06-29 22:37:25 +00:00
Diego Muñoz-Reja
bc6f234029
Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop'
...
Resized alert action list and refactor
See merge request artica/pandorafms!4980
2022-06-29 14:50:37 +00:00
Daniel Maya
43b2a3d47e
#9140 Fixed comments
2022-06-29 15:34:09 +02:00
José González
7edcd3b0a6
Improve code and fix update alerts
2022-06-29 11:05:50 +02:00
daniel
4ca27cd5a9
Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop'
...
events sound pandora_enterprise#7960
See merge request artica/pandorafms!4923
2022-06-28 13:47:05 +00:00
daniel
867e659118
Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop'
...
add treshold pdf pandora_enterprise#1419
See merge request artica/pandorafms!4894
2022-06-28 13:45:53 +00:00
Daniel Barbero Martin
d969ac42bf
legend combined graph module view pandora_enterprise#8621
2022-06-27 17:09:27 +02:00
Daniel Barbero Martin
1c051f88bc
Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
...
Conflicts:
pandora_console/include/functions_events.php
2022-06-27 16:07:19 +02:00
Daniel Barbero Martin
f89aaabc21
minor fixed events
2022-06-23 18:06:25 +02:00
Daniel Barbero Martin
9d23b9af4a
refactor events meta pandora_enterprise#9086
2022-06-21 11:17:18 +02:00
Daniel Barbero Martin
8e7ed75b3e
refactor events meta pandora_enterprise#9086
2022-06-16 11:31:07 +02:00
Daniel Barbero Martin
8ad6d350af
refactor events meta pandora_enterprise#9086
2022-06-15 13:06:10 +02:00
Daniel Barbero Martin
b82b3c3fb1
refactor events meta pandora_enterprise#9086
2022-06-14 18:47:09 +02:00
Daniel Barbero Martin
5968febd04
Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
...
Conflicts:
pandora_console/include/javascript/pandora.js
2022-06-13 17:10:19 +02:00
Daniel Barbero Martin
5680b82563
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
2022-06-13 08:16:40 +02:00
Daniel Rodriguez
336bc74d49
Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop'
...
Ent 9021 proteccion en cascada bucle padre hijo
See merge request artica/pandorafms!4921
2022-06-09 07:34:40 +00:00
Daniel Barbero Martin
8dbc860f4a
refactor events meta pandora_enterprise#9086
2022-06-08 17:01:15 +02:00
Daniel Barbero Martin
1cd680a971
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
...
Conflicts:
pandora_console/operation/events/events.php
2022-06-03 09:28:18 +02:00
Daniel Rodriguez
98dd5b81ce
Merge branch 'ent-8766-POST-Error-al-crear-eventos-con-comentarios-que-tienen-salto-de-línea' into 'develop'
...
Ent 8766 post error al crear eventos con comentarios que tienen salto de línea
See merge request artica/pandorafms!4796
2022-06-02 07:33:10 +00:00
Daniel Barbero Martin
0cda3d3613
refactor events meta pandora_enterprise#9086
2022-06-01 17:27:44 +02:00
Daniel Barbero Martin
f6de9fb0a0
events sound pandora_enterprise#7960
2022-05-31 10:10:44 +02:00
Daniel Barbero Martin
8e78110d5d
events sound pandora_enterprise#7960
2022-05-30 17:47:28 +02:00
Daniel Maya
79e7753cc8
#9021 Added offspring check
2022-05-30 11:29:17 +02:00
Daniel Barbero Martin
d0a04177c0
add treshold pdf pandora_enterprise#1419
2022-05-18 17:17:31 +02:00
fbsanchez
686ba0a5a5
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
...
Conflicts:
pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
Daniel Barbero Martin
c049f18bf1
Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render
2022-04-05 08:20:21 +02:00
Daniel Maya
4a6ab6ce95
#8766 Fixed event comments
2022-04-04 16:02:26 +02:00
Daniel Rodriguez
71fef65f35
Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop'
...
implemented custom data filter in event view
See merge request artica/pandorafms!4787
2022-04-04 10:38:30 +00:00
Daniel Barbero Martin
863e6c887f
Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render
2022-04-04 08:17:03 +02:00
alejandro.campos@artica.es
3042755e70
Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos
2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es
b7aca968a3
minor change
2022-04-01 14:06:51 +02:00
Daniel Rodriguez
99b8fa0cf6
Merge branch 'ent-8458-heatmap-view' into 'develop'
...
Ent 8458 heatmap view
See merge request artica/pandorafms!4695
2022-04-01 07:46:25 +00:00
Daniel Barbero Martin
318ac668e9
add new report custom render pandora_enterprise#8540
2022-03-31 20:11:52 +02:00
Daniel Maya
e796dc52bb
#8458 Change in refresh value
2022-03-31 09:46:30 +02:00
fbsanchez
e70c85fc65
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
2022-03-30 15:05:04 +02:00
fbsanchez
2d334f7860
Historical view for update manager
2022-03-30 14:41:47 +02:00
Daniel Maya
cab85cbfbd
#8458 Fixed errors
2022-03-30 10:21:30 +02:00
Alejandro Campos
3e5865b539
Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos'
...
# Conflicts:
# pandora_console/extras/mr/53.sql
2022-03-30 08:03:08 +00:00
Daniel Rodriguez
74e4461d8a
Merge branch 'ent-8697-13244-no-funcionan-acciones-de-eventos-a-traves-de-un-dashboard' into 'develop'
...
Fix dashboard events responses
See merge request artica/pandorafms!4759
2022-03-30 07:45:07 +00:00
alejandro.campos@artica.es
d137e0d798
implemented custom data filter in event view
2022-03-29 18:09:19 +02:00
Calvo
4109d94853
Fix events dashboard user owner entities
2022-03-25 14:07:44 +01:00
Calvo
5e6bdaeb15
Fix events dashboard user owner entities
2022-03-25 14:05:38 +01:00
Calvo
6ed8851188
Fix event list widget actions on dashboard
2022-03-24 18:52:06 +01:00
Calvo
174f6dce51
Fix dashboard event list, Removed missing debugger in code
2022-03-22 18:02:53 +01:00
Luis
ba6a56b9fc
WIP: event dashboard responses
2022-03-21 18:15:58 +01:00
Daniel Barbero Martin
9e07afdab2
fixed CV in console mobile metaconsole #8676
2022-03-15 11:39:57 +01:00
Calvo
6dc775649d
Fix dashboard events responses
2022-03-14 15:29:40 +01:00
Daniel Maya
270bb433da
added heatmap ajax and class
2022-03-07 13:11:54 +01:00
Daniel Maya
74996e3cc0
WIP heatmap 2
2022-02-25 09:41:32 +01:00
fbsanchez
1da5534484
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
.gitlab-ci.yml
pandora_console/pandoradb.sql
2022-02-15 17:32:10 +01:00
Luis
4b1c93d7b3
Treeview not showing notinit agents when filter enabled
2022-02-14 17:55:29 +01:00
fbsanchez
4d912fbd34
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-11 09:55:34 +01:00
fbsanchez
6bb754d5d2
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
pandora_console/pandoradb.sql
2022-02-08 13:02:22 +01:00
José González
fc4b702db0
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
...
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
2022-02-08 11:35:01 +00:00
Daniel Barbero Martin
b91109d747
Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios
2022-02-02 08:06:05 +01:00
fbsanchez
5b06942caf
DANGER COMMIT, uses schema collation instead forced one
2022-02-01 15:18:45 +01:00
alejandro.campos@artica.es
74c2dafed0
added token to display or hide command in event response execution
2022-02-01 14:30:25 +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
Daniel Barbero Martin
c02abbc508
alert template schedule pandora_enterprise#3943
2022-01-31 13:45:44 +01:00
Daniel Barbero Martin
a4f092f0a0
alert template schedule pandora_enterprise#3943
2022-01-27 17:02:24 +01:00
Daniel Barbero Martin
89931ef564
alert template schedule #3943
2022-01-26 16:52:48 +01:00
Daniel Barbero Martin
74f73e2004
Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios
...
Conflicts:
pandora_console/include/styles/pandora.css
2022-01-26 08:10:40 +01:00
Daniel Barbero Martin
1a6127624e
alert template schedule
2022-01-26 08:07:00 +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
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 Rodriguez
7d51176641
Merge branch 'ent-7076-11432-Forzar-chequeos-remotos-en-Consolas-Visuales' into 'develop'
...
Ent 7076 11432 forzar chequeos remotos en consolas visuales
See merge request artica/pandorafms!4598
2022-01-11 10:09:35 +00:00
Daniel Rodriguez
3ec6ba0e6d
Merge branch 'ent-8201-Bug-en-widget-latest-events-Dashboard-metaconsola' into 'develop'
...
Ent 8201 bug en widget latest events dashboard metaconsola
See merge request artica/pandorafms!4571
2021-12-23 12:11:08 +00:00
Daniel Maya
db72cba1d2
#7076 Added force remote check
2021-12-21 09:33:55 +01:00
Daniel Barbero Martin
f705cc0fba
wip chart histogram list modules #8222
2021-12-14 13:21:34 +01:00
Daniel Rodriguez
c3f9ed1bf2
Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop'
...
Added feature for read comments in grouped events
Closes pandora_enterprise#8042
See merge request artica/pandorafms!4467
2021-12-07 16:51:07 +00:00
Daniel Maya
e24987d03e
#8201 Fix dashboard event dialog
2021-12-07 12:17:26 +01:00
Jose Gonzalez
3238811f96
Fixed comments issues
2021-12-01 13:15:34 +01:00
Jose Gonzalez
64e08d7124
Fixed grouped comments with id_agent
2021-11-30 10:50:40 +01:00
Jose Gonzalez
7918b883aa
Set the last grouped comments to last events fired
2021-11-29 16:12:15 +01:00
Daniel Rodriguez
75699cb8fc
Merge branch 'ent-7844-revision-acl-enterprise-parte-3-fallos-actuales' into 'develop'
...
Ent 7844 revision acl enterprise parte 3 fallos actuales
See merge request artica/pandorafms!4356
2021-11-29 11:36:52 +00:00
Jose Gonzalez
5eb4a869cc
Fix issue with metaconsole comments
2021-11-26 11:51:27 +01:00
Jose Gonzalez
b151b3996d
Fixed issue with events
2021-11-25 13:52:53 +01:00
Calvo
d7f590bacb
Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales
2021-11-24 13:42:48 +01:00
Daniel Maya
3bfce928c4
#7902 Fixed add and update actions
2021-11-23 10:53:51 +01:00
Daniel Maya
8ce1a500ea
#8210 Fixed dialog
2021-11-19 14:57:56 +01:00
Calvo
9d3c691ad1
Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales
2021-11-15 18:33:35 +01:00
Daniel Rodriguez
eb9e73ecb0
Merge branch 'ent-7838-revision-acl-enterprise-parte-1-eliminacion-opciones' into 'develop'
...
Deleted and reubicated acl options
See merge request artica/pandorafms!4340
2021-11-15 11:24:50 +00:00
Calvo
6a2e249af7
Fix missing parameter meta on event comments ajax
2021-10-29 10:23:56 +02:00
Jose Gonzalez
304a4b5687
Fix size of event detail tabs
2021-10-15 09:36:22 +02:00
Jose Gonzalez
3f28a98744
Added feature for read comments in grouped events
2021-10-13 14:58:31 +02:00
Daniel Rodriguez
04d683286f
Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop'
...
implemented supernet treeview
See merge request artica/pandorafms!4431
2021-09-29 10:10:26 +00:00
alejandro.campos@artica.es
87ec5970a1
implemented supernet treeview
2021-09-28 13:44:12 +02:00
Jose Gonzalez
de1bf03976
Clean logs
2021-09-23 17:19:47 +02:00
Jose Gonzalez
7bfe699802
Fixes minor issues
2021-09-23 17:01:22 +02:00
Daniel Rodriguez
ce40b36923
Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
...
Ent 7582 anadir selector horas eventos
Closes pandora_enterprise#7582
See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
Calvo
34c3b00426
WIP: Revision ACL part 3
2021-08-13 15:57:01 +02:00
Calvo
67e95f7f77
Merge remote-tracking branch 'origin/ent-7839-revision-acl-enterprise-parte-2-introduccion-opciones' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales
...
Merge open branch ACL step 2 to continue with STEP3
2021-08-11 11:16:57 +02:00
Daniel Rodriguez
00ed8233d0
Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
...
set default font size on graph modules when is send in mails
See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
Calvo
9d04933ca2
Added missing sec related to GET params to ACL enterprise
2021-08-06 10:29:38 +02:00
Daniel Rodriguez
45abf89e6b
Merge branch 'ent-7667-12011-bug-de-mostrado-de-comentarios-en-eventos-con-filtrado' into 'develop'
...
fixed minnor error when show event comment with filters
See merge request artica/pandorafms!4241
2021-08-05 11:08:41 +00:00
Calvo
9b736d0c48
Deleted and reubicated acl options
2021-07-30 13:49:22 +02:00
fbsanchez
056bd1460a
Sound alerts only for NEW events found
2021-07-09 14:40:03 +02:00
José González
47b6e40799
Added controls for filter with hours
2021-07-05 17:42:45 +02:00
marcos
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
marcos
a225bbdafc
fixed minnor error when show event comment with filters
2021-06-28 14:21:45 +02:00
Luis
ebceaebb58
Ent 7253 opcion formato envio informes templates
2021-06-21 13:41:14 +00:00
fbsanchez
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Marcos Alconada
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
Daniel Rodriguez
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Daniel Rodriguez
d58e9f634a
Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
...
Ent 7519 cambio de fuentes en la consola a nivel global
See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
Marcos Alconada
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
Junichi Satoh
5fcf3eca23
Fixed problems in planned downtime below.
...
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
Daniel Rodriguez
b8fe685028
Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
...
implemented user level authentication for integria ims integration
See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
Daniel Rodriguez
5b2c340163
Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop'
...
Create interface views
See merge request artica/pandorafms!4023
2021-05-14 09:37:48 +00:00
Alejandro Campos
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
José González
9e9ea4d00a
Merge with last develop
2021-05-12 09:17:32 +02:00
alejandro.campos@artica.es
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
Daniel Maya
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
alejandro.campos@artica.es
8f58b74976
fixed filter load in events view
2021-04-21 13:05:18 +02:00
alejandro.campos@artica.es
93f3551326
Create interface views
2021-04-12 18:17:09 +02:00
Daniel Rodriguez
eeff80638f
Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop'
...
multiple fixes
See merge request artica/pandorafms!3812
2021-04-12 10:39:41 +00:00
Daniel Rodriguez
79b11a6b30
Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop'
...
Ent 4264 cambios vista de eventos
See merge request artica/pandorafms!3893
2021-04-12 08:47:13 +00:00
Daniel Rodriguez
32527863cb
Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop'
...
fixed error tree groups agent edition metaconsole
See merge request artica/pandorafms!3904
2021-04-06 17:23:18 +00:00
Daniel Rodriguez
e54e06b6ac
Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop'
...
fixed errors sound events
See merge request artica/pandorafms!3916
2021-04-06 17:11:37 +00:00
daniel
89ffb05466
fixed errors sound events
2021-04-06 17:11:37 +00:00
Marcos Alconada
9e1bacb66e
fixed visual error
2021-03-29 07:23:03 +00:00
fbsanchez
a3e571ff50
Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect
...
Conflicts:
pandora_console/godmode/users/user_list.php
2021-03-26 13:52:01 +01:00
Jose Gonzalez
4ee0c580bb
WIP: Backup upload
2021-03-22 17:52:11 +01:00
Jose Gonzalez
d43c51cc66
WIP: Backup upload
2021-03-22 17:37:15 +01:00
fbsanchez
e0aa1bfc68
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
Daniel Barbero Martin
b78f4093ac
fixed error tree groups agent edition metaconsole
2021-03-15 13:31:24 +01:00
Daniel Maya
2f7d0f1795
fixed permissions on response
2021-03-11 16:11:06 +01:00
Marcos Alconada
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
fbsanchez
95f1a2abcc
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
2021-03-11 10:00:17 +01:00
Daniel Rodriguez
2422813a29
Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
...
visual fixes in agent view graphs
See merge request artica/pandorafms!3884
2021-03-10 15:56:15 +00:00
fbsanchez
b384e97da5
Test REGEXP is valid before apply in MySQL
2021-03-09 10:17:29 +01:00
alejandro.campos@artica.es
0a8c478c47
visual fixes in agent view graphs
2021-03-08 17:48:59 +01:00
Daniel Rodriguez
94b04a8ef4
Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop'
...
Fix styles file export_data
See merge request artica/pandorafms!3691
2021-03-04 10:29:52 +00:00
daniel
fbf26fab91
Fix styles file export_data
2021-03-04 10:29:52 +00:00
Daniel Rodriguez
51404eda8d
Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop'
...
Ent 7077 no funciona doble auth meta
See merge request artica/pandorafms!3866
2021-03-02 12:24:03 +00:00
Luis
93a4a90dd6
Ent 7077 no funciona doble auth meta
2021-03-02 12:24:03 +00:00
fbsanchez
d96590aea5
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/include/functions_ui.php
pandora_console/include/styles/pandora.css
2021-03-02 09:40:15 +01:00
Daniel Rodriguez
4fbfc14479
Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop'
...
Fix loading charts modules and interfaces
See merge request artica/pandorafms!3700
2021-03-01 12:16:27 +00:00
Daniel Rodriguez
39d0e66983
Merge branch 'ent-6378-descarga-custom-field-view' into 'develop'
...
Added ACL check to custom view CSV donwload
See merge request artica/pandorafms!3714
2021-03-01 10:47:50 +00:00
fbsanchez
85f37a91de
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
fbsanchez
b17d6349f7
Multiple fixes port defition
2021-02-09 13:44:21 +01:00
fbsanchez
2639533cc1
Fixes
2021-02-09 12:05:59 +01:00
fbsanchez
ecf0f3d161
Force error catching while SNMP browsing
2021-02-09 10:25:42 +01:00
fbsanchez
e711239c69
Added port, limited base OID (default) removed timeout (browser) capturing error to message
2021-02-08 17:42:41 +01:00
fbsanchez
380c77be02
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
...
Conflicts:
pandora_console/include/lib/Module.php
pandora_console/include/visual-console-client/vc.main.css.map
2021-02-02 12:15:24 +01:00
fbsanchez
0ddc1929fa
multiple fixes
2021-02-02 11:25:26 +01:00