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

972 Commits

Author SHA1 Message Date
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 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 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
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
Daniel Maya 182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
edu.corral 86a0847f2a ent 9398 fixed ip tmetaconsole_agent 2022-08-16 12:37:40 +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 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 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 Barbero Martin b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02: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
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02: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 93b9e6142e DB Changes #8912 2022-06-17 09:00:35 +02: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 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
Daniel Maya a5517a9c02 #9134 Added disabled 2022-06-09 15:12:05 +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 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
Daniel Maya 9f1be4531b #8587 Added sunburst 2022-04-12 17:24:47 +02:00
fbsanchez 686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor 
Conflicts:
	pandora_console/extras/mr/53.sql
 2022-04-07 09:44:12 +02:00
Daniel Barbero Martin c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
Daniel Rodriguez 71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop' 
implemented custom data filter in event view

See merge request artica/pandorafms!4787
 2022-04-04 10:38:30 +00:00
Daniel Barbero Martin 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 2d334f7860 Historical view for update manager 2022-03-30 14:41:47 +02:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
José González cc776ddbf7 Added enable console task feature 2022-03-23 11:47:34 +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
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
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
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
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' 
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
 2022-02-18 11:04:06 +00: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 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
 2022-02-15 17:32:10 +01:00
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
fbsanchez 4a61efd7b6 added tpolicy_group_agents 2022-02-08 22:52:54 +01:00
fbsanchez 6bb754d5d2 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-08 13:02:22 +01:00
fbsanchez fcfb5e0d2a Schema, allow certain autoconfigurations being disabled on MC environments 2022-02-07 11:26:36 +01:00
fbsanchez 83a9c0867c CHANGE UTF8 => UTF8MB4, isssues with old iamges 2022-02-02 14:17:44 +01:00
fbsanchez cea110e209 Alert server improved 2022-02-02 13:37:45 +01:00
fbsanchez 460052b25f code style 2022-02-02 12:32:33 +01:00
fbsanchez 53149712f5 code style 2022-02-02 12:30:02 +01:00
Calvo f1dca5e525 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-02 10:38:53 +01:00
Daniel Barbero Martin b91109d747 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-02 08:06:05 +01:00
fbsanchez 592df1c3a7 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 
Conflicts:
	pandora_console/pandoradb.sql
 2022-02-01 15:16:21 +01:00
fbsanchez ead8b39146 some updates 2022-02-01 15:11:59 +01:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
fbsanchez b15feab154 MySQL8 review for pandoradb.sql 2022-02-01 13:49:32 +01:00
Daniel Barbero Martin a7da2faa32 alert template schedule pandora_enterprise#3943 2022-02-01 13:16:11 +01:00
Calvo 34a9c2f1f2 Added token local user to allow enabling local auth at user level 2022-02-01 09:37:02 +01:00
Daniel Barbero Martin 15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
fbsanchez 46d995a983 Added index to service elements (modules) 2022-01-10 11:24:32 +01:00
Calvo 0bad3761a7 Fix db lock stopping policy apply 2021-12-16 10:26:45 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Barbero Martin b55679cbfd Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites 2021-12-10 08:18:46 +01:00
Daniel Barbero Martin b97ecda12b db changes 2021-12-09 16:19:05 +01:00
fbsanchez 5c25fa8406 mr updates and a pretty icon 2021-12-09 15:07:35 +01:00
fbsanchez 2cbfca2cdd mr rev + timap_sites 2021-12-09 13:51:20 +01:00
fbsanchez a94f6be37e force db_process_sql 2021-12-03 12:59:50 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-03 10:24:01 +01:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop' 
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
 2021-12-02 10:51:57 +00:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00