tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,284 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21579 Commits

Author SHA1 Message Date
Daniel Rodriguez 06db949689 Merge branch 'ent-7375-bug-en-creacion-de-politicas' into 'develop' 
fixed error with icon groups policies

See merge request artica/pandorafms!4060
 2021-04-27 10:39:57 +00:00
Daniel Rodriguez 4589e77bc8 Merge branch 'ent-7370-modal-incorrecto-al-editar-el-nodo-de-un-cluster' into 'develop' 
fixed error with modal cluster view

See merge request artica/pandorafms!4057
 2021-04-27 10:39:23 +00:00
Daniel Rodriguez d9a63c4682 Merge branch 'ent-7333-fallos-vista-setup' into 'develop' 
Added path check to config attachment store

See merge request artica/pandorafms!4049
 2021-04-27 10:34:09 +00:00
Luis bec8085ca5 Added path check to config attachment store 2021-04-27 10:34:08 +00:00
Daniel Rodriguez e0c7fc8c1e Merge branch 'ent-7323-Bug-visuales-y-funcionamiento-parametros-de-filtros-de-eventos' into 'develop' 
fixed filter load in events view

See merge request artica/pandorafms!4048
 2021-04-27 10:33:15 +00:00
Daniel Barbero Martin d3f3364830 Fixed errors display tab ehorus 2021-04-27 11:06:17 +02:00
Daniel Maya 49d2e9a437 #7404 fixed acl in event response 2021-04-27 10:19:05 +02:00
Daniel Barbero Martin 8324655aab Fixed errors SQL metaconsole events 2021-04-27 10:03:34 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00
Daniel Maya dd124fa7d9 Fixed severity 2021-04-26 14:09:07 +02:00
Daniel Rodriguez 1b3410af2f Merge branch 'ent-7373-CSV-de-las-graficas-de-modulos-se-generan-vacios' into 'develop' 
Fixed errors charts in open

See merge request artica/pandorafms!4062
 2021-04-26 09:08:48 +00:00
marcos 2db8c73743 fixed error with rr and rw in report list - acls 2021-04-26 10:30:51 +02:00
marcos a47f99a455 fixed visual error HA 2021-04-26 08:36:02 +02:00
artica 72b9748be9 Auto-updated build strings. 2021-04-26 01:00:14 +02:00
artica fa2748ac5d Auto-updated build strings. 2021-04-25 01:00:22 +02:00
artica 351570213f Auto-updated build strings. 2021-04-24 01:00:38 +02:00
José González 68e1e72b46 Controlled if Integria IMS is selected for show Create workunit switch 2021-04-23 13:43:16 +02:00
Daniel Rodriguez 67467e7a90 Merge branch 'ent-7369-wizard-snmp-no-funciona' into 'develop' 
Fixed issue with id_plugin

Closes pandora_enterprise#7369

See merge request artica/pandorafms!4058
 2021-04-23 11:13:56 +00:00
marcos f1134c49fd fixed error time interval editor 2021-04-23 12:38:58 +02:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Daniel Barbero Martin 8d33a4a476 update translate strings 2021-04-23 09:03:09 +02:00
Daniel Barbero Martin fc2da38cbd Fixed errors charts in open 2021-04-23 08:58:23 +02:00
artica f3f44ebbdd Auto-updated build strings. 2021-04-23 01:00:18 +02:00
marcos 0ff28fb9a2 fixed error with icon groups policies 2021-04-22 16:09:05 +02:00
vgilc ce72a5c6ee Merge branch 'ent-7356-SQL-graphs-en-templates-no-muestra-grafico' into 'develop' 
Fixed errors report sql

See merge request artica/pandorafms!4055
 2021-04-22 12:20:02 +00:00
José González e957961ee5 Fixed issue with id_plugin 2021-04-22 14:15:56 +02:00
marcos 733087f704 fixed error with modal cluster view 2021-04-22 13:23:49 +02:00
vgilc cb3bf7fed0 Merge branch 'ent-7367-api-creacion-grupos-error' into 'develop' 
Set default values for max agents in group creation

Closes pandora_enterprise#7367

See merge request artica/pandorafms!4054
 2021-04-22 08:47:59 +00:00
Daniel Barbero Martin 918262f27f Fixed errors report sql 2021-04-22 09:50:22 +02:00
vgilc c42d132269 Merge branch 'ent-7355-fallo-api-crear-agentes' into 'develop' 
Fixed bug on api call create_agent

