Commit Graph

1592 Commits

Author SHA1 Message Date
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
alejandro.campos@artica.es a357dcfb0d updated delete files file 2022-11-11 13:20:23 +01:00
alejandro.campos@artica.es 780e6ac514 Removed transactional server 2022-11-11 12:53:41 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop'
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
2022-11-07 12:44:23 +00:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
edu.corral ba70e8dd0d ent 7914 status scaling time based 2022-11-02 12:58:45 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-31 14:13:45 +01:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-31 10:46:44 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop'
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
2022-10-31 10:02:44 +00:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-27 09:50:24 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
edu.corral 1a0fa24188 ent 7914 restore migration script 2022-10-26 11:04:53 +02:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-26 09:42:02 +02:00
edu.corral 47521e7e3c ent 7914 database adjustements 2022-10-26 09:07:48 +02:00
edu.corral 90f8122232 ent 7914 table change for status scaling based on time 2022-10-26 08:51:51 +02:00
edu.corral 0f6f7b6563 ent 7914 status scaling based on time 2022-10-21 13:22:14 +02:00
edu.corral 0fd29caffe ent 7914 status scaling based on time 2022-10-21 13:10:12 +02:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop'
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
2022-10-20 12:10:59 +00:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-18 07:23:29 +00:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-18 07:59:26 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Barbero 9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02:00
Diego Muñoz-Reja 8154ef5533 Merge branch 'ent-9391-Cambios-en-el-inventario-remoto' into 'develop'
added change to allow inventory modules to load script from a path

See merge request artica/pandorafms!5151
2022-10-11 15:14:45 +00:00
alejandro.campos@artica.es 2ea3c3038c fixed vulnerabilities 2022-10-04 18:13:50 +02:00
alejandro.campos@artica.es 05cbc2fb0e fixed vulnerability 2022-10-04 18:00:47 +02:00
Daniel Maya 2d747caede #4043 mr 58 2022-10-04 09:58:07 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
2022-09-29 12:36:37 +00:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Diego Muñoz-Reja 9aa1d4d82f Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop'
removed mr

See merge request artica/pandorafms!5150
2022-09-28 14:02:06 +00:00
alejandro.campos@artica.es 4dd0075b72 removed mr 2022-09-28 15:53:44 +02:00
alejandro.campos@artica.es 042362991d implemented option to skip inoperative interfaces on demand 2022-09-28 15:34:45 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios'
# Conflicts:
#   pandora_console/extras/mr/57.sql
2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 9c7e70c7de changes to mr 2022-09-27 17:19:10 +02:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop'
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
2022-09-27 12:26:24 +00:00
alejandro.campos@artica.es 7e85bea0f4 added change to allow inventory modules to load script from a path 2022-09-26 15:30:31 +02:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop'
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
2022-09-26 11:03:52 +00:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
alejandro.campos@artica.es 520a820625 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' of brutus.artica.es:artica/pandorafms into ent-8217-Comando-Accion-de-alerta-para-enviar-informes 2022-09-23 13:00:40 +02:00
alejandro.campos@artica.es 23bb4d0750 minor fix 2022-09-23 13:00:28 +02:00
alejandro.campos@artica.es 8918682f67 minor change 2022-09-23 09:58:37 +02:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02:00
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes'
# Conflicts:
#   pandora_console/extras/mr/57.sql
2022-09-23 06:41:57 +00:00
alejandro.campos@artica.es 2af04e7de0 change mr 2022-09-21 15:22:20 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
Daniel Barbero cefc5c4605 fixed size field bbdd tmodule_group pandora_enterprise#9453 2022-09-13 08:30:37 +02:00
José González 9cdb8788ff DB Files for IP Allow control 2022-09-12 12:41:33 +02:00
Daniel Maya d53ee55663 #9331 Fixed wizard wmi 2022-09-08 15:18:48 +02:00
Ramon Novoa 9f30d66328 Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:06:50 +02:00
Daniel Maya d3612439fb #8898 conflict resolved 2022-08-29 14:06:15 +02:00
alejandro.campos@artica.es de55200659 Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada 2022-08-29 10:06:41 +02:00
Daniel Maya 16554cfc7a #8898 networkmap 2022-08-29 09:39:47 +02:00
Diego Muñoz-Reja fe4e27018c Merge branch 'ent-9350-perdida-de-sincronizacion-en-modo-centralizado-y-duplicado-de-metaconsole_node_id' into 'develop'
fixed error metaconsole_node_id pandora_enterprise#9350

