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

22082 Commits

Author SHA1 Message Date
Daniel Maya 9c234eef85 Ent 7087 mensaje duplicado en los test mails 2021-05-11 13:48:09 +00:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez 128f67b058 Merge branch 'ent-7139-clickjacking' into 'develop' 
Avoiding clickjacking

Closes pandora_enterprise#7139

See merge request artica/pandorafms!4013
 2021-05-11 09:45:08 +00:00
Daniel Rodriguez fb539be410 Merge branch 'ent-7479-Integracion-Integria-IMS-falla-subida-de-adjuntos' into 'develop' 
fixed bug in file attachment

See merge request artica/pandorafms!4102
 2021-05-11 07:40:54 +00:00
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +00:00
Daniel Rodriguez f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +00:00
Daniel Rodriguez ac0ef3c61c Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop' 
minor change in integria ims setup

See merge request artica/pandorafms!4104
 2021-05-11 07:39:16 +00:00
Daniel Rodriguez de58f0533b Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop' 
Ent 6618 giss nombres de servicios aleatorios

See merge request artica/pandorafms!4039
 2021-05-11 07:37:49 +00:00
Daniel Rodriguez 197e156869 Merge branch 'ent-5264-Report-vacio-mails-console-tasks' into 'develop' 
Added function for use templates in emails

Closes pandora_enterprise#5264

See merge request artica/pandorafms!4027
 2021-05-11 07:35:01 +00:00
Daniel Barbero Martin c19e398057 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-11 07:37:56 +02:00
artica 6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
fbsanchez 3bb615a639 Added method getDBH DBmaintainer 2021-05-10 15:24:33 +02:00
fbsanchez 1f968a0ce0 1st steps show node pending queries 2021-05-10 13:40:41 +02:00
Daniel Rodriguez fd7eb10f3e Merge branch 'ent-7340-Mensaje-ajax-php-permanente-en-el-log-de-consola' into 'develop' 
remove log input

See merge request artica/pandorafms!4103
 2021-05-10 09:52:08 +00:00
Luis 61dc2e833b Ent 5680 llamada api set update agent field 2021-05-10 09:49:43 +00:00
Daniel Rodriguez b6169575a9 Merge branch 'ent-7155-bug-edicion-tickets-integria' into 'develop' 
Ent 7155 bug edicion tickets integria

See merge request artica/pandorafms!3991
 2021-05-10 09:17:14 +00:00
Luis a94c70551d Ent 7155 bug edicion tickets integria 2021-05-10 09:17:14 +00:00
Daniel Rodriguez 826e9edddb Merge branch 'ent-7481-black-theme-segunda-solapa-de-vista-de-un-agente-no-tiene-tabla' into 'develop' 
fixed visual error black theme event modal

See merge request artica/pandorafms!4098
 2021-05-10 09:16:19 +00:00
Marcos Alconada 8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00
Daniel Rodriguez a0197dab87 Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop' 
Ent 7453 busqueda alertas en vista de agente no funciona

See merge request artica/pandorafms!4084
 2021-05-10 09:15:40 +00:00
Daniel Rodriguez 4c768bc6cd Merge branch 'ent-7439-metaconsola-dashboard-fallo-link-publico' into 'develop' 
Reference to base public_dashboard url

See merge request artica/pandorafms!4081
 2021-05-10 09:14:58 +00:00
Daniel Rodriguez 12ccb680d6 Merge branch 'ent-7099-11462-Crear-grupo-de-agentes-con-contraseña-mediante-la-API' into 'develop' 
Added new field in api call

See merge request artica/pandorafms!4040
 2021-05-10 09:14:25 +00:00
Daniel Rodriguez d1e0f070f1 Merge branch 'ent-7296-botones-descolocados-gestion-eventos-metaconsola' into 'develop' 
Event responses buttons visual bug

See merge request artica/pandorafms!4111
 2021-05-10 09:11:29 +00:00
Daniel Rodriguez 5a339ac76e Merge branch 'ent-7284-Warning-creación-agente' into 'develop' 
Ent 7284 warning creación agente