See merge request artica/pandorafms!4050
 2021-04-22 07:45:08 +00:00
José González 8486e3c64f Set default values for max agents in group creation 2021-04-22 09:40:25 +02:00
vgilc 2b973162b9 Merge branch 'ent-7363-Bug-al-copiar-consola-visual' into 'develop' 
Ent 7363 bug al copiar consola visual

See merge request artica/pandorafms!4053
 2021-04-22 07:07:22 +00:00
daniel a2a3e67d49 Ent 7363 bug al copiar consola visual 2021-04-22 07:07:22 +00:00
artica c7521d27fa Auto-updated build strings. 2021-04-22 01:00:16 +02:00
alejandro.campos@artica.es 1c8e73df9d fixed count in several views 2021-04-21 17:11:32 +02:00
Calvo 888915a1c1 Fix reource registraton error 500 on empty or bad ptr file 2021-04-21 17:04:11 +02:00
Calvo 371f87bcdf Fixed bug on api call create_agent 2021-04-21 15:47:56 +02:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
vgilc c99e810b54 Merge branch 'ent-7331-Bug-en-background-de-widgets-dashboards' into 'develop' 
Fixed errors widgets background black-theme and required group

See merge request artica/pandorafms!4044
 2021-04-21 09:29:10 +00:00
vgilc ac8f669b8e Merge branch 'ent-7338-spinner-infinito-input-agent-grouped-general' into 'develop' 
Fixed infinite spinner on agent field grouped general report

See merge request artica/pandorafms!4046
 2021-04-21 09:28:40 +00:00
Daniel Barbero Martin 998ad91b69 Fixed errors diagnostic 2021-04-21 11:07:20 +02:00
Calvo 00e61aba79 Fixed infinite spinner on agent field grouped general report 2021-04-21 10:59:39 +02:00
Calvo 29e7f44cda Fixed visual bugs on search view reports 2021-04-21 09:41:25 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
artica d4d7494e27 Auto-updated build strings. 2021-04-21 01:00:16 +02:00
fbsanchez b33104c641 Fixed notifications when not fully configured 2021-04-20 13:19:19 +02:00
Daniel Maya a05c5cf555 #6618 Added random name css 2021-04-20 11:46:33 +02:00
alejandro.campos@artica.es c3313848bd Added new field in api call 2021-04-20 11:36:26 +02:00
vgilc 3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop' 
reviewing correlated alerts

See merge request artica/pandorafms!4024
 2021-04-20 07:56:04 +00:00
vgilc a990689e59 Merge branch 'ent-7268-Falla-sincronizacion-de-inventario-Integria-Pandora' into 'develop' 
changed request protocol

See merge request artica/pandorafms!4033
 2021-04-20 07:31:13 +00:00
vgilc 55677850a6 Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop' 
fixeed visual error vc legacy mode

See merge request artica/pandorafms!4036
 2021-04-20 07:30:11 +00:00
artica 20fe99ef29 Auto-updated build strings. 2021-04-20 01:00:15 +02:00
artica 3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
fbsanchez 0a6fd37913 minor style change 2021-04-19 14:51:22 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
marcos 4655668ca4 fixeed visual error vc legacy mode 2021-04-19 14:16:30 +02:00
marcos 6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
Daniel Rodriguez 71af7103d1 Merge branch 'ent-7267-Fallo-al-meter-comentario-en-ticket-desde-pandora-integracion-integria-pandora' into 'develop' 
fixed bug on integria api calls

See merge request artica/pandorafms!4034
 2021-04-19 07:19:15 +00:00
Daniel Rodriguez 59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop' 
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
 2021-04-19 07:17:56 +00:00
artica 08abb25fc4 Auto-updated build strings. 2021-04-19 01:00:13 +02:00
artica 1030ef052a Auto-updated build strings. 2021-04-18 01:00:13 +02:00
artica 9ec945fa3c Auto-updated build strings. 2021-04-17 01:00:15 +02:00
alejandro.campos@artica.es 2732c6db1c fixed bug in api call 2021-04-16 11:22:29 +02:00
alejandro.campos@artica.es 3ff361977c check page load protocol on integria setup 2021-04-16 10:02:34 +02:00
Jose Gonzalez 8e503086a2 Event type changed 2021-04-16 09:51:11 +02:00
Jose Gonzalez 494666244d Fixed stupid bug 2021-04-16 09:10:38 +02:00
artica f585e44692 Auto-updated build strings. 2021-04-16 01:00:41 +02:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 93d70da822 Modified function 2021-04-15 21:20:34 +02:00
Daniel Rodriguez 8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop' 
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
 2021-04-15 14:53:32 +00:00
