Commit Graph

3650 Commits

Author SHA1 Message Date
artica 395920f8eb Auto-updated build strings. 2020-01-29 00:01:09 +01:00
Daniel Rodriguez 914a796ce1 Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Changed pandora server start for control if is needed add parameters.

See merge request artica/pandorafms!3017
2020-01-28 13:41:42 +01:00
artica 71cc1f4951 Auto-updated build strings. 2020-01-28 00:01:07 +01:00
artica e35edd92b3 Auto-updated build strings. 2020-01-27 00:01:09 +01:00
artica 5dbb80287e Auto-updated build strings. 2020-01-26 00:01:10 +01:00
artica b4b1fbb3c1 Auto-updated build strings. 2020-01-25 00:01:10 +01:00
artica ea3a317a1b Auto-updated build strings. 2020-01-24 00:01:33 +01:00
artica 475517afd7 Auto-updated build strings. 2020-01-22 00:01:19 +01:00
artica 2a17065065 Auto-updated build strings. 2020-01-21 00:01:11 +01:00
artica ba1f0b96b4 Auto-updated build strings. 2020-01-20 00:01:08 +01:00
artica 8eb77fa6cc Auto-updated build strings. 2020-01-19 00:01:07 +01:00
artica 14de9f3c59 Auto-updated build strings. 2020-01-18 00:01:15 +01:00
Jose Gonzalez 867ae40b17 Changed pandora server start for control if is needed add parameters. Also, deleted default parameters 2020-01-17 22:58:45 +01:00
artica cf4362e433 Auto-updated build strings. 2020-01-17 00:01:10 +01:00
Alejandro Fraguas 4e1c3a72a8 Merge branch 'ent-5187-modulos-remote_cmd-no-funcionan' into 'develop'
Set default rcmd_timeout=10 and new rcmd_timeout_bin token

See merge request artica/pandorafms!2990
2020-01-16 19:16:20 +01:00
Alejandro Fraguas 2189709cf6 Merge branch 'ent-5240-9303-bloqueos-discovery' into 'develop'
Fixed method calls in Base.pm

See merge request artica/pandorafms!2996
2020-01-16 13:06:28 +01:00
artica 40f03e5682 Auto-updated build strings. 2020-01-16 00:01:08 +01:00
artica 6bf5d07a2c Auto-updated build strings. 2020-01-15 00:01:09 +01:00
artica 8038e16c25 Auto-updated build strings. 2020-01-14 00:01:11 +01:00
artica 2fa637ee4d Auto-updated build strings. 2020-01-13 00:01:08 +01:00
artica f7ea19863f Auto-updated build strings. 2020-01-12 00:01:08 +01:00
artica f4bc172355 Auto-updated build strings. 2020-01-11 00:01:09 +01:00
artica 467db373b7 Auto-updated build strings. 2020-01-10 00:01:55 +01:00
artica d8b97885a9 Auto-updated build strings. 2020-01-09 00:01:13 +01:00
artica 64e63dad63 Auto-updated build strings. 2020-01-08 00:01:15 +01:00
artica 6e6e7ba249 Auto-updated build strings. 2020-01-07 00:01:09 +01:00
artica ba9f6cd1a7 Auto-updated build strings. 2020-01-06 00:01:15 +01:00
artica 3f2884b282 Auto-updated build strings. 2020-01-05 00:01:08 +01:00
artica 9e5032e1e0 Auto-updated build strings. 2020-01-04 00:01:08 +01:00
fbsanchez 69be5aec24 Merge branch 'ent-5244-modulos-no-inicializan' into 'develop'
Fix perl date issue

See merge request artica/pandorafms!2997
2020-01-03 13:03:49 +01:00
artica e66b8ca4e3 Auto-updated build strings. 2020-01-03 00:01:13 +01:00
fbsanchez 2e5a771663 timelocal to strftime 2020-01-02 16:00:01 +01:00
fbsanchez 14a2da39b1 minor fix 2020-01-02 15:49:32 +01:00
fbsanchez dfca202dc4 Merge branch 'ent-5244-modulos-no-inicializan' of brutus.artica.es:artica/pandorafms into ent-5244-modulos-no-inicializan
Conflicts:
	pandora_server/lib/PandoraFMS/Core.pm
2020-01-02 15:47:00 +01:00
fbsanchez 70d51413c9 timelocal to strftime 2020-01-02 15:46:27 +01:00
fbsanchez fb3e395958 Fix perl date issue 2020-01-02 14:03:14 +01:00
fbsanchez a3fdf4007d Fixed method calls in Base.pm 2020-01-02 10:04:41 +01:00
artica 713737986b Auto-updated build strings. 2020-01-02 00:01:10 +01:00
artica d386d3c390 Auto-updated build strings. 2020-01-01 00:01:10 +01:00
artica 5b346c1ed9 Auto-updated build strings. 2019-12-31 00:01:11 +01:00
artica 287d377520 Auto-updated build strings. 2019-12-26 00:01:08 +01:00
artica 4294ec6d1b Auto-updated build strings. 2019-12-25 00:01:11 +01:00
Enrique Martin ea86205b36 Merge branch 'develop' into 'ent-5187-modulos-remote_cmd-no-funcionan'
Conflicts:
   pandora_server/conf/pandora_server.conf.new
2019-12-24 10:49:44 +01:00
Alejandro Fraguas 5c0636b074 Merge branch 'ent-5203-incluir-ssh_launcher-en-config-pm' into 'develop'
Added ssh_launcher settings to pandora_Server

See merge request artica/pandorafms!2979
2019-12-24 10:03:37 +01:00
artica d653b4d685 Auto-updated build strings. 2019-12-24 00:01:22 +01:00
Kike 0f34528f6f Set default rcmd_timeout=10 and new rcmd_timeout_bin token 2019-12-23 17:28:40 +01:00
artica cf8bf74cd4 Auto-updated build strings. 2019-12-23 00:01:17 +01:00
artica 59e91c0ed4 Auto-updated build strings. 2019-12-22 00:01:09 +01:00
artica df704997e3 Auto-updated build strings. 2019-12-21 00:01:24 +01:00
artica 45a8904578 Auto-updated build strings. 2019-12-20 00:01:10 +01:00