See merge request artica/pandorafms!5056
2022-08-25 12:48:26 +00:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
edu.corral 0d5640bf9b ent 9398 fixed ip field tmetaconsole_agent 2022-08-16 12:31:42 +02:00
Daniel Barbero 50bb50418d fixed error metaconsole_node_id pandora_enterprise#9350 2022-08-12 11:34:35 +02:00
Daniel Barbero cd1dfa6361 fixed error metaconsole_node_id pandora_enterprise#9350 2022-08-12 11:32:07 +02:00
Luis de1977fec1 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal'
# Conflicts:
#   pandora_console/extras/mr/56.sql
2022-08-10 11:26:05 +00:00
Daniel Barbero 1e4fa95730 discovery server to none pandora_enterprise#9282 2022-08-08 12:24:04 +02:00
Luis 33f9972293 Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal'
# Conflicts:
#   pandora_console/extras/mr/56.sql
2022-07-29 11:20:22 +00:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
Conflicts:
	pandora_console/extras/mr/56.sql
2022-07-19 10:18:04 +02:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Daniel Maya 4011ca99fe #8769 Resolved conflict 2 2022-07-14 13:02:39 +02:00
Daniel Maya e8c7c38c1f #8732 Resolved conflict 2022-07-13 11:31:18 +02:00
Daniel Maya 994c76a39b #8732 Added autoconfiguration scheduled 2022-07-08 11:02:58 +02:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
Daniel Maya b43b7b4fa5 #9226 Added tuser_task tables 2022-07-01 10:37:08 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Rodriguez d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop'
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
2022-06-23 07:53:11 +00:00
José González f241202168 Update delete_files.txt 2022-06-22 14:34:23 +00:00
Ramon Novoa 59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Maya 44fdf1c321 #7926 Added asynchronous mode 2022-06-21 16:31:56 +02:00
José González 036505fa68 Fix DB issue 2022-06-21 09:38:13 +02:00
Luis 71326bf8bb Update pandoradb_migrate_6.0_to_759.mysql.sql 2022-06-20 14:57:45 +00:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
José González 6d70353254 Fix mistake 2022-06-16 16:09:05 +00:00
José González 33e1d7aca4 DB Changes 2022-06-16 16:49:09 +02:00
José González 32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
José González ea60e4be71 Added database changes 2022-06-16 11:14:00 +02:00
Daniel Rodriguez fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop'
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
2022-06-16 08:43:12 +00:00
Daniel Rodriguez 709b49a371 Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop'
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql

See merge request artica/pandorafms!4954
2022-06-14 12:10:22 +00:00
alejandro.campos@artica.es ec7a2f89bd revert migrate file 2022-06-14 10:17:43 +02:00
alejandro.campos@artica.es 4d3d684eeb revert migrate file 2022-06-14 10:15:15 +02:00
alejandro.campos@artica.es ac246aefb1 revert migrate file 2022-06-14 10:06:28 +02:00
alejandro.campos@artica.es c09d1334d6 revert migrate file 2022-06-14 10:05:05 +02:00
José González b5de60fb69 Update manager to Warp manager 2022-06-13 12:33:03 +02:00
Daniel Maya 519fd13299 #9134 Added dsiabled in mr 2022-06-09 15:22:14 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
alejandro.campos@artica.es 6f0782782e Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario 2022-06-08 11:54:35 +02:00
alejandro.campos@artica.es 12b0f5cda1 database changes 2022-06-08 11:49:48 +02:00
Daniel Maya c9b94273be #8769 removed metaconsole_assigned_server 2022-06-07 15:21:07 +02:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Alejandro Campos 91d949942a Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario'
# Conflicts:
#   pandora_console/extras/mr/55.sql
2022-06-03 10:26:35 +00:00
Daniel Rodriguez 0a51c5f916 Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop'
Ent 8587 nueva representacion de servicios sunburst

See merge request artica/pandorafms!4819
2022-06-02 07:21:17 +00:00
Daniel Maya fc7b4d8a11 #8897 Fixed tdashboard name 2022-05-25 13:13:09 +02:00
Daniel Maya 0d3b14da40 #9005 Added lts_name 2022-05-23 13:00:01 +02:00
alejandro.campos@artica.es 5c789125f2 changed id_user field length from tusuario 2022-05-09 12:40:36 +02:00
Daniel Maya aad40cb004 #8897 name changed 2022-05-04 16:11:08 +02:00
José González e272003396 Fix 2022-04-25 10:52:15 +02:00
Daniel Maya 9f1be4531b #8587 Added sunburst 2022-04-12 17:24:47 +02:00
fbsanchez 9406fa2c09 switch order of drops in MR 2022-04-08 11:31:36 +02:00
fbsanchez 037bf016fb Swap some stuff in MR becouse some environments had FK in deprecated tables 2022-04-07 17:26:14 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
Conflicts:
	pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