Jose Gonzalez a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
fbsanchez 3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Jose Gonzalez 3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Daniel Rodriguez 5fbd209a73 Merge branch 'ent-1516-dias-de-la-semana-aparecen-siempre-en-ingles' into 'develop' 
fixed error with weeckly days sla

See merge request artica/pandorafms!3951
 2021-04-15 12:37:38 +00:00
Marcos Alconada 798c1d060f fixed error with weeckly days sla 2021-04-15 12:37:38 +00:00
Daniel Rodriguez 4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop' 
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
 2021-04-15 12:36:58 +00:00
marcos e506523fff fixed minnor error 2021-04-15 13:55:14 +02:00
alejandro.campos@artica.es 8021b53763 fixed bug on integria api calls 2021-04-15 13:46:28 +02:00
Marcos Alconada 317bf0da3d minnor error fixed 2021-04-15 10:33:31 +00:00
alejandro.campos@artica.es ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Jose Gonzalez a69666aad9 Added Event class 2021-04-15 12:00:32 +02:00
Jose Gonzalez ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos 24099644be remove log 2021-04-15 11:22:24 +02:00
fbsanchez 2e45e0bde4 Fixes in table tevent_rule definition 2021-04-15 10:35:21 +02:00
artica fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02:00
fbsanchez 21d72f41f9 Revert "Revert "Update tevent_rule schema"" 
This reverts commit 2b05cde214.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-15 00:20:42 +02:00
fbsanchez 2b05cde214 Revert "Update tevent_rule schema" 
This reverts commit a80e50b730.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-14 21:42:19 +02:00
fbsanchez a80e50b730 Update tevent_rule schema 2021-04-14 21:39:58 +02:00
Daniel Rodriguez a93a3b7967 Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop' 
Fixed and improved alert functions.

See merge request artica/pandorafms!3957
 2021-04-14 13:15:29 +00:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
Jose Gonzalez f684cef491 Changed audit log for event and refactor 2021-04-14 12:16:28 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
fbsanchez 3dc49bea23 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-14 09:38:44 +02:00
Calvo 3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
artica 46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00
Daniel Rodriguez 72480bdb1a Merge branch 'ent-7287-selectores-desplegados-en-home-screen' into 'develop' 
fixed visual error selects home view

See merge request artica/pandorafms!4028
 2021-04-13 14:48:36 +00:00
Daniel Rodriguez fff13ad2ac Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop' 
Minor changes

See merge request artica/pandorafms!3930
 2021-04-13 14:31:37 +00:00
marcos 0500b90101 fixed visual error selects home view 2021-04-13 16:29:28 +02:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00
marcos 4f803c8abb fixed visual error selects home view 2021-04-13 13:23:22 +02:00
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Jose Gonzalez fa7ca4d77b Added function for use templates in emails 2021-04-13 12:52:11 +02:00
Daniel Maya bdbfe81f31 Fixed id_agente_modulo in sql condiction 2021-04-13 12:24:35 +02:00
Daniel Rodriguez 751d7ec3cf Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop' 
Ent 7161 cambiar opciones de skin en usuarios y grupos

See merge request artica/pandorafms!3972
 2021-04-13 09:26:50 +00:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00:00
José González 4a028b2ee3 Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo' 
# Conflicts:
#   pandora_console/extras/mr/46.sql
 2021-04-13 07:52:48 +00:00
artica c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
fbsanchez 1b4251cf49 minor improvement, disabledElements 2021-04-12 20:10:58 +02:00
fbsanchez 6a220208b4 reviewing correlated alerts 2021-04-12 19:16:39 +02:00
alejandro.campos@artica.es 93f3551326 Create interface views 2021-04-12 18:17:09 +02:00
Daniel Rodriguez a6f2b364f6 Merge branch 'ent-7281-Aumentar-carácteres-de-la-caja-de-consulta-SQL-en-Informes' into 'develop' 
Ent 7281 aumentar carácteres de la caja de consulta sql en informes

See merge request artica/pandorafms!4014
 2021-04-12 14:44:33 +00:00