See merge request artica/pandorafms!4017
 2021-05-10 09:10:43 +00:00
Daniel Maya cdf0e1a4f4 Ent 7284 warning creación agente 2021-05-10 09:10:43 +00:00
Daniel Rodriguez 3d8f0b58d6 Merge branch 'ent-7258-spinner-infinito-agentes-report-sla-items' into 'develop' 
Fix bugs with SLA item reports

Closes pandora_enterprise#7258

See merge request artica/pandorafms!4000
 2021-05-10 09:09:36 +00:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00
Daniel Rodriguez d878fdfdb8 Merge branch 'ent-7184-duplicate-web-server-module' into 'develop' 
Ent 7184 duplicate web server module

Closes pandora_enterprise#7184

See merge request artica/pandorafms!3978
 2021-05-10 09:08:09 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
Daniel Rodriguez b609bbfdd9 Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' 
Fixed metaconsole ACL on module graphs view

See merge request artica/pandorafms!3987
 2021-05-10 08:15:50 +00:00
Daniel Barbero Martin 2240f71c0c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-10 08:40:59 +02:00
artica dfba1da200 Auto-updated build strings. 2021-05-10 01:00:34 +02:00
artica fb1ea7bd1d Auto-updated build strings. 2021-05-09 01:00:25 +02:00
artica 68f4f6f135 Auto-updated build strings. 2021-05-08 01:00:43 +02:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
José González 48e464542a Fixed missing spinner 2021-05-07 13:50:28 +02:00
José González 214535bdaa Revert functions_ui 2021-05-07 11:11:36 +00:00
José González c7bb5ad430 Revert 2 2021-05-07 13:07:35 +02:00
José González c0e6bef136 Revert 2021-05-07 13:05:39 +02:00
José González 0a7c960630 Added control for autocomplete input icon 2021-05-07 12:40:38 +02:00
José González 5b709e6331 Aditional control for agent autocomplete input icon' 2021-05-07 11:53:42 +02:00
Daniel Barbero Martin f7f4591ab1 WIP command center 2021-05-07 11:19:47 +02:00
José González 856186ee59 Added function for control icon changes 2021-05-07 11:17:20 +02:00
fbsanchez fe932a0dd6 avoid some warnings 2021-05-07 10:50:25 +02:00
fbsanchez 2fb54dabf1 Avoid change path while adding resources in certain situations 2021-05-07 10:47:05 +02:00
Daniel Barbero Martin 77693b6c6d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-07 08:33:56 +02:00
artica 454e6120e4 Auto-updated build strings. 2021-05-07 01:00:44 +02:00
José González 9288a31e58 Fixed error with types 2021-05-06 17:44:32 +02:00
Calvo 3359b21d5b Event responses buttons visual bug 2021-05-06 16:06:21 +02:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Daniel Rodriguez 77a1de6b1b Merge branch 'ent-7285-No-aparece-mensaje-en-el-TreeView-al-filtrar' into 'develop' 
Ent 7285 no aparece mensaje en el tree view al filtrar

See merge request artica/pandorafms!4018
 2021-05-06 12:26:58 +00:00
Daniel Rodriguez 8b3ad8602a Merge branch 'ent-7097-varios-bugs-mensajes' into 'develop' 
Ent 7097 varios bugs mensajes

Closes pandora_enterprise#7097

See merge request artica/pandorafms!3996
 2021-05-06 12:25:03 +00:00
Daniel Rodriguez 6db71ec0fb Merge branch 'ent-7176-no-se-ven-los-valores-de-la-columna-de-intervlos-en-creacion-de-modulos-black-theme' into 'develop' 
set labels white color on module interval svg

See merge request artica/pandorafms!3993
 2021-05-06 12:23:47 +00:00
Daniel Rodriguez c39d013afb Merge branch 'ent-7227-Perfil-LM-no-permite-modificar-acciones-ni-templates' into 'develop' 
Ent 7227 perfil lm no permite modificar acciones ni templates

