Commit Graph

2829 Commits

Author SHA1 Message Date
artica f4ef0110b2 Auto-updated build strings. 2018-06-27 00:01:31 +02:00
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 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
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
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
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 aa6d931331 [Rebranding] Modified server source events by generic monitoring_event 2018-05-29 17:10:05 +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
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
nknsh 4a58b8cb7d I fixed the bug about async_recovery.
When the async module recovers automatically, known_status and last_known_status are updated to 0.
2018-05-23 13:49:14 +09:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
fbsanchez ef778f296c PluginTools Added get_value_translated 2018-05-22 17:18:11 +02:00
fbsanchez a5be501f4d Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-22 11:41:29 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
fbsanchez a82299f1cf PluginTools minor changes
API cluster minor changes
2018-05-21 18:08:36 +02:00
Ramon Novoa 8bda3751df Improvements to the Pandora FMS Recon Server.
- Ignore virtual interfaces.
- Improved scan of ARP caches.
2018-05-21 15:03:54 +02:00
fbsanchez 2ab45d28b8 Added api_get_agent_id (API) updated plugintools 2018-05-21 14:42:27 +02:00
fbsanchez 9d1872b2d1 Minor fix in plugintools api_methods 2018-05-21 11:10:05 +02:00
artica dff20a609b Auto-updated build strings. 2018-05-21 00:01:23 +02:00
artica 4a6859aeae Auto-updated build strings. 2018-05-20 00:01:22 +02:00
artica b7ce2f2dc8 Auto-updated build strings. 2018-05-19 00:01:38 +02:00
artica f3509d285a Auto-updated build strings. 2018-05-18 00:01:28 +02:00
fermin831 cc26124289 Rebranding open server 2018-05-17 16:12:44 +02:00
artica a79f3b2d05 Auto-updated build strings. 2018-05-17 00:01:23 +02:00
artica 5f8e010d01 Auto-updated build strings. 2018-05-16 00:01:21 +02:00
artica 007715fb93 Auto-updated build strings. 2018-05-15 00:01:26 +02:00
artica 3e8f9cbb34 Auto-updated build strings. 2018-05-14 00:01:23 +02:00
artica d63f316042 Auto-updated build strings. 2018-05-13 00:02:13 +02:00
artica 65f9fe1cb7 Auto-updated build strings. 2018-05-11 00:01:26 +02:00
artica e9d8af152d Auto-updated build strings. 2018-05-10 00:01:25 +02:00
artica 04e3d3071d Auto-updated build strings. 2018-05-09 00:01:23 +02:00
artica 3377ecfd64 Auto-updated build strings. 2018-05-08 00:01:23 +02:00
artica e0cf024990 Auto-updated build strings. 2018-05-07 00:01:21 +02:00
artica 6dd28d2d75 Auto-updated build strings. 2018-05-06 00:01:21 +02:00
artica b92d9c9560 Auto-updated build strings. 2018-05-05 00:01:23 +02:00
artica 770267d72e Auto-updated build strings. 2018-05-04 00:01:21 +02:00
artica ab1ca78340 Auto-updated build strings. 2018-05-02 00:01:34 +02:00
artica d6a7ca198d Auto-updated build strings. 2018-05-01 00:01:23 +02:00
artica 235f20ef86 Auto-updated build strings. 2018-04-30 00:01:56 +02:00
artica 9b1d62f999 Auto-updated build strings. 2018-04-29 00:02:00 +02:00
artica a1fa3a4ee8 Auto-updated build strings. 2018-04-28 00:01:34 +02:00
artica 7252b8f172 Auto-updated build strings. 2018-04-27 00:01:31 +02:00
artica edacc90226 Auto-updated build strings. 2018-04-26 00:01:26 +02:00
artica ec61441587 Auto-updated build strings. 2018-04-25 00:01:32 +02:00
artica de2b583583 Auto-updated build strings. 2018-04-24 00:01:30 +02:00
artica d90c78ad9d Auto-updated build strings. 2018-04-23 00:01:25 +02:00
artica 1dc4b4554a Auto-updated build strings. 2018-04-22 00:01:25 +02:00
artica 1cf7efb86b Auto-updated build strings. 2018-04-21 00:01:35 +02:00
artica 235c1cee6c Auto-updated build strings. 2018-04-20 00:01:27 +02:00
artica 418d8b12b7 Updated version and build strings. 2018-04-19 16:05:39 +02:00
artica ee0d890361 Auto-updated build strings. 2018-04-19 00:01:25 +02:00
artica 3c8914a331 Auto-updated build strings. 2018-04-18 00:01:29 +02:00
artica bc251e58df Auto-updated build strings. 2018-04-17 00:01:28 +02:00
artica cb5c3016dc Auto-updated build strings. 2018-04-16 00:01:23 +02:00
artica 2ab79ce5e4 Auto-updated build strings. 2018-04-15 00:01:24 +02:00
artica 738b1fdd68 Auto-updated build strings. 2018-04-14 00:01:27 +02:00
artica 9f2aa451fb Auto-updated build strings. 2018-04-13 00:01:25 +02:00
artica 92fb527ff8 Auto-updated build strings. 2018-04-12 00:01:23 +02:00
artica 1ecfd4669e Auto-updated build strings. 2018-04-11 00:01:26 +02:00
artica a67a4288a1 Updated version and build strings. 2018-04-10 10:18:25 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios
Conflicts:
	pandora_console/include/class/Tree.class.php