Daniel Maya 8a27517cc5 Ent 7281 aumentar carácteres de la caja de consulta sql en informes 2021-04-12 14:44:33 +00:00
Daniel Rodriguez b4e469c463 Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Reverted failed change

Closes pandora_enterprise#7040

See merge request artica/pandorafms!4007
 2021-04-12 14:40:28 +00:00
Jose Gonzalez 3b4927e9b0 Fixed missed params to update max_agents 2021-04-12 13:20:21 +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 Maya 22914f410c Fixed no data found in tree view 2021-04-12 12:14:47 +02:00
Daniel Rodriguez 9184d2b11f Merge branch 'ent-6857-implementar-control-de-descarga-csv-del-log-viewer-en-metaconsola' into 'develop' 
Ent 6857 implementar control de descarga csv del log viewer en metaconsola

See merge request artica/pandorafms!3917
 2021-04-12 08:48:16 +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
Jose Gonzalez 141daec1ab Missed value for add 2021-04-12 10:42:13 +02:00
Daniel Rodriguez 558ba562ee Merge branch 'ent-7292-bug-creacion-grupos' into 'develop' 
Added boolean casting for check acl

Closes pandora_enterprise#7292

See merge request artica/pandorafms!4016
 2021-04-12 08:17:34 +00:00
artica 4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica 3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
Jose Gonzalez 62264c9d07 Added boolean casting for check acl 2021-04-09 14:05:33 +02:00
Daniel Rodriguez bcb0832309 Merge branch 'ent-7070-archivo-raro-0-en-pandoa_console' into 'develop' 
Avoid file 0 with log in pandora_console

See merge request artica/pandorafms!3863
 2021-04-09 11:53:26 +00:00
Jose Gonzalez 9f92a4b6c5 Added CSRF token input for PrintForms 2021-04-09 13:31:11 +02:00
Jose Gonzalez ee858280e1 Changed CSRF hidden function for allow return 2021-04-09 13:30:31 +02:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Marcos Alconada 225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Daniel Rodriguez a203a6e80d Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' 
fixed size box log sources status

See merge request artica/pandorafms!4006
 2021-04-09 09:35:50 +00:00
Daniel Rodriguez ae655da711 Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' 
add black theme style on visual map

See merge request artica/pandorafms!4008
 2021-04-09 09:34:59 +00:00
Daniel Rodriguez 040fdbae01 Merge branch 'ent-7262-fondo-de-la-grafica-de-acceso-no-es-transparente-casca-en-blactheme' into 'develop' 
set black theme on agent access rate flot

See merge request artica/pandorafms!3997
 2021-04-09 09:29:26 +00:00
Marcos Alconada a1fceb2e81 set black theme on agent access rate flot 2021-04-09 09:29:26 +00:00
Daniel Rodriguez bda9cbe3e8 Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3994
 2021-04-09 09:28:25 +00:00
Daniel Rodriguez 1b9916c6e9 Merge branch 'ent-6818-bug-en-label-de-informes-y-plantillas' into 'develop' 
fixed error with label reporting views

See merge request artica/pandorafms!3938
 2021-04-09 09:24:44 +00:00
Daniel Rodriguez 1fb259c35f Merge branch 'ent-7260-no-esta-funcionando-operaciones-masivas-agentes-edicion' into 'develop' 
fixed error on bulk operations edit agents

See merge request artica/pandorafms!3995
 2021-04-09 09:21:36 +00:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
Jose Gonzalez 2ef57919a1 Avoiding clickjacking 2021-04-08 11:28:01 +02:00
Daniel Rodriguez 4adb9827cb Merge branch 'ent-7278-no-se-despliegan-agentes-en-templates-wizard-ni-en-generacion-dinamica-de-reports-desde' into 'develop' 
minor fix while empty search condition

See merge request artica/pandorafms!4012
 2021-04-08 07:49:16 +00:00
artica 2e27cebad2 Auto-updated build strings. 2021-04-08 01:00:37 +02:00
fbsanchez c64f05dc17 minor fix while empty search condition 2021-04-07 20:31:24 +02:00
fbsanchez 201d3194de Some inclusions in mobile view (MC) and minor fixes 2021-04-07 18:17:08 +02:00
fbsanchez cf6ad584d4 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 2021-04-07 17:46:43 +02:00
Daniel Rodriguez b62dc5c0c2 Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' 
fixed visual error report wizard

