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

18438 Commits

Author SHA1 Message Date
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
vgilc f662cba79c Merge branch 'ent-2807-falla-el-filtro-de-busqueda-de-groups-en-los-tree-view-que-no-son-el-de-grupos-2' into 'develop' 
Fixed search agentes and modules in others tree views

See merge request artica/pandorafms!1798
 2018-09-21 13:19:18 +02:00
fermin831 da3061651b Fixed search agentes and modules in others tree views 2018-09-21 13:01:40 +02:00
vgilc b68161c9ea Merge branch 'ent-2807-falla-el-filtro-de-busqueda-de-groups-en-los-tree-view-que-no-son-el-de-grupos' into 'develop' 
Fixed search group in others tree views

See merge request artica/pandorafms!1796
 2018-09-21 11:57:54 +02:00
fermin831 df660091ae Fixed search group in others tree views 2018-09-21 11:48:23 +02:00
fermin831 a097fdf5e6 Added recalculate counters when a status module is forced by console 2018-09-21 11:15:25 +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
vgilc ea19dae371 Merge branch 'fix-planned-downtime' into 'develop' 
monthly type of planned downtime is not executed at intended time.

See merge request artica/pandorafms!1792
 2018-09-21 08:36:06 +02:00
Junichi Satoh d4d978c9ad Fixed that monthly type of planned downtime is not executed at intended time. 
And fixed comments.
 2018-09-21 11:10:50 +09: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
vgilc 53a3e4373f Merge branch '1920_Informe_de_alertas_4' into 'develop' 
Fixed reports in alert module reports when module is empty

See merge request artica/pandorafms!1787
 2018-09-20 16:02:14 +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
daniel 26c08d9309 refactoriced view module_groups 2018-09-20 15:51:36 +02:00
samucarc 0ccb059e36 Fixed reports in alert module reports when module is empty 2018-09-20 15:50:45 +02:00
danielmaya a0a4a7fefb Added check permissions in ldap login 2018-09-20 11:21:29 +02:00
artica dcb3d7d7b9 Auto-updated build strings. 2018-09-20 00:01:25 +02:00
fermin831 e318d9539c Added favourite services configuration tokens 2018-09-19 16:56:58 +02:00
vgilc daf48c3798 Merge branch '2078-ue-cmdb-integration' into 'develop' 
2078 ue cmdb integration

See merge request artica/pandorafms!1678
 2018-09-19 11:37:20 +02:00
fbsanchez 401583e605 Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-19 11:13:54 +02:00
fbsanchez 3705b59c32 Merge branch '2078-ue-cmdb-integration' of brutus.artica.lan:artica/pandorafms into 2078-ue-cmdb-integration 2018-09-19 11:07:13 +02:00
fbsanchez b647bf38fc Merge remote-tracking branch 'origin/develop' into 2078-ue-cmdb-integration 2018-09-19 11:05:38 +02:00
artica 687a742746 Auto-updated build strings. 2018-09-19 00:01:28 +02:00
fermin831 8979890964 Added is_favourite to tservice table 2018-09-18 19:05:20 +02:00
fermin831 8196ed21df New mr 21.sql commit 2018-09-18 18:55:53 +02:00
artica bcfda72269 Updated version and build strings. 2018-09-18 16:39:44 +02:00
vgilc ae37205388 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Bugfixes

See merge request artica/pandorafms!1780
 2018-09-18 16:08:48 +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
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