Commit Graph

18308 Commits

Author SHA1 Message Date
vgilc 6a6bae10b1 Merge branch 'ent-2782-ue-agente-software-en-modo-standby' into 'develop'
Ent 2782 ue agente software en modo standby

See merge request artica/pandorafms!1800
2018-09-28 10:04:12 +02:00
vgilc ddd799c926 Merge branch '2579-version-open-enterprise-borrado-de-modulo' into 'develop'
added redirection after module deletion on agent modules view

See merge request artica/pandorafms!1663
2018-09-28 10:01:57 +02:00
vgilc 2fe350ed75 Merge branch '2816-Reports-de-custom-graphs-no-funcionan-si-le-ponemos-un-nombre-a-la-custom-graph' into 'develop'
fixed bug: reporting of custom graphs not showing graph when graph name is empty

See merge request artica/pandorafms!1809
2018-09-28 09:58:11 +02:00
artica 1a60aee7a6 Auto-updated build strings. 2018-09-28 00:01:25 +02:00
fbsanchez bbfec2b763 htaccess. Allow connections from localhost to pandora_console/attachment 2018-09-27 16:21:06 +02:00
artica 79961b91d0 Auto-updated build strings. 2018-09-27 00:01:24 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
fermin831 8fe3e1606f Fixed string (avoiding macaronic English) 2018-09-26 10:50:16 +02:00
fermin831 24b980dbd7 Added dependency IO::Compress::Zip to centos agent 2018-09-26 10:44:00 +02:00
artica 643da5c993 Auto-updated build strings. 2018-09-26 00:01:28 +02:00
alejandro-campos 24de9d9119 fixed bug: reporting of custom graphs not showing graph when graph name is empty 2018-09-25 17:33:29 +02:00
fermin831 90bbd31b66 Added tip to disabled radiobutton in agent edition and massive operations 2018-09-25 16:00:37 +02:00
fermin831 22b46e41f1 Added standby mode on disabled token of API function set update_agent 2018-09-25 15:59:33 +02:00
alejandro-campos 2bae8a0c54 new parameter has been passed in to check whether or not we are at a public console when obtaining url of child console 2018-09-25 13:58:19 +02:00
fermin831 87fa7a7125 Added --set_disabled_and_standby to CLI 2018-09-25 13:42:29 +02:00
vgilc 1f0feebd1a Merge branch '2324-Error-en-servidor-de-Pandora-FMS-dev' into 'develop'
Update mr and current package

See merge request artica/pandorafms!1807
2018-09-25 13:41:43 +02:00
danielmaya 02f1e4a83a Update mr and current package 2018-09-25 13:37:47 +02:00
vgilc 92381141b9 Merge branch '1979-5352-plugin-de-monitorizacion-log-apache-dev' into 'develop'
Added help_log_viewer

See merge request artica/pandorafms!1805
2018-09-25 08:31:02 +02:00
artica f280e54738 Auto-updated build strings. 2018-09-25 00:01:26 +02:00
danielmaya 97a5f5ba97 Added help_log_viewer 2018-09-24 17:58:23 +02:00
fermin831 823b32ac63 Added update standby token in massive operations 2018-09-24 17:32:58 +02:00
fermin831 9cf578e1f6 Update configuration files when disabled is modified on agents editing 2018-09-24 16:54:53 +02:00
fermin831 a0da08e1aa Added standby mode on windows agent 2018-09-24 13:13:12 +02:00
fermin831 ee51114fe8 Added standby mode on unix agent 2018-09-24 11:20:47 +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
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
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
artica bcfda72269 Updated version and build strings. 2018-09-18 16:39:44 +02:00