See merge request artica/pandorafms!3896
 2021-04-07 15:10:32 +00:00
daniel d78c276721 fixed visual error report wizard 2021-04-07 15:10:32 +00:00
Daniel Rodriguez 1f61161e6f Merge branch 'ent-6997-bug-unidades-item-general-summation' into 'develop' 
General report exponent prefix shows with blankspace

See merge request artica/pandorafms!3924
 2021-04-07 13:15:38 +00:00
marcos 4395f21e4e add black theme style on visual map 2021-04-07 13:27:24 +02:00
Jose Gonzalez 34b01fdf51 Merge 2021-04-07 13:10:52 +02:00
Jose Gonzalez d4d3350c8c Reverted failed change 2021-04-07 13:03:18 +02:00
Daniel Rodriguez b89a860ba7 Merge branch 'ent-6969-bug-refresco-eventos' into 'develop' 
Fixed mixed response from event datatables

See merge request artica/pandorafms!3952
 2021-04-07 10:55:25 +00:00
Daniel Rodriguez 517d7378d4 Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop' 
Addded param to escape API url call raw_decode

See merge request artica/pandorafms!3914
 2021-04-07 10:54:47 +00:00
Daniel Rodriguez 9813586f0d Merge branch 'ent-6935-OPEN-mouse-over-confuso-items' into 'develop' 
Added more clear message

Closes pandora_enterprise#6935

See merge request artica/pandorafms!3853
 2021-04-07 10:54:20 +00:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
Daniel Rodriguez b244cd28b2 Merge branch 'ent-6962-tags-largos-no-caben-en-configuracion-modulos' into 'develop' 
Added tips to large tags in module config

See merge request artica/pandorafms!3851
 2021-04-07 10:52:39 +00:00
Luis 36287188b4 Added tips to large tags in module config 2021-04-07 10:52:39 +00:00
Daniel Rodriguez f0870e6e08 Merge branch 'ent-7028-giss-implementar-dropdown-buscador-para-custom-fields' into 'develop' 
select2 on select items

See merge request artica/pandorafms!3836
 2021-04-07 10:52:07 +00:00
Daniel Rodriguez 08fa353682 Merge branch 'ent-7034-button-go-back-remote-components-do-not-work' into 'develop' 
Fixed reomte components search bugs and button go back

See merge request artica/pandorafms!3998
 2021-04-07 10:51:35 +00:00
Luis 97879d1c71 Fixed reomte components search bugs and button go back 2021-04-07 10:51:35 +00:00
marcos 7a5125ea8c fixed size box log sources status 2021-04-07 11:52:57 +02:00
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-04-07 10:28:44 +02:00
fbsanchez 1ac6ed35cf Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 10:23:33 +02:00
fbsanchez 4920dc9621 Revert "Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop'" 
This reverts merge request !3860
 2021-04-07 10:17:32 +02:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
artica 8734494b7f Auto-updated build strings. 2021-04-07 01:00:38 +02:00
Daniel Rodriguez 7593fe9f81 Merge branch 'ent-4536-Quitar-el-autocompletado-de-los-campos-personalizados' into 'develop' 
Ent 4536 quitar el autocompletado de los campos personalizados

See merge request artica/pandorafms!3811
 2021-04-06 17:48:14 +00:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
Daniel Rodriguez aaded121a4 Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop' 
restricted action creation on alerts created from policy

See merge request artica/pandorafms!3891
 2021-04-06 17:46:47 +00:00
Daniel Rodriguez 43cfa383ac Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop' 
Add pagination to commands view

See merge request artica/pandorafms!3919
 2021-04-06 17:44:54 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop' 
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
 2021-04-06 17:33:38 +00:00
Daniel Rodriguez e6ad284b80 Merge branch 'ent-6999-No-aparece-la-cabecera-en-la-vista-de-clusterssi-no-hay-cluster-creado' into 'develop' 
add deafult header

See merge request artica/pandorafms!3829
 2021-04-06 17:32:31 +00:00
Daniel Rodriguez 58d5c2bc69 Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop' 
Fixed alert detail filter and tactical view counter for disabled alers/agents/modules

See merge request artica/pandorafms!3881
 2021-04-06 17:30:27 +00:00
Daniel Rodriguez bec22b5825 Merge branch 'ent-7238-salto-de-linea-perfil-grupo-manage-users' into 'develop' 
Fixed user/profile newline on users_list

