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

937 Commits

Author SHA1 Message Date
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 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
alejandro.campos@artica.es 8c8b5aee30 minor change 2021-11-29 16:34:32 +01:00
alejandro.campos@artica.es 73cde9ee48 db changes 2021-11-29 14:58:34 +01:00
fbsanchez 68c2400b9c fix 2021-11-29 10:32:54 +01:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
fbsanchez ba8087f49b ncm2 with schedules 2021-11-24 22:01:21 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
fbsanchez cbbfc337df errata fix 2021-11-23 14:33:59 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
fbsanchez 41dcc95d5a db changes 2021-11-23 14:26:11 +01:00
José González b8d884008b Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls' 
# Conflicts:
#   pandora_console/extras/mr/51.sql
 2021-11-22 11:44:06 +00:00
Jose Gonzalez 192237a452 Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls 2021-11-22 12:31:24 +01:00
fbsanchez 3e90bb6490 minor change 2021-11-19 11:53:59 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
Daniel Rodriguez c47c5e34f6 Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop' 
set deployment_timeout per agent installation file

See merge request artica/pandorafms!4516
 2021-11-18 16:34:12 +00:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
fbsanchez a96d5d68e3 MR updates for NCMv2 2021-11-10 17:13:17 +01:00
Daniel Barbero Martin 900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Daniel Barbero Martin ea747f25f3 Fix mr pandoradb migrate 2021-11-05 12:29:34 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez 08d4323941 set deployment_timeout per agent installation file 2021-11-02 17:37:47 +01:00
fbsanchez a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
fbsanchez 6c0e2d23de updates 2021-10-15 13:39:23 +02:00
fbsanchez 75949691f3 fix mr 2021-10-14 21:22:21 +02:00
fbsanchez 6a537e58f4 Fix 2021-10-14 21:09:14 +02:00
fbsanchez 79174d512d Added tncm_vendor and model to manage targetrs 2021-10-14 20:44:05 +02:00
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
Daniel Maya e986005cc0 #8090 Added auto_adjust in tlayout_template 2021-10-13 17:23:34 +02:00
fbsanchez d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
fbsanchez ef42348807 compat mysql 5.1 exceeded key 2021-10-08 16:02:06 +02:00