3773 Commits

Author SHA1 Message Date
artica
c4ddcc9332 Auto-updated build strings. 2018-03-18 00:01:21 +01:00
artica
ea5ef0bc42 Auto-updated build strings. 2018-03-17 00:01:23 +01:00
artica
a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
vgilc
c0cc6bbb5e Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop'
Added missing constants for two servers.

See merge request artica/pandorafms!1373
2018-03-15 12:50:11 +01:00
Ramon Novoa
9bdc23077c Added missing constants for two servers. 2018-03-15 12:41:30 +01:00
artica
270a43fbeb Auto-updated build strings. 2018-03-15 00:01:23 +01:00
vgilc
387280e97f Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop'
1873 autoprovisionamiento de agentes

See merge request artica/pandorafms!1342
2018-03-14 09:12:07 +01:00
artica
fb56ebfbff Auto-updated build strings. 2018-03-14 00:01:25 +01:00
Ramon Novoa
42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa
21f8194f0d Add a new agent provisioning server (enterprise). 2018-03-13 17:52:34 +01:00
Ramon Novoa
b63a1c4ce8 Remove debugging messages. 2018-03-13 17:52:34 +01:00
vgilc
8af4272152 Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop'
1923 migrar agentes desde metaconsola

See merge request artica/pandorafms!1364
2018-03-13 17:47:52 +01:00
fbsanchez
a6c5a0b046 Moved MigrationServer to enterprise servers load 2018-03-13 17:26:44 +01:00
fbsanchez
ed282c6a9b 1923 Added required methods for migrationserver 2018-03-13 16:35:13 +01:00
daniel
a3dceac0a0 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-13 16:00:44 +01:00
fermin831
e03ad1a1bf [Server] Fixed undefined module_interval 2018-03-13 13:03:44 +01:00
artica
af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica
24ff4014ff Auto-updated build strings. 2018-03-13 00:01:27 +01:00
fbsanchez
7d58734ef2 MigrationServer aux util 2018-03-12 19:39:28 +01:00
fbsanchez
4566aee4e1 Fixed duplicate definition $rs 2018-03-12 13:47:57 +01:00
artica
a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica
6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica
4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
artica
5a13db5a18 Auto-updated build strings. 2018-03-09 00:01:42 +01:00
artica
f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
vgilc
ff8051b433 Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias' into 'develop'
Added get_agent as unified function

See merge request artica/pandorafms!1355
2018-03-08 10:08:28 +01:00
artica
05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica
89da7843ee Auto-updated build strings. 2018-03-08 00:01:34 +01:00
fbsanchez
5450c682a9 Added get_agent as unified function
It unifies:
- get_agent_from_alias
- get_agent_from_addr
- get_agent_from_name
2018-03-07 16:56:35 +01:00
artica
a0eff331c5 Auto-updated build strings. 2018-03-07 00:01:39 +01:00
vgilc
9588ddeb1b Merge branch 'ent-2014-5152-autovalidacion-automatica-de-eventos-en-metaconsola-sin-tener-que-validarse' into 'develop'
[Server] Fixed event creation from alert server (use id_template_module instead id_template)

See merge request artica/pandorafms!1344
2018-03-06 11:10:25 +01:00
artica
98b2aa2c8e Auto-updated build strings. 2018-03-06 00:01:36 +01:00
fermin831
79f65b43ff [Server] Fixed event creation from alert server (use id_template_module instead id_template) 2018-03-05 18:06:42 +01:00
vgilc
7ee1fbf1d8 Merge branch '1802-comision-europea-mejoras-plugin-mysql' into 'develop'
Minor fixes and new methods

See merge request artica/pandorafms!1330
2018-03-05 17:00:02 +01:00
fbsanchez
22192e6890 PluginTools Minor fixes 2018-03-05 16:43:18 +01:00
fbsanchez
19ddaeb799 Plugin Tools added get_address, some fixes and default values 2018-03-05 14:27:51 +01:00
artica
a01d65fb89 Auto-updated build strings. 2018-03-05 00:01:32 +01:00
artica
5db4a03117 Auto-updated build strings. 2018-03-04 00:01:30 +01:00
artica
a3c3b1c699 Auto-updated build strings. 2018-03-03 00:01:43 +01:00
fbsanchez
f85ee5d508 PluginTools: fixed a issue parsing configuration files 2018-03-02 14:21:01 +01:00
fbsanchez
b9bd02c7d5 PluginTools: Forwarded pfile to parse_configuration custom evals 2018-03-02 09:09:54 +01:00
artica
6f04665c72 Auto-updated build strings. 2018-03-02 00:01:32 +01:00
fbsanchez
34ad5acffa PluginTools update
- Improved method documentation parse_configuration
- Added support to entity_detection parse_configuration
2018-03-01 18:02:43 +01:00
fbsanchez
9dcdbb8eca Minor fixes and new methods 2018-03-01 09:29:36 +01:00
artica
ddbe016266 Auto-updated build strings. 2018-03-01 00:01:47 +01:00
fermin831
3529bfaa5a [Server Pluginserver] Added alias to plugin server error 2018-02-28 14:11:26 +01:00
vgilc
e46a08bcb8 Merge branch 'ent-1930-5269-safe-mode-y-aplicacion-de-politicas-com1' into 'develop'
[Server Policies] Check autodisable mode when a policy is apllied

See merge request artica/pandorafms!1322
2018-02-28 10:33:54 +01:00
artica
789f908b08 Auto-updated build strings. 2018-02-28 00:01:39 +01:00
fermin831
3e56e93108 [Server Policies] Check autodisable mode when a policy is apllied 2018-02-27 15:04:18 +01:00
artica
892d17f65c Auto-updated build strings. 2018-02-27 00:02:10 +01:00