Commit Graph

13960 Commits

Author SHA1 Message Date
fermin831 9cf578e1f6 Update configuration files when disabled is modified on agents editing 2018-09-24 16:54:53 +02:00
artica 010207e6ad Auto-updated build strings. 2018-09-24 00:01:23 +02:00
artica bd0176070a Auto-updated build strings. 2018-09-23 00:01:23 +02:00
artica 25f91a451e Auto-updated build strings. 2018-09-22 00:01:24 +02:00
fermin831 da3061651b Fixed search agentes and modules in others tree views 2018-09-21 13:01:40 +02:00
fermin831 df660091ae Fixed search group in others tree views 2018-09-21 11:48:23 +02:00
vgilc ce2a21c70b Merge branch 'ent-2798-no-se-pueden-anadir-agentes-a-politicas-desde-la-meta' into 'develop'
Added some secondary groups checks to meta

See merge request artica/pandorafms!1790
2018-09-21 08:37:34 +02:00
artica fa05ecc477 Auto-updated build strings. 2018-09-21 00:01:24 +02:00
fermin831 48798d4af5 Added some secondary groups checks to meta 2018-09-20 17:59:12 +02:00
vgilc da6fe0ec6b Merge branch '000-tool_debug' into 'develop'
add new params html_debug for strig in one line and new alias hd

See merge request artica/pandorafms!1789
2018-09-20 16:07:16 +02:00
daniel 34bb73ac4b add new params html_debug for strig in one line and new alias hd 2018-09-20 16:00:08 +02:00
samucarc 0ccb059e36 Fixed reports in alert module reports when module is empty 2018-09-20 15:50:45 +02:00
artica dcb3d7d7b9 Auto-updated build strings. 2018-09-20 00:01:25 +02:00
artica 687a742746 Auto-updated build strings. 2018-09-19 00:01:28 +02:00
artica bcfda72269 Updated version and build strings. 2018-09-18 16:39:44 +02:00
Alejandro Gallardo Escobar 167cd67ece Bugfix 2018-09-18 15:44:55 +02:00
Alejandro Gallardo Escobar 2c88d33709 Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-18 15:35:56 +02:00
Alejandro Gallardo Escobar e5ff2b956c Bugfixes 2018-09-18 15:33:14 +02:00
vgilc bbb36fe6d8 Merge branch '1979-Informe-MAX-no-es-coherente-dev' into 'develop'
Fixed max_value report

See merge request artica/pandorafms!1777
2018-09-18 12:59:11 +02:00
danielmaya 6cf638a4d8 Fixed max_value report 2018-09-18 12:18:47 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
2018-09-18 11:17:47 +02:00
manuel.montes 40bf163fed Disabled vlan vhen SNMP version is v3 2018-09-18 11:03:30 +02:00
daniel 8f3a602097 fixed error in metaconsole reports module events 2018-09-18 10:38:42 +02:00
vgilc e0eb6a3eff Merge branch '1920_Informe_de_alertas_3' into 'develop'
Fixed minor error module/agent/group alert report

See merge request artica/pandorafms!1775
2018-09-18 10:15:50 +02:00
samucarc 7100aed448 Fixed minor error module/agent/group alert report 2018-09-18 10:09:11 +02:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
vgilc 9f0271c0b8 Merge branch '1920_Informe_de_alertas_2' into 'develop'
Fixed module/agent/group alert report

See merge request artica/pandorafms!1772
2018-09-18 08:37:03 +02:00
artica abc7e2cb3c Auto-updated build strings. 2018-09-18 00:01:27 +02:00
samucarc 8daca7d220 Fixed module/agent/group alert report 2018-09-17 18:57:29 +02:00
vgilc 14df5bafd7 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop'
Bugfix

See merge request artica/pandorafms!1771
2018-09-17 16:58:48 +02:00
Alejandro Gallardo Escobar 0fef339a13 Bugfix 2018-09-17 16:54:47 +02:00
vgilc 080cfb20ca Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev'
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2018-09-17 14:44:24 +02:00
manuel.montes cfec231107 Especified SNMP version in recon task 2018-09-17 12:48:08 +02:00
danielmaya 50a3e43bd4 Insert apache log model in tlog_graph_models 2018-09-17 12:43:51 +02:00
fermin831 c9af020d91 Remove unwanted git traces on 20.sql 2018-09-17 10:16:12 +02:00
artica 921a025262 Auto-updated build strings. 2018-09-17 00:01:24 +02:00
artica 4f6aff52c7 Auto-updated build strings. 2018-09-16 00:01:23 +02:00
artica 591db5001f Auto-updated build strings. 2018-09-15 00:01:24 +02:00
vgilc 59feccda72 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop'
Añadidos textos de ayuda

See merge request artica/pandorafms!1767
2018-09-14 11:52:59 +02:00
Alejandro Gallardo Escobar 1ac837a1b2 Improved the linked visual console status help 2018-09-14 11:40:28 +02:00
vgilc 2d1b9072ff Merge branch 'ent-2522-custom-fields-de-modulos-de-inventario-en-politicas' into 'develop'
Added columns for a policy feature

See merge request artica/pandorafms!1763
2018-09-14 10:54:39 +02:00
vgilc ddfb527668 Merge branch 'ent-2668-gis-visual-improvements' into 'develop'
Minor visual improvements for the GIS views

See merge request artica/pandorafms!1764
2018-09-14 08:24:32 +02:00
artica dff3fb7d0d Auto-updated build strings. 2018-09-14 00:01:27 +02:00
manuel.montes 19645f0550 Modified trecon_task table 2018-09-13 18:17:28 +02:00
Alejandro Gallardo Escobar e9752e790e Added columns for a policy feature 2018-09-13 16:57:13 +02:00
Alejandro Gallardo Escobar 8601e38eed Minor visual improvements for the GIS views 2018-09-13 16:38:17 +02:00
daniel 5d6f414d68 fixed view manage groups 2018-09-13 16:28:08 +02:00
vgilc d46cfab6db Merge branch 'ent-2301-fallo-mapas-de-red-consola-movil' into 'develop'
Removed Networkmaps on mobile console

See merge request artica/pandorafms!1760
2018-09-13 16:15:57 +02:00
artica c54f414a73 Updated version and build strings. 2018-09-13 15:53:21 +02:00
fermin831 1096319faf Removed Networkmaps on mobile console 2018-09-13 15:48:26 +02:00