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

18405 Commits

Author SHA1 Message Date
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
vgilc 4a3e5ab7ef Merge branch 'fix/pandora_enterprise#6485' into 'develop' 
Add local (as opposed to UTC) timestamps to data.

See merge request artica/pandorafms!1778
 2018-09-18 12:58:52 +02:00
Ramon Novoa 51533ced5b Add local (as opposed to UTC) timestamps to data. 
Ref pandora_enterprise#2775
 2018-09-18 12:21:19 +02:00
danielmaya 6cf638a4d8 Fixed max_value report 2018-09-18 12:18:47 +02:00
vgilc 567cf3fe7f Merge branch '2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487' into 'develop' 
Modified trecon_task table

See merge request artica/pandorafms!1765
 2018-09-18 11:27:07 +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
vgilc 2f3be02884 Merge branch '2776-Metaconsola_informes_event_report_module_fallan_porque_no_coje_bien_el_nombre_del_agente' into 'develop' 
fixed error in metaconsole reports module events

See merge request artica/pandorafms!1776
 2018-09-18 10:50:50 +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
vgilc 3a15c5844d Merge branch '2742-Cambiar_vista_manage_agent_group_tree' into 'develop' 
add new tree view edition group

See merge request artica/pandorafms!1773
 2018-09-18 09:49:24 +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
alejandro-campos 6d28b386d1 changed styles for system group status widget 2018-09-17 18:56:38 +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
fermin831 0d164fc3e0 Removed unwanted trace 2018-09-17 16:38:02 +02:00
vgilc 884c0deb3f Merge branch '1979-5352-plugin-de-monitorizacion-log-apache-dev' into 'develop' 
1979 5352 plugin de monitorizacion log apache dev

See merge request artica/pandorafms!1769
 2018-09-17 15:04:44 +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
fermin831 146dab5caa Added SNMP v1, v2, v2c and v3 to Network Sweep recon 2018-09-17 14:36:52 +02:00
Alejandro Gallardo Escobar 5f732d035b Now the integer numbers of the Y axis of the realtime graphs are shorter 2018-09-17 13:13:10 +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
fbsanchez 75cb3c9229 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-14 09:20:48 +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
fbsanchez 33f3bb57e6 Minor fixes 2018-09-13 20:36:20 +02:00
alejandro-campos 89a4e3667f Added styles for new widget system group status 2018-09-13 19:08:45 +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
vgilc c2b5133ff2 Merge branch '2742-Cambiar_vista_manage_agent_group' into 'develop' 
fixed view manage groups

See merge request artica/pandorafms!1761
 2018-09-13 16:44:05 +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
vgilc b39b876cb2 Merge branch 'ent-2353-seguridad-6' into 'develop' 
Generate session csrf code to avoid attacks in user edition

See merge request artica/pandorafms!1759
 2018-09-13 15:43:13 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
vgilc 87d1bdd29d Merge branch 'ent-2351-seguridad-4' into 'develop' 
Added .htaccess to avoid external access to attachment files

See merge request artica/pandorafms!1758
 2018-09-13 08:35:20 +02:00
artica 583a7475e4 Auto-updated build strings. 2018-09-13 00:01:26 +02:00