Commit Graph

3644 Commits

Author SHA1 Message Date
artica b1b486143f Auto-updated build strings. 2018-06-26 00:01:30 +02:00
artica 17e5c39a67 Auto-updated build strings. 2018-06-25 00:01:24 +02:00
artica 5d4a4eebc4 Auto-updated build strings. 2018-06-24 00:01:25 +02:00
artica b467eea16b Auto-updated build strings. 2018-06-23 00:01:25 +02:00
artica 0a61a5f5d3 Auto-updated build strings. 2018-06-22 00:01:24 +02:00
artica f40e3883ec Auto-updated build strings. 2018-06-21 00:01:26 +02:00
artica c97530a4ee Updated version and build strings. 2018-06-20 15:19:39 +02:00
artica 2c6ad942cb Auto-updated build strings. 2018-06-20 00:01:24 +02:00
fbsanchez f7522fcf3f Allowed https connections with consoles with self-signed certificates 2018-06-19 16:48:04 +02:00
Ramon Novoa ad687b3823 Added HA config parameters to pandora_server.conf. 2018-06-19 12:20:02 +02:00
nramon 2071568b16 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop'
Functionalities added - docker swarm

See merge request artica/pandorafms!1547
2018-06-19 11:33:07 +02:00
artica 8d39712be4 Auto-updated build strings. 2018-06-19 00:01:25 +02:00
fbsanchez 8e2c5bf5cb Functionalities added - docker swarm 2018-06-18 20:47:58 +02:00
artica b29dd4eb8a Auto-updated build strings. 2018-06-18 00:01:21 +02:00
artica a47f7b7e97 Auto-updated build strings. 2018-06-17 00:01:21 +02:00
artica 2926c7789e Auto-updated build strings. 2018-06-16 00:01:21 +02:00
artica 76bc8ad280 Auto-updated build strings. 2018-06-15 00:01:24 +02:00
artica d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
artica 7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
fermin831 27700d820e Added trace with module id to tcp network server checks 2018-06-12 16:09:04 +02:00
artica 5574ddd205 Auto-updated build strings. 2018-06-12 00:01:39 +02:00
artica 10e95bf447 Auto-updated build strings. 2018-06-10 00:01:23 +02:00
artica 14dd0e222b Auto-updated build strings. 2018-06-09 00:01:27 +02:00
artica 937cfb7d1e Auto-updated build strings. 2018-06-08 00:01:27 +02:00
artica 18e047d25e Auto-updated build strings. 2018-06-07 00:01:25 +02:00
artica 3fbdd3d026 Auto-updated build strings. 2018-06-06 00:01:25 +02:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop'
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
2018-06-04 10:19:56 +02:00
vgilc e0f5fae11a Merge branch 'pandora_enterprise#2274-mejoras-recon-onenet' into 'develop'
Improvements to the Pandora FMS Recon Server.

See merge request artica/pandorafms!1485
2018-06-04 10:18:18 +02:00
vgilc d8b219802c Merge branch 'ent-1068-permisos-por-defecto-apache-var-log-pandora' into 'develop'
Fixed permissions in default log folders

See merge request artica/pandorafms!1510
2018-06-04 10:17:43 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
artica ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
fermin831 9561feaf5c Fixed permissions in default log folders 2018-05-31 20:16:09 +02:00
artica e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
fermin831 5c6e22c9b6 [Rebranding] Remove delete environment vars and fixed pandora_db redefinitions 2018-05-30 11:08:48 +02:00
artica 7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
fermin831 0a2c744ef0 [Rebranding] Modified daemon to load environment vars 2018-05-29 17:32:24 +02:00
fermin831 aa6d931331 [Rebranding] Modified server source events by generic monitoring_event 2018-05-29 17:10:05 +02:00
fermin831 53cbc4ebde [Rebranding] Fixed missing include in pandora_db 2018-05-29 16:50:30 +02:00
artica aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
vgilc 8cb5dea3d9 Merge branch '194-async-recovery' into 'develop'
I fixed the bug about async_recovery.

Closes #194

See merge request artica/pandorafms!1493
2018-05-28 12:50:28 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
fermin831 7afc617e62 [Rebranding] Implemented server rebranding through environment vars 2018-05-25 12:39:30 +02:00