2018-04-10 09:29:14 +02:00
artica e2b52a76f7 Auto-updated build strings. 2018-04-10 00:01:23 +02:00
artica 6bf0371a85 Auto-updated build strings. 2018-04-09 00:01:22 +02:00
artica 77f26cf08f Auto-updated build strings. 2018-04-08 00:01:21 +02:00
artica dcd57a421a Auto-updated build strings. 2018-04-07 00:01:33 +02:00
artica f517edca1c Auto-updated build strings. 2018-04-06 00:01:25 +02:00
artica 4b36d86e48 Auto-updated build strings. 2018-04-05 00:01:24 +02:00
fermin831 d0c34e2ce7 [Secondary groups] Added secondary groups to linux agent and server 2018-04-04 16:05:18 +02:00
vgilc c4aa6141e4 Merge branch '1801-migrado-cambios-jmx' into 'develop'
1801 migrado cambios jmx

See merge request artica/pandorafms!1408
2018-04-04 15:22:58 +02:00
artica f863184454 Auto-updated build strings. 2018-04-04 00:01:24 +02:00
fbsanchez 8a4ee8f28d PluginTools pseudo control for as_agent/server_plugin 2018-04-03 18:22:38 +02:00
fbsanchez 7c202cbb81 PluginTools minor fix in log message 2018-04-03 17:14:11 +02:00
fbsanchez 63e644d88a Minor fix 2018-04-03 17:12:31 +02:00
fermin831 e2d61d5794 [Secondary groups] Added update cache on server 2018-04-03 15:36:33 +02:00
fbsanchez 2380a18c6d Minor changes in PluginTools for 1801 2018-04-03 09:46:44 +02:00
artica 337822a608 Auto-updated build strings. 2018-04-03 00:01:22 +02:00
artica 1ab18d6c2d Auto-updated build strings. 2018-04-02 00:01:21 +02:00
artica 4e5d2477ac Auto-updated build strings. 2018-04-01 00:01:22 +02:00
artica 727b69462a Auto-updated build strings. 2018-03-31 00:01:21 +02:00
artica 7976e0461f Auto-updated build strings. 2018-03-30 00:01:21 +02:00
artica 9ea7dc0dbb Auto-updated build strings. 2018-03-29 00:01:22 +02:00
artica 94936a46e9 Auto-updated build strings. 2018-03-28 00:01:22 +02:00
artica ac2638ceea Auto-updated build strings. 2018-03-27 00:01:22 +02:00
artica 999edad737 Auto-updated build strings. 2018-03-26 00:01:20 +02:00
artica b2ed2fbe45 Auto-updated build strings. 2018-03-25 00:01:20 +01:00
artica c91e71569c Auto-updated build strings. 2018-03-24 00:01:24 +01:00
artica dd59704729 Auto-updated build strings. 2018-03-23 00:01:21 +01:00
artica 243e24e56e Auto-updated build strings. 2018-03-22 00:01:23 +01:00
artica 199b81a79c Auto-updated build strings. 2018-03-21 00:01:22 +01:00
artica 972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +01:00
artica 25efa085ce Auto-updated build strings. 2018-03-19 00:01:29 +01:00
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 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
vgilc 913e140d03 Merge branch 'ent-1929-error-en-los-logs-de-Plugin-server' into 'develop'
[Server Plugins] Modified malformed log on error

See merge request artica/pandorafms!1306
2018-02-26 10:35:13 +01:00
vgilc ccc17c79ac Merge branch 'ent-1718-module_crontab-Agente-software' into 'develop'
Ent 1718 module crontab agente software

See merge request artica/pandorafms!1311
2018-02-26 10:21:46 +01:00
artica 4b9dd69a0f Auto-updated build strings. 2018-02-26 00:01:52 +01:00
artica 6eb5f20d17 Auto-updated build strings. 2018-02-25 00:02:06 +01:00
artica 4dae0c97c0 Auto-updated build strings. 2018-02-24 00:01:59 +01:00
artica effe16a275 Auto-updated build strings. 2018-02-23 00:01:27 +01:00
artica e752e26ee3 Auto-updated build strings. 2018-02-22 00:01:52 +01:00
fermin831 cedf825526 [Server] [Linux Agent] Added cron_interval to modules XML to avoid cron blocked modules go to unknown 2018-02-20 18:31:08 +01:00
artica cc088314b8 Auto-updated build strings. 2018-02-20 00:01:14 +01:00
fermin831 6de87f7ce7 [Server Plugins] Modified malformed log on error 2018-02-19 17:30:32 +01:00
artica 87ffae2d88 Auto-updated build strings. 2018-02-19 00:01:12 +01:00
artica fe1b911f02 Auto-updated build strings. 2018-02-18 00:01:12 +01:00
artica 5e6bcd34d8 Auto-updated build strings. 2018-02-17 00:01:14 +01:00
artica 12ef611493 Auto-updated build strings. 2018-02-16 00:01:13 +01:00
artica d90c6ef778 Auto-updated build strings. 2018-02-15 00:01:13 +01:00
vgilc 3af0e812c2 Merge branch '1913-CDE-Tools' into 'develop'
Exception control added to safe_input and safe_output

See merge request artica/pandorafms!1293
2018-02-14 08:48:40 +01:00
artica 4fbf0820a4 Auto-updated build strings. 2018-02-14 00:01:13 +01:00
artica 77392c70fc Updated version and build strings. 2018-02-13 11:51:11 +01:00
fbsanchez cc27e63773 Exception control added to safe_input and safe_output 2018-02-13 10:59:00 +01:00
vgilc 4eafda8b15 Merge branch '1853-Modulos-DISABLED-en-critical-dev' into 'develop'
Fixed disabled agent in bulk operations

See merge request artica/pandorafms!1292
2018-02-13 09:35:39 +01:00