See merge request artica/pandorafms!3980
 2021-05-06 12:22:48 +00:00
Daniel Maya c003964394 Ent 7227 perfil lm no permite modificar acciones ni templates 2021-05-06 12:22:47 +00:00
Daniel Barbero Martin 51f38f3589 WIP command center 2021-05-06 14:22:39 +02:00
Daniel Rodriguez 1e0eabdbf7 Merge branch 'ent-7114-no-se-puede-realizar-llamada-api-add-user-profile-modo-all' into 'develop' 
Fixed api add user profile with group all

See merge request artica/pandorafms!3974
 2021-05-06 12:19:23 +00:00
Daniel Rodriguez 5efb331568 Merge branch 'ent-7140-vista-agents-alerts-salta-vista-principal' into 'develop' 
Fixed agents/alerts view group change when public url foreced

See merge request artica/pandorafms!4108
 2021-05-06 12:17:38 +00:00
Daniel Rodriguez 0371a9acd6 Merge branch 'ent-7218-filtrado-erroneo-tree-view' into 'develop' 
Fixed treeview filter by module status

See merge request artica/pandorafms!3981
 2021-05-06 12:14:16 +00:00
Daniel Rodriguez 8e737502c5 Merge branch 'ent-7133-texto-ingles-discovery' into 'develop' 
Fixed text

Closes pandora_enterprise#7133

See merge request artica/pandorafms!3976
 2021-05-06 12:10:21 +00:00
Daniel Rodriguez f33384931e Merge branch 'ent-7108-API-get-all-agents-no-filtra-por-alias' into 'develop' 
Ent 7108 api get all agents no filtra por alias

See merge request artica/pandorafms!3944
 2021-05-06 12:07:49 +00:00
Daniel Rodriguez 325e400b11 Merge branch 'ent-7109-Bug-al-duplicar-alertas-snmp' into 'develop' 
Ent 7109 bug al duplicar alertas snmp

See merge request artica/pandorafms!3934
 2021-05-06 12:07:16 +00:00
Daniel Rodriguez dd014596d6 Merge branch 'ent-7117-Guardar-puerto-al-crear-network-component-desde-el-SNMP-Browser' into 'develop' 
Ent 7117 guardar puerto al crear network component desde el snmp browser

See merge request artica/pandorafms!3943
 2021-05-06 12:06:21 +00:00
Daniel Rodriguez db92b65fd0 Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop' 
resolved error with sql message error external tools2

See merge request artica/pandorafms!3979
 2021-05-06 12:05:04 +00:00
