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

1401 Commits

Author SHA1 Message Date
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
fbsanchez 7b9790fa36 mig 6->7 alert_execution_Queue 2022-02-02 13:40:28 +01:00
fbsanchez cea110e209 Alert server improved 2022-02-02 13:37:45 +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
Calvo 293c1cfb3a Chaged to correct MR 2022-02-02 10:36:54 +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
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +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
Daniel Barbero Martin 3f9b5f0a8a fix mr and current package 2022-01-21 11:56:38 +01:00
Daniel Rodriguez c84a9a1634 Merge branch 'ent-7999-12427-introduccion-index-en-servicios' into 'develop' 
Added index to service elements (modules)

See merge request artica/pandorafms!4621
 2022-01-12 15:15:26 +00:00
fbsanchez 46d995a983 Added index to service elements (modules) 2022-01-10 11:24:32 +01:00
Jose Gonzalez 1e92ad99ad Fix merge 2022-01-05 11:14:04 +01:00
Jose Gonzalez 32a98ee5ae Regenerate DB Backup Manager 2022-01-05 11:08:49 +01:00
Daniel Rodriguez 02dfea8e58 Merge branch 'ent-8304-correccion-en-comportamiento-al-aplicar-politicas' into 'develop' 
Fix db lock stopping policy apply

See merge request artica/pandorafms!4589
 2021-12-27 12:46:17 +00:00
Daniel Rodriguez 16c35a000e Merge branch 'ent-8103-Metaconsole-vista-logs-auditoria' into 'develop' 
Updated audit logs view and added controller

Closes pandora_enterprise#8103

See merge request artica/pandorafms!4582
 2021-12-27 09:22:07 +00:00
fbsanchez 1053062f72 Update pandora_console/extras/mr/51.sql 2021-12-16 11:48:03 +00:00
Daniel Barbero Martin 935c7f6937 fixed MR 2021-12-16 11:45:42 +01:00
Calvo 0bad3761a7 Fix db lock stopping policy apply 2021-12-16 10:26:45 +01:00
Daniel Barbero Martin b4131431af fixed mr 2021-12-15 09:55:03 +01:00
Jose Gonzalez 4924e0d6bc Updated audit logs view and added controller 2021-12-14 12:06:20 +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 cb6184a943 mr fix 2021-12-09 14:02:06 +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
fbsanchez 00d79b553c missing in merge mr 2021-12-02 14:46:31 +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
Daniel Rodriguez 345cbcf5ba Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop' 
fix setup centraliced active directory

See merge request artica/pandorafms!4540
 2021-11-30 14:44:48 +00:00
Daniel Barbero Martin 347769299b outocreate remote user centralized node 2021-11-30 14:23:19 +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 3f395f03dc Added sql file 2021-11-22 12:33:31 +01: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 e3183d9e56 fix add file list delete files 2021-11-19 08:19:45 +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
Daniel Rodriguez c02c03df02 Merge branch 'ent-8099-Vulnerabilidad-JQuery-mobile' into 'develop' 
Ent 8099 vulnerabilidad j query mobile

See merge request artica/pandorafms!4498
 2021-11-15 11:13:07 +00: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
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin 53361484fd Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-03 11:16:46 +01:00
Daniel Barbero Martin c73ee2d113 updated mr and version 2021-11-03 11:04:19 +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
Daniel Maya 05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +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 796a7125e1 Errata fix 2021-10-21 14:33:44 +02:00
Calvo a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez 303d6632e1 NCM 2021-10-21 11:28:14 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
Calvo 9f71a9ba81 Fix mr 48 breaking tasks 2021-10-18 16:05:37 +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
fbsanchez fa35e6054c Fixes 2021-10-08 15:30:17 +02:00
fbsanchez 1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
fbsanchez 6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
fbsanchez b8dc85a0dd wip 2021-10-05 16:42:24 +02:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
fbsanchez e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
fbsanchez be95b5ffd0 updates 2021-10-01 13:56:21 +02:00
alejandro.campos@artica.es 277fcd51ca minor changes 2021-09-30 16:02:14 +02:00