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
fbsanchez
b8980c189c
Schedule history db schema check after MR update
2021-01-28 18:50:55 +01:00
alejandro-campos
0549f2c604
added file to open folder
2021-01-18 10:31:53 +01:00
José González
3199b3d6b5
Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser'
...
# Conflicts:
# pandora_console/include/ajax/snmp_browser.ajax.php
2021-01-07 14:14:33 +01:00
Daniel Rodriguez
b9a2998c49
Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
...
Ent 6490 errores en edicion de acciones de alertas
See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
Daniel Rodriguez
b0f862b4c7
Merge branch 'ent-1175-copyright-actualizados' into 'develop'
...
Updated copyrights
Closes pandora_enterprise#1175
See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez
fc49958c96
Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop'
...
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador
See merge request artica/pandorafms!3608
2020-12-23 16:55:56 +01:00
José González
623b729001
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
...
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Luis Calvo
734efbf892
Added ACL check to custom view CSV donwload
2020-12-11 10:10:22 +01:00
Daniel Barbero Martin
aa52ab01df
Fix loading charts modules and interfaces
2020-12-09 14:05:40 +01:00
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
Jose Gonzalez
9bf70add51
Fixed snmp server selection
2020-11-26 10:35:48 +01:00
Daniel Maya
1cf3381797
Fixed update alert actions
2020-11-26 10:33:32 +01:00
marcos
13d90bb1c5
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
2020-11-18 12:05:57 +01:00
Daniel Maya
0ea8196db0
Fixed create network components
2020-11-12 13:44:52 +01:00
fbsanchez
b585a4e372
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
2020-11-03 16:35:25 +01:00
Daniel Rodriguez
946c548244
Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
...
Primeras modificaciones del filtro de eventos
See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel
c4e7c6b5f1
fix events acknowledge-by
2020-10-30 14:42:10 +01:00
Daniel Rodriguez
fe90008d17
Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop'
...
Handled comments for validated comments
Closes pandora_enterprise#6587
See merge request artica/pandorafms!3564
2020-10-30 10:46:52 +01:00
fbsanchez
8e09a30a05
WIP Networklink POC
2020-10-29 17:20:16 +01:00
marcos
6bcca915ba
resuelto el error que vaciaba el module search
2020-10-29 14:57:54 +01:00
marcos
cf108c0a17
se cambia el valor del modulo y marca en el filtro usado
2020-10-29 12:30:54 +01:00
marcos
edc9038783
Primeras modificaciones del filtro de eventos
2020-10-29 10:24:37 +01:00
Jose Gonzalez
765d7938f9
Handled comments for validated comments
2020-10-23 12:20:20 +02:00
Daniel Barbero Martin
73ff2cff9d
fixed error report selector modules in metaconsole
2020-10-20 18:30:53 +02:00
daniel
148384f8fb
phantomjs performance
2020-10-13 18:24:10 +02:00
marcos
848f60229a
updates on 2FA all users feature
2020-10-06 17:02:58 +02:00
fbsanchez
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
daniel
0db539c444
fix visual windows charts
2020-10-01 15:29:54 +02:00
fbsanchez
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
fbsanchez
3374a89ae0
Group selection improvement
2020-09-11 14:34:41 +02:00
Jose Gonzalez
42a615166e
Fixed object definitions
2020-09-07 13:54:18 +02:00
alejandro-campos
0917a631ee
fix parameter macros in event responses
2020-08-14 14:48:34 +02:00
alejandro-campos
90ea61f753
fix parameter macros in event responses
2020-08-13 14:10:57 +02:00
Daniel Rodriguez
f7854ab633
Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop'
...
Fixed snmp community special char
See merge request artica/pandorafms!3352
2020-08-07 09:46:57 +02:00
Alejandro Fraguas
bd6904b99f
Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop'
...
Fixed xss event comments vulnerabiluty and some acls on event ajax
See merge request artica/pandorafms!3335
2020-07-13 10:06:26 +02:00
Luis Calvo
9ae225a505
Fixed snmp community special char
2020-07-03 13:34:04 +02:00
fbsanchez
112f578512
wip smart services
2020-07-01 20:50:07 +02:00
Luis Calvo
9a8c42f4ac
Fixed xss event comments vulnerabiluty and some acls on event ajax
2020-06-26 15:36:51 +02:00
Manuel Montes
b7411da737
Ent 5914 problema css con resolucion pantalla 1366
2020-06-26 13:29:17 +02:00
Daniel Rodriguez
3c5a893c71
Merge branch 'ent-5830-SNMP-Browser-Network-components-OID-info-and-Create-agent-modules' into 'develop'
...
Ent 5830 snmp browser network components oid info and create agent modules
See merge request artica/pandorafms!3249
2020-06-24 12:46:49 +02:00
Luis
b40b98fc54
Added type to SNMP browser module creation
2020-06-23 14:46:22 +02:00
marcos
7cfc68a3d6
ignore keys on xss event comments
2020-06-19 10:59:43 +02:00
marcos
93bc14d102
fixed vulnerabilty on events comments
2020-06-09 11:40:39 +02:00
daniel
b9d5ab9c4a
Fixed errors new tab base64 image
2020-06-08 11:24:46 +02:00
Daniel Rodriguez
86afda25fe
Merge branch 'ent-5673-Mala-visualizacion-de-modulos-con-caracteres-japones' into 'develop'
...
Fixed errors encoding
See merge request artica/pandorafms!3234
2020-06-02 17:24:11 +02:00
alejandro-campos
6ba1a27274
added error to dialog submission when no agents or policies have been selected
2020-05-27 18:51:25 +02:00
Daniel Barbero Martin
db32fedde4
Fixed errors encoding
2020-05-25 17:06:20 +02:00
fbsanchez
b0e8287c61
Wip cluster view
2020-05-21 19:28:24 +02:00
fbsanchez
bd3ffc0c8d
Tree view style review
2020-05-06 17:35:05 +02:00
Daniel Maya
8ae8ac45f5
Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response
2020-04-15 15:50:08 +02:00
Jose Gonzalez
253432d4ee
Clean unnecesary file
2020-04-07 09:11:13 +02:00
fbsanchez
2d4b977d26
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-04-06 11:05:18 +02:00
Luis
bcd9aabcd8
Ent 5604 policy modules japanese bug
2020-04-02 14:30:02 +02:00
Jose Gonzalez
161c1eb643
WIP: Minor fixes
2020-03-26 14:41:54 +01:00
fbsanchez
e48ef76f35
merge
2020-03-26 14:38:23 +01:00
daniel
709201bf23
dashboards
2020-03-26 12:29:38 +01:00
Jose Gonzalez
2b21266a38
WIP: At this point, PEN form is operative and functional
2020-03-26 12:17:28 +01:00
Jose Gonzalez
86cbecc9a0
WIP: PEN form near to clear
2020-03-26 09:04:10 +01:00
alejandro-campos
4246c15157
add not available in case there is no last status change registered
2020-03-25 16:21:51 +01:00
alejandro-campos
e05c292d7d
show last status change of module
2020-03-23 12:47:58 +01:00
alejandro-campos
014688468c
changes to show last status change of modules
2020-03-19 15:18:20 +01:00
alejandro-campos
0f1ed5165e
default timeout for IPAM ping
2020-03-17 18:03:08 +01:00
fbsanchez
f3da919abc
WIP multiple changes
2020-03-16 23:52:20 +01:00
Tatiana Llorente
04f2ebeaf1
Ent 4515 filtro de alertas en vista de agente
2020-03-12 10:47:59 +01:00
Luis
82fe47cfd9
Ent 5312 snmp browser enchancements
2020-02-27 16:31:09 +01:00
Alejandro Fraguas
0538bd5185
Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop'
...
Ent 5227 problema encoding aplicación politicas
See merge request artica/pandorafms!3055
2020-02-10 12:14:19 +01:00
Jose Gonzalez
0b7d4a9463
Added solution for UTF8 charset in treeview and main agent view
2020-02-10 11:16:57 +01:00
Daniel Rodriguez
8b60daa9ba
Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop'
...
fix module string data with html special chars breaking html in page
See merge request artica/pandorafms!3042
2020-02-04 10:10:07 +01:00
alejandro-campos
73f3dfac85
fix module string data with html special chars breaking html in page
2020-01-31 11:53:42 +01:00
Daniel Rodriguez
28392b71ef
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
...
availability failover
See merge request artica/pandorafms!3015
2020-01-27 10:48:50 +01:00
Alejandro Campos
e7769b8bf4
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Rodriguez
96eebe4310
Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop'
...
Added port option on server configuration to be used when connecting to execution server
See merge request artica/pandorafms!3012
2020-01-17 14:40:58 +01:00
Tatiana Llorente
0980c9a74a
Ent 5261 cambio de control de intervalo en alertas
2020-01-16 13:50:39 +01:00