Daniel Barbero Martin d5dcc5bf69 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-06 08:30:30 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
Calvo dec202ed78 Fixed agents/alerts view group change when public url foreced 2021-05-05 17:53:52 +02:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
José González 6570441fd2 Fixed issue with type 2021-05-05 12:05:06 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
alejandro.campos@artica.es e28c6377de remove log input 2021-05-05 10:35:00 +02:00
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
José González 385366a9e1 Merge branch 'develop' into 'ent-7184-duplicate-web-server-module' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2021-05-05 07:37:02 +00:00
marcos 25867a0fd7 fixed visual error black theme 2021-05-05 09:36:16 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
Daniel Barbero Martin 2495611249 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-05 08:30:48 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
José González f8f6016c21 Solved issues with double quotes and improve the code 2021-05-04 19:07:18 +02:00
Daniel Barbero Martin 55a1ea6f2a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-04 17:19:35 +02:00
José González e49edc93d6 Fixed missed parameter 2021-05-04 13:48:13 +02:00
Daniel Maya 5dd5a9aeee Fixed Cross-Site Scripting 2021-05-04 12:54:21 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
fbsanchez 34b02982e1 Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag 2021-04-30 15:01:43 +02:00
fbsanchez e179475663 Repaired group selector in rules 2021-04-30 14:54:14 +02:00
José González 0dc1ec449c Added standard headers 2021-04-30 14:44:03 +02:00
fbsanchez 366e9a08d5 minor fix 2021-04-30 14:36:47 +02:00
José González dbb7fe364f Added standard headers 2021-04-30 14:35:54 +02:00
fbsanchez 6b83deacdd Migrate old rules 2021-04-30 14:34:10 +02:00
vanessa gil 97e7e8c8cb Updated version. 2021-04-30 13:57:00 +02:00
José González ab984b8c32 Added standard headers 2021-04-30 13:50:58 +02:00
José González cea27392c8 Added standard header 2021-04-30 13:39:10 +02:00
José González 46a691c397 Added standard headers 2021-04-30 13:24:55 +02:00
Marcos Alconada c5fe67ddb5 fixed visual error black theme 754 LTS 2021-04-30 10:43:22 +00:00
José González 3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00
José González 71c88313d5 Added standard header 2021-04-30 10:58:37 +02:00
vanessa gil f51ad33554 Updated version. 2021-04-30 10:34:20 +02:00
Daniel Barbero Martin a20809b95d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-30 08:28:17 +02:00
artica c95b629776 Auto-updated build strings. 2021-04-30 01:00:41 +02:00
Calvo 6ad371e4ab Email test working with data in text fields 2021-04-29 16:04:51 +02:00
Daniel Barbero Martin e1847c76ee WIP command center 2021-04-29 15:59:12 +02:00
José González c54ad46f33 Added standard header 2021-04-29 15:35:33 +02:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Daniel Maya 588e06d357 #7344 fixed select 2021-04-29 12:45:35 +02:00
Calvo 4aea645735 Fixed visual bug on user creation error 2021-04-29 11:15:20 +02:00
Daniel Maya 1d472ec480 #7455 Fixed check_process 2021-04-29 08:55:16 +02:00
Daniel Barbero Martin 2ca981b03e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-29 08:34:41 +02:00
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
alejandro.campos@artica.es 22f151bc6d fixed bug in users search 2021-04-28 17:01:50 +02:00
Daniel Maya a193234270 #7453 Fixed id alert_list 2021-04-28 16:46:27 +02:00
Daniel Rodriguez 599a38fbd1 Merge branch 'ent-7404-Respuestas-de-eventos-en-usuario-solo-lectura' into 'develop' 
Ent 7404 respuestas de eventos en usuario solo lectura

See merge request artica/pandorafms!4077
 2021-04-28 14:18:35 +00:00
fbsanchez 78e4d64658 avoid using cache while getting/releasing a lock from DB 2021-04-28 14:16:28 +02:00
Daniel Rodriguez e9956092d4 Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop' 
Fixed errors display tab ehorus

See merge request artica/pandorafms!4078
 2021-04-28 11:24:45 +00:00
Daniel Rodriguez c71733385d Merge branch 'ent-7374-Actualizacion-cadenas-de-traduccion' into 'develop' 
update translate strings

See merge request artica/pandorafms!4063
 2021-04-28 10:53:05 +00:00
Daniel Rodriguez 7eb94fca42 Merge branch 'ent-7395-Filtro-de-eventos-en-Metaconsola-Server' into 'develop' 
Ent 7395 filtro de eventos en metaconsola server

See merge request artica/pandorafms!4071
 2021-04-28 10:50:04 +00:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
Daniel Rodriguez e117fd8fd0 Merge branch 'ent-7411-Error-SQL-en-items-Module-event-report-y-Agent-event-report-metaconsola' into 'develop' 
Fixed errors SQL metaconsole events

See merge request artica/pandorafms!4076
 2021-04-28 08:44:26 +00:00
fbsanchez e1810cc36f Different way to fix public dashboard 2021-04-28 09:50:04 +02:00
Daniel Rodriguez 5857c0d231 Merge branch 'ent-7393-Filtro-de-eventos-en-Metaconsola-Severity' into 'develop' 
Ent 7393 filtro de eventos en metaconsola severity

See merge request artica/pandorafms!4070
 2021-04-28 06:51:25 +00:00