See merge request artica/pandorafms!3982
 2021-04-06 17:24:20 +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 8b817c63c7 Merge branch 'ent-6994-cambiar-el-orden-de-los-items-de-un-template-en-iformes-no-funciona' into 'develop' 
unsort template items

See merge request artica/pandorafms!3810
 2021-04-06 17:22:33 +00:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' 
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
 2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
Daniel Rodriguez 68a8c37545 Merge branch 'ent-6808-llamada-api-deja-logueado-usuario' into 'develop' 
Fixed session close on api

See merge request artica/pandorafms!3749
 2021-04-06 17:18:53 +00:00
Daniel Rodriguez 7a0139accd Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop' 
API get license, get license_remaining

See merge request artica/pandorafms!3814
 2021-04-06 17:18:24 +00:00
Daniel Rodriguez a70a74fb47 Merge branch 'ent-7241-ventana-de-newsletter-con-errores-visuales' into 'develop' 
fixed lost icon

See merge request artica/pandorafms!3984
 2021-04-06 17:15:41 +00:00
Marcos Alconada f2efb6a39b fixed lost icon 2021-04-06 17:15:41 +00:00
Daniel Rodriguez dc692dbf2c Merge branch 'ent-6332-aadcm-anadir-buscador-de-modulos-en-vista-de-agente-consola-movil' into 'develop' 
Added a searchbox for module list in mobile/agent

See merge request artica/pandorafms!3962
 2021-04-06 17:14:49 +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
Daniel Rodriguez 1e90b0d300 Merge branch 'ent-6986-11304-ordenar-alfabeticamente-los-resultados-snmp-en-discovery' into 'develop' 
Modules alphabetically sorted in Discovery review

See merge request artica/pandorafms!3907
 2021-04-06 17:09:28 +00:00
Daniel Rodriguez 1de0f6060c Merge branch 'ent-4228-system-uptime-always-shows-data-formatted-as-date' into 'develop' 
Fixed data always formatting to date in sys uptime snmp modules

See merge request artica/pandorafms!3857
 2021-04-06 17:08:40 +00:00
Daniel Rodriguez 1eba5f8e6c Merge branch 'ent-7072-mensaje-erroneo-module-management-meta' into 'develop' 
Fixed centralized management warnin on module management meta

See merge request artica/pandorafms!3880
 2021-04-06 17:06:40 +00:00
Luis 4944820aed Fixed centralized management warnin on module management meta 2021-04-06 17:06:40 +00:00
Daniel Rodriguez 29bf07d96c Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' 
Fixed issue with URLs

Closes pandora_enterprise#7040

See merge request artica/pandorafms!3860
 2021-04-06 17:05:17 +00:00
Daniel Rodriguez 7756056755 Merge branch 'ent-7242-cambio-iconos-vista-edicion-agentes' into 'develop' 
restored bell and module icon with plus on agent edition view

See merge request artica/pandorafms!3988
 2021-04-06 17:03:19 +00:00
Daniel Rodriguez 9c7eebc638 Merge branch 'ent-7195-errores-visuales-consola-movil' into 'develop' 
Added missing classes to main.css mobile

See merge request artica/pandorafms!3970
 2021-04-06 17:02:20 +00:00
Daniel Rodriguez c192a1681b Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop' 
Fixed task edit url when nof fully defined (custom-script)

See merge request artica/pandorafms!3906
 2021-04-06 17:00:49 +00:00
Daniel Rodriguez 859c174c1b Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop' 
fixed error events reports

See merge request artica/pandorafms!3902
 2021-04-06 16:59:42 +00:00
Daniel Rodriguez 1b32ad83ff Merge branch 'ent-7052-entities-en-nombre-de-eventos' into 'develop' 
remove entities when add comment

See merge request artica/pandorafms!3839
 2021-04-06 16:58:05 +00:00
Marcos Alconada 654a4ebbd0 remove entities when add comment 2021-04-06 16:58:05 +00:00
Daniel Rodriguez 6adc987f72 Merge branch 'ent-7035-enlace-modulos-rotos-module-library' into 'develop' 
Fixed module library download links

See merge request artica/pandorafms!3834
 2021-04-06 16:56:37 +00:00
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
Jose Gonzalez 2a7aa8c1e5 Fix bugs with SLA item reports 2021-04-06 15:25:43 +02:00