Commit Graph

20294 Commits

Author SHA1 Message Date
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop'
fixed bad module id reference

See merge request artica/pandorafms!3505
2020-12-01 11:55:56 +01:00
artica e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
Daniel Rodriguez f861744229 Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop'
SQL query do not need to be cleaned

Closes pandora_enterprise#6422

See merge request artica/pandorafms!3496
2020-11-30 17:26:15 +01:00
Daniel Rodriguez ec91ea7387 Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop'
Report macros now apply on showing report

See merge request artica/pandorafms!3460
2020-11-30 17:25:22 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez 64509df179 Merge branch 'ent-6536-servicios-item-tipo-agente-desconocido-en-mapa-de-servicio' into 'develop'
Ent 6536 servicios item tipo agente desconocido en mapa de servicio

See merge request artica/pandorafms!3574
2020-11-30 14:29:43 +01:00
Daniel Rodriguez 3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop'
F2 feature

See merge request artica/pandorafms!3493
2020-11-30 14:28:03 +01:00
daniel ff37a43035 fix errors metaconsole, report group settings 2020-11-30 14:27:13 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
artica 863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica 9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica 66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
artica 935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
Daniel Rodriguez a5883da41c Merge branch 'ent-6396-10757-api-get-module_data-no-obtiene-los-rangos-indicados-no-db-historico' into 'develop'
uncompressing data before serving it api_get_module_data -absurd format kept-

See merge request artica/pandorafms!3575
2020-11-26 18:14:55 +01:00
marcos 1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
Daniel Rodriguez d08e60f13a Merge branch 'ent-6741-Vulnerabilidad-SQL-injection' into 'develop'
Fix vulnerability

Closes pandora_enterprise#6741

See merge request artica/pandorafms!3622
2020-11-26 18:07:20 +01:00
Daniel Rodriguez 69d9d04c20 Merge branch 'ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo' into 'develop'
Allow define time start greater than time end in weekly planed downtimes

See merge request artica/pandorafms!3511
2020-11-26 17:30:09 +01:00
Daniel Rodriguez d926251cf1 Merge branch 'ent-6226-links-eventos-servicios-metaconsola' into 'develop'
Solve issue

Closes pandora_enterprise#6226

See merge request artica/pandorafms!3612
2020-11-26 17:29:39 +01:00
Jose Gonzalez 8c26892e55 Allow add text 2020-11-26 16:58:02 +01:00
Jose Gonzalez fe7ad1471a Fix 2020-11-26 16:46:27 +01:00
marcos af863a45de updates 2020-11-26 16:25:21 +01:00
Jose Gonzalez df517d8720 Added lost sql files 2020-11-26 15:02:06 +01:00
Jose Gonzalez 7f2c00a4d6 Added lost sql files 2020-11-26 13:53:53 +01:00
Jose Gonzalez dbfe52e383 Fix issues with alert fields 2020-11-26 13:39:17 +01:00
fbsanchez df03b77b60 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 12:57:37 +01:00
fbsanchez 7fc32d3269 minor fix 2020-11-26 12:57:30 +01:00
Daniel Rodriguez 3dc551f1e5 Merge branch 'ent-6724-10965-No-se-puede-crear-agente-con-IP-duplicada-mediante-llamada-de-API-set-new-agent' into 'develop'
fixed agent creation with unique ip condition

See merge request artica/pandorafms!3604
2020-11-26 11:47:57 +01:00
fbsanchez 146f3b44d9 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 11:30:39 +01:00
fbsanchez 79b3f2d762 Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 2020-11-26 11:28:39 +01:00
fbsanchez 1121440943 Clean only recovered servers 2020-11-26 11:28:31 +01:00
marcos c824972c8c updates 2020-11-26 11:02:48 +01:00
artica f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
Marcos Alconada 1840378a5d add server name on agents list policies 2020-11-25 19:30:27 +01:00
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Fix

See merge request artica/pandorafms!3652
2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00
Jose Gonzalez da3bb9b808 Fix 2020-11-25 14:29:11 +01:00
Jose Gonzalez 5f9db9a896 Fix 2020-11-25 14:27:42 +01:00
marcos 5476c96941 update fix 2020-11-25 13:40:37 +01:00
Daniel Rodriguez b1fd90ae58 Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Ent 6542 agents alerts view fallos visuales

Closes pandora_enterprise#6542

See merge request artica/pandorafms!3594
2020-11-25 13:35:17 +01:00
marcos e3e9736fc5 show and hide 2020-11-25 13:07:38 +01:00
fbsanchez d18fffb0cb Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2020-11-25 12:07:53 +01:00
Jose Gonzalez 60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez 7984d9fcab Fix visual issue 2020-11-25 11:44:12 +01:00
Jose Gonzalez 912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
marcos 06475d21ce Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 11:08:09 +01:00
marcos 73f931d516 show and hide 2fa swtich 2020-11-25 10:50:06 +01:00
Marcos Alconada 481dd07e1b requiered subject on create news 2020-11-25 10:38:38 +01:00
Daniel Rodriguez 80b60d101c Merge branch 'ent-6157-Fallos-en-servicios-dinamicos' into 'develop'
Added new js file

Closes pandora_enterprise#6157

See merge request artica/pandorafms!3635
2020-11-25 10:35:47 +01:00
marcos 51322b48d7 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 09:31:14 +01:00