Daniel Barbero Martin 2cd40a80fe Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-28 08:13:10 +02:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
fbsanchez 9f3ad33b28 Reference to base public_dashboard url 2021-04-27 18:44:06 +02:00
Daniel Rodriguez 3d3e1acef4 Merge branch 'ent-7382-fallo-visualizacion-ha' into 'develop' 
fixed visual error HA

See merge request artica/pandorafms!4067
 2021-04-27 14:33:17 +00:00
Daniel Rodriguez 28984aa414 Merge branch 'ent-7384-bug-acl-en-usuario-con-permiso-rr-u-o-rw' into 'develop' 
fixed error with rr and rw in report list - acls

See merge request artica/pandorafms!4068
 2021-04-27 14:07:48 +00:00
Daniel Rodriguez 443b43d743 Merge branch 'ent-7380-fallo-visualizacion-edicion-intervalo' into 'develop' 
fixed error time interval editor

See merge request artica/pandorafms!4065
 2021-04-27 14:06:13 +00:00
Daniel Rodriguez c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop' 
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
 2021-04-27 14:05:08 +00:00
Daniel Rodriguez 7b9c638f0d Merge branch 'ent-7349-error-500-importar-recursos-resource-registration' into 'develop' 
Fix reource registraton error 500 on empty or bad ptr file

See merge request artica/pandorafms!4051
 2021-04-27 11:48:17 +00:00
Daniel Rodriguez dedd578fe1 Merge branch 'ent-7329-Fallo-de-conteos-en-tactical-view' into 'develop' 
fixed count in several views

See merge request artica/pandorafms!4052
 2021-04-27 11:47:43 +00:00
Daniel Rodriguez 00b1596c4f Merge branch 'ent-7368-filtro-de-comentarios-de-eventos' into 'develop' 
fixed error with special charact filter in user commens

See merge request artica/pandorafms!4056
 2021-04-27 11:46:16 +00:00
Marcos Alconada 177be1f1a4 fixed error with special charact filter in user commens 2021-04-27 11:46:16 +00:00
Daniel Rodriguez 425dc74123 Merge branch 'ent-7378-create-workunit-alerts-action-form' into 'develop' 
Controlled if Integria IMS is selected for show Create workunit switch

Closes pandora_enterprise#7378

See merge request artica/pandorafms!4066
 2021-04-27 11:45:30 +00:00
Daniel Rodriguez 55c38dfc03 Merge branch 'ent-7377-fallos-en-gis-maps' into 'develop' 
fixed error with creation and updating gis maps

See merge request artica/pandorafms!4072
 2021-04-27 11:44:55 +00:00
Marcos Alconada c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
Daniel Rodriguez bf70c342ff Merge branch 'ent-7324-notificaciones-no-llegan-en-v754' into 'develop' 
Fixed notifications when not fully configured