Daniel Rodriguez 2471bbf1d4 Merge branch 'ent-8540-contel-nuevo-informe-custom-render' into 'develop'
add new report custom render pandora_enterprise#8540

See merge request artica/pandorafms!4793
2022-04-06 12:16:26 +00:00
Daniel Barbero Martin 9de7f0564e update version 2022-04-06 09:42:09 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop'
implemented custom data filter in event view

See merge request artica/pandorafms!4787
2022-04-04 10:38:30 +00:00
fbsanchez e4c58fcb40 fix in UMC 2022-04-01 10:37:03 +02:00
Daniel Barbero Martin 318ac668e9 add new report custom render pandora_enterprise#8540 2022-03-31 20:11:52 +02:00
fbsanchez e70c85fc65 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 2022-03-30 15:05:04 +02:00
fbsanchez 2ac8defa48 cleanup old UMC files from proyect 2022-03-30 14:54:08 +02:00
fbsanchez 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
Daniel Rodriguez 134ee890eb Merge branch 'ent-8300-gestion-ejecucion-console-tasks' into 'develop'
Added enable console task feature

See merge request artica/pandorafms!4776
2022-03-30 09:29:22 +00:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos'
# Conflicts:
#   pandora_console/extras/mr/53.sql
2022-03-30 08:03:08 +00:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
Daniel Maya 44e93fa1ed #8693 Emptying collate for alias and nombre 2022-03-28 13:48:33 +02:00
José González 187a633bae Fix mistake 2022-03-25 11:19:41 +00:00
José González cae8290c77 Missed MR file 2022-03-24 14:20:20 +01:00
Alejandro Campos 0c41459b83 Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM'
# Conflicts:
#   pandora_console/extras/mr/53.sql
2022-03-16 14:07:23 +00:00
Daniel Rodriguez 4dc6f7764c Merge branch 'ent-8400-borrado-backups-generados-por-tareas-de-consolas' into 'develop'
Missed tables

See merge request artica/pandorafms!4721
2022-03-15 10:09:32 +00:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop'
some tools for policy-auto-application

See merge request artica/pandorafms!4526
2022-03-01 12:53:36 +00:00
fbsanchez 32c5396dd3 cleaned files 2022-02-25 14:12:12 +01:00
fbsanchez 182fac98f1 Missed tables 2022-02-24 18:27:57 +01:00
alejandro.campos@artica.es c319c30e24 added new field to ipam vlan 2022-02-24 13:58:04 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop'
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
2022-02-24 09:55:40 +00:00
alejandro.campos@artica.es bf88c54480 added new field to ipam vlan 2022-02-24 09:35:12 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
Conflicts:
	pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
Daniel Barbero Martin 9dc7c77cb0 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-23 10:58:38 +01:00
Daniel Rodriguez 9f96c4e287 Merge branch 'ent-8551-cambio-nombre-fichero-migrate' into 'develop'
Moved migrate fielename

See merge request artica/pandorafms!4708
2022-02-23 08:25:09 +00:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
fbsanchez ef75a260d0 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server 2022-02-21 17:58:32 +01:00
fbsanchez 6bd5624a81 Moved migrate fielename 2022-02-21 10:41:43 +01:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
fbsanchez 261fbe0ba3 Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
2022-02-16 10:17:24 +01:00
fbsanchez bed223e27d latest changes 2022-02-14 11:04:01 +01:00
fbsanchez 9ba2eb0c74 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
Conflicts:
	pandora_console/extras/mr/52.sql
	pandora_console/pandoradb.sql
2022-02-10 18:52:51 +01:00
Daniel Rodriguez 8f59f4158f Merge branch 'ent-8435-11626-Vulnerabilidad-JQuery' into 'develop'
Ent 8435 11626 vulnerabilidad j query

See merge request artica/pandorafms!4683
2022-02-10 11:05:53 +00:00
fbsanchez 4a61efd7b6 added tpolicy_group_agents 2022-02-08 22:52:54 +01:00
Daniel Maya 816bbf4d00 #8435 Added jquery mobile 1.5 2022-02-07 12:29:57 +01:00
fbsanchez fcfb5e0d2a Schema, allow certain autoconfigurations being disabled on MC environments 2022-02-07 11:26:36 +01:00