See merge request artica/pandorafms!4042
 2021-04-27 11:42:32 +00:00
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 efe77b747a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-27 12:02:03 +02: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 Barbero Martin bdf6c9f258 WIP command center 2021-04-26 17:20:00 +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
Daniel Barbero Martin 39d1ee8d60 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-26 08:34:35 +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
Daniel Barbero Martin ccdf6e1283 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-23 08:35:18 +02:00
artica f3f44ebbdd Auto-updated build strings. 2021-04-23 01:00:18 +02:00
Daniel Barbero Martin 6548e9e210 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-22 18:29:47 +02:00
José González b922de7a8e Fixed visual issues 2021-04-22 17:10:59 +02:00
marcos 0ff28fb9a2 fixed error with icon groups policies 2021-04-22 16:09:05 +02:00
fbsanchez 78487fa4e5 Auto-synchronizer MC 2021-04-22 15:37:59 +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
fbsanchez 9d8079ad77 minor method Group 2021-04-21 10:26:33 +02:00
Calvo 29e7f44cda Fixed visual bugs on search view reports 2021-04-21 09:41:25 +02:00
Daniel Barbero Martin 41fe646461 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-21 09:17:35 +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 37e3f68b18 minor fix 2021-04-20 14:08:27 +02:00
Daniel Barbero Martin 100ae705f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 13:33:40 +02:00
fbsanchez b33104c641 Fixed notifications when not fully configured 2021-04-20 13:19:19 +02:00
marcos 3ab970ced9 fixed visual error on tm 2021-04-20 12:41:21 +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
fbsanchez c601bde472 Dump autoload updated 2021-04-20 11:10:38 +02:00
fbsanchez 36df48c621 Some improvements in Group class 2021-04-20 11:09:07 +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
Daniel Barbero Martin b8b9fa561f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 08:07:21 +02: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
Daniel Barbero Martin 0966d3d662 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-19 08:42:46 +02: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
Daniel Barbero Martin 004b73f63d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-16 08:29:11 +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 Barbero Martin 741ec6a144 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 17:41:56 +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
Daniel Barbero Martin c28ea4cc9a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 08:40:58 +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
Daniel Barbero Martin 1b21652ed2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-14 08:35:02 +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
Daniel Barbero Martin aa31ed8f58 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-13 08:34:05 +02: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
Daniel Barbero Martin 319a329aec Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-12 08:04:04 +02: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
Daniel Barbero Martin 37fe9bfafb WIP command center 2021-04-09 14:27:12 +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
Daniel Barbero Martin a80b6664d4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-09 08:04:03 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
Daniel Barbero Martin 2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +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
Daniel Barbero Martin fcf449439b WIP command center 2021-04-07 12:43:04 +02: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
Daniel Barbero Martin 216410946e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-07 10:20:46 +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
Calvo 420960ed9e Changed search bar text 2021-04-07 10:14:27 +02:00
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +00:00
Daniel Barbero Martin e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02: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
Calvo 0b1e60b8cf Fixed view icon on report and custom graphs 2021-04-06 18:18:17 +02:00
Daniel Barbero Martin 0e30f1bc4f WIP command center 2021-04-06 17:22:34 +02: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
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
fbsanchez 55e272c360 MC dashboards agent_module fixes 2021-04-06 12:53:12 +02:00
fbsanchez 38a6d65f60 Merge remote-tracking branch 'origin/develop' into ent-2685-7938-aadcm-dashboards-en-metaconsola 2021-04-06 11:01:20 +02:00
Jose Gonzalez cf4b62d4d7 Solved issue with HTML adding in subject 2021-04-06 10:37:14 +02:00
Jose Gonzalez a9a1a7ccb8 Added function for safe html symbols tag 2021-04-06 10:36:43 +02:00
marcos 7d3dc7e3a6 fixed error on bulk operations edit agents 2021-04-06 08:55:06 +02:00
Daniel Barbero Martin 74afdf9510 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-06 08:03:40 +02:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
José González bfaf8a8794 WIP: Backup upload 2021-04-05 17:55:46 +02:00
Daniel Barbero Martin 846b601a3c WIP command center 2021-04-05 17:32:19 +02:00
marcos 78ce8660c9 fixed visual error 2021-04-05 17:27:40 +02:00
fbsanchez 98b7a9c66a Update DiscoveryTaskList.class.php 2021-04-05 14:05:53 +00:00
marcos ac286a438c set labels white color on module interval svg 2021-04-05 11:41:36 +02:00
Jose Gonzalez 25e4c1017a WIP: Backup upload 2021-04-05 11:06:20 +02:00
Daniel Barbero Martin 0a106c2a6e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-05 08:20:38 +02:00
artica 31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica 4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica 95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica 2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica 10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
Daniel Barbero Martin 9364428346 WIP command center 2021-03-31 15:50:41 +02:00
Jose Gonzalez 0308fdbdc2 Clean debug lines 2021-03-31 13:29:09 +02:00
Jose Gonzalez 01a037e2d3 Changed method of send id parameter 2021-03-31 13:27:58 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
Calvo 8352e4d18d restored bell and module icon with plus on agent edition view 2021-03-31 10:54:58 +02:00
Calvo d0bddbe27c Fixed metaconsole ACL on module graphs view 2021-03-31 10:30:18 +02:00
Jose Gonzalez 5eeb3423f0 Solve merge 2021-03-31 10:29:57 +02:00
Daniel Barbero Martin 6ac13adc39 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-31 08:31:12 +02:00
artica 321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
Daniel Barbero Martin 01f801cb4f fixed minor error 2021-03-30 17:49:15 +02:00
Jose Gonzalez a8e3c10846 Added comments header and improve code 2021-03-30 16:31:45 +02:00
Daniel Maya f004cfc276 trace removed 2021-03-30 16:20:46 +02:00
Calvo 847fc44b14 Fixed user/profile newline on users_list 2021-03-30 13:34:38 +02:00
Daniel Rodriguez 8a62fa67ad Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' 
Ent 7171 iconos poco visibles en monitor detail black theme

See merge request artica/pandorafms!3929
 2021-03-30 09:51:04 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Calvo 245286330c Fixed treeview filter by module status 2021-03-30 08:28:10 +02:00
Daniel Barbero Martin 4bcc566ee1 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-30 08:28:05 +02:00
artica 8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
Daniel Barbero Martin 264c6d515e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 17:47:44 +02:00
marcos 5d38740630 resolved error with sql message error external tools2 2021-03-29 16:54:41 +02:00
artica 96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
Jose Gonzalez 5e125a33c3 Fixed lints 2021-03-29 14:42:51 +02:00
Daniel Rodriguez 3770f491dc Merge branch 'ent-7231-icono-vistas-consolas-visuales' into 'develop' 
fixed icon

See merge request artica/pandorafms!3975
 2021-03-29 12:39:02 +00:00
marcos e26c2eb76d fixed icon 2021-03-29 14:30:00 +02:00
vgilc 142b271ba0 Update pandoradb_data.sql 2021-03-29 12:21:12 +00:00
Jose Gonzalez 001b547fb0 Fixed issue with duplicate web server modules 2021-03-29 14:07:57 +02:00
marcos 390d7e79cd fixed buttton position 2021-03-29 12:32:14 +02:00
marcos 0166c3066f fixed icon 2021-03-29 12:20:27 +02:00
Jose Gonzalez 293cbc2e44 Fixed text 2021-03-29 12:17:41 +02:00
Daniel Rodriguez 4fa790dd7f Merge branch 'ent-7202-fallos-visuales-discovery' into 'develop' 
Ent 7202 fallos visuales discovery

See merge request artica/pandorafms!3953
 2021-03-29 09:49:31 +00:00
Calvo bc7584f259 Fixed api add user profile with group all 2021-03-29 10:51:02 +02:00
marcos 1f89a0d293 fixed visual error 2021-03-29 09:58:23 +02:00
Daniel Rodriguez d01c3e1c92 Merge branch 'ent-7215-fallos-vista-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3961
 2021-03-29 07:23:03 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
marcos 3934096d03 Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery 2021-03-29 09:21:04 +02:00
Daniel Rodriguez 04483fe9f3 Merge branch 'ent-7210-Bug-en-token-limit-de-widget-List-of-last-events' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3958
 2021-03-29 07:15:32 +00:00
Daniel Barbero Martin fe87e827a9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 08:17:35 +02:00
marcos 88f3ce9b90 fixed lost icons 2021-03-29 08:12:54 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
Daniel Rodriguez 812007169d Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3969
 2021-03-26 13:52:44 +00:00
Daniel Rodriguez c5d6daa018 Merge branch 'ent-7207-error-visual-en-relaciones-de-network-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3968
 2021-03-26 13:41:31 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Calvo 3b185d3a70 Added missing classes to main.css mobile 2021-03-26 14:33:48 +01:00
marcos 56462b1b06 fixed visual error 2021-03-26 14:32:29 +01:00
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3967
 2021-03-26 13:05:28 +00:00
marcos 89ba8b43fb fixed visual error 2021-03-26 13:58:13 +01: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
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop' 
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
 2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Daniel Rodriguez 1f74bd071c Merge branch 'ent-7221-icono-lupa-cambiado-por-ojo' into 'develop' 
Substituted eye with operation (magnifier) icon on credential store and tasklist

See merge request artica/pandorafms!3964
 2021-03-26 12:05:29 +00:00
Calvo 887742a675 Restored not update error message on update manager offline 2021-03-26 13:02:55 +01:00
Daniel Rodriguez 316aa0a691 Merge branch 'ent-7222-Bug-en-widget-Defined-custom-graph' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3960
 2021-03-26 11:39:14 +00:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
fbsanchez 024640bcae Added a searchbox for module list in mobile/agent 2021-03-26 11:55:44 +01:00
Daniel Barbero Martin 021675d825 fixed minor error 2021-03-26 11:28:34 +01:00
Daniel Barbero Martin 193d6bf2d2 fixed minor error 2021-03-26 10:37:44 +01:00
Daniel Barbero Martin 8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez b9f0ac8239 Merge branch 'ent-7205-fallos-visuales-en-monitoring' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3955
 2021-03-26 09:32:30 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3954
 2021-03-26 09:32:08 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Junichi Satoh d4b8916c54 Fixed following problems. 
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
 2021-03-26 17:11:10 +09:00
Daniel Barbero Martin c3aaa4eb78 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-26 08:39:47 +01:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Barbero Martin cc222faddc Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-25 17:00:27 +01:00
Daniel Barbero Martin d92adfc008 WIP command center 2021-03-25 16:50:24 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3939
 2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
marcos a6b9998bbe fixed visual error 2021-03-25 13:42:21 +01:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3946
 2021-03-25 11:55:33 +00:00
marcos f5ceb2384e fixed visual error 2021-03-25 12:35:40 +01:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01:00
Daniel Rodriguez 1d374fca46 Merge branch 'ent-2561-llamadas-api-para-modulos-de-politicas' into 'develop' 
minor changes

See merge request artica/pandorafms!3779
 2021-03-25 09:57:53 +00:00
Daniel Rodriguez f99e4763e2 Merge branch 'ent-7197-estilos-log-viewer' into 'develop' 
Fix some documentary issues

Closes pandora_enterprise#7197

See merge request artica/pandorafms!3948
 2021-03-25 09:53:41 +00:00
Daniel Rodriguez effda26dc6 Merge branch 'ent-7201-no-se-muestra-el-modal-de-detalle-de-modulos-en-la-vista-de-agent-detail' into 'develop' 
resolved error with modal module detail on agent detail

See merge request artica/pandorafms!3950
 2021-03-25 09:51:43 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Barbero Martin 586707d12a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-25 08:15:23 +01:00
artica 1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
Daniel Barbero Martin 0bfe060c50 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 17:30:47 +01:00
José González 9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-24 15:50:12 +00:00
fbsanchez 12767683dc minor fixes 2021-03-24 16:25:27 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
marcos b4cc075870 resolved error with modal module detail on agent detail 2021-03-24 14:10:46 +01:00
fbsanchez d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
Daniel Rodriguez 9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop' 
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
 2021-03-24 11:57:47 +00:00
Jose Gonzalez af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez 6cd393edef Style fix 2021-03-24 12:33:36 +01:00
fbsanchez 9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
Daniel Barbero Martin c3f85d4caa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 09:06:25 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
Daniel Rodriguez 2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3940
 2021-03-23 15:56:02 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +01:00
Daniel Rodriguez fbd41b086d Merge branch 'ent-7102-ventana-de-refresco-visual-console-no-desaparece' into 'develop' 
Fixed refresh auto hide on visual console

See merge request artica/pandorafms!3883
 2021-03-23 12:04:28 +00:00
José González 6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-23 12:00:45 +00:00
Daniel Rodriguez 0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3942
 2021-03-23 09:29:39 +00:00