Commit Graph

2306 Commits

Author SHA1 Message Date
artica faa96927dd Auto-updated build strings. 2017-05-25 00:01:12 +02:00
artica 42704e5981 Auto-updated build strings. 2017-05-24 00:01:10 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user'
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
2017-05-23 09:48:37 +02:00
artica eddeb12bcf Auto-updated build strings. 2017-05-23 00:01:18 +02:00
artica 3b6272a7d2 Auto-updated build strings. 2017-05-22 00:01:14 +02:00
artica 7d7d5a9cec Auto-updated build strings. 2017-05-21 00:01:52 +02:00
artica 7749e7c08a Auto-updated build strings. 2017-05-20 00:01:16 +02:00
artica 8d16f573cc Auto-updated build strings. 2017-05-19 00:01:19 +02:00
fermin831 4b05351df0 Fixed async issues in windows brokers 2017-05-18 11:55:44 +02:00
artica 15b65ef3f8 Auto-updated build strings. 2017-05-18 00:01:18 +02:00
vgilc cba6f13a3d Merge branch '770-Bug_module_max,_module_min_en_Windows_Server_2016' into 'develop'
The min, max limits for agent modules were exclusives, now are inclusives - #770

See merge request !445
2017-05-17 17:53:35 +02:00
vgilc fbe59fddc2 Merge branch '715-Nueva-feature--agent_alias_cmd-dev' into 'develop'
new feature: added agent_alias_cmd in pandora_agent

See merge request !373
2017-05-17 17:21:31 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
artica ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
artica 63cc6f5244 Auto-updated build strings. 2017-05-16 00:01:15 +02:00
artica 45239e4cdd Auto-updated build strings. 2017-05-15 00:01:14 +02:00
artica 31970c521d Auto-updated build strings. 2017-05-14 00:01:14 +02:00
artica afff44138c Auto-updated build strings. 2017-05-13 00:01:16 +02:00
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
artica 46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +02:00
artica 71f8f29107 Auto-updated build strings. 2017-05-10 00:01:15 +02:00
enriquecd f0ef304c38 The min, max limits for agent modules were exclusives, now are inclusives - #770 2017-05-09 13:32:18 +02:00
artica ce179c39aa Auto-updated build strings. 2017-05-09 00:01:18 +02:00
artica 3865f13f8f Auto-updated build strings. 2017-05-08 00:01:14 +02:00
artica 3935442574 Auto-updated build strings. 2017-05-07 00:01:14 +02:00
artica 2c56de48f8 Auto-updated build strings. 2017-05-06 00:01:15 +02:00
artica 02e1c6c8d2 Auto-updated build strings. 2017-05-05 00:01:17 +02:00
artica 96a13fe84c Auto-updated build strings. 2017-05-04 00:01:14 +02:00
artica 8b3102f29a Auto-updated build strings. 2017-05-03 00:01:14 +02:00
artica 026c498c46 Auto-updated build strings. 2017-05-02 00:01:14 +02:00
artica 186fc2422e Auto-updated build strings. 2017-05-01 00:01:14 +02:00
artica 17437c197f Auto-updated build strings. 2017-04-30 00:01:13 +02:00
artica 36dd55148a Auto-updated build strings. 2017-04-29 00:01:14 +02:00
artica 682b7938ab Auto-updated build strings. 2017-04-28 00:01:15 +02:00
artica 7493da21cc Auto-updated build strings. 2017-04-27 00:01:16 +02:00
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
artica d3f998b081 Auto-updated build strings. 2017-04-25 00:01:17 +02:00
artica e32d353cc2 Revert "Updated version and build strings."
This reverts commit 8c49cfffd7.
2017-04-24 15:59:34 +02:00
artica 8c49cfffd7 Updated version and build strings. 2017-04-24 15:39:47 +02:00
artica 0aa6835df7 Auto-updated build strings. 2017-04-24 00:01:12 +02:00
artica 37e1daca9f Auto-updated build strings. 2017-04-23 00:01:13 +02:00
artica 37fcc10551 Auto-updated build strings. 2017-04-22 00:01:56 +02:00
artica f6faa4861b Auto-updated build strings. 2017-04-21 00:01:18 +02:00
artica dd25cff4ec Auto-updated build strings. 2017-04-20 00:01:19 +02:00
artica 43993e1a14 Auto-updated build strings. 2017-04-19 00:01:21 +02:00
Arturo Gonzalez 1066124678 Merge branch 'develop' into 596-default_event_filter_by_user
Conflicts:
	pandora_agents/unix/DEBIAN/control
	pandora_agents/unix/DEBIAN/make_deb_package.sh
	pandora_agents/unix/pandora_agent
	pandora_agents/unix/pandora_agent.redhat.spec
	pandora_agents/unix/pandora_agent.spec
	pandora_agents/unix/pandora_agent_installer
	pandora_agents/win32/installer/pandora.mpi
	pandora_agents/win32/pandora.cc
	pandora_agents/win32/versioninfo.rc
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/extras/mr/1.sql
	pandora_console/include/config_process.php
	pandora_console/install.php
	pandora_console/pandora_console.redhat.spec
	pandora_console/pandora_console.spec
	pandora_server/DEBIAN/control
	pandora_server/DEBIAN/make_deb_package.sh
	pandora_server/lib/PandoraFMS/Config.pm
	pandora_server/pandora_server.redhat.spec
	pandora_server/pandora_server.spec
	pandora_server/pandora_server_installer
	pandora_server/util/pandora_db.pl
	pandora_server/util/pandora_manage.pl
2017-04-18 11:28:02 +02:00
artica e6a8f6afa2 Auto-updated build strings. 2017-04-18 00:01:21 +02:00
Daniel Maya 622edc1369 new feature: added agent_alias_cmd in pandora_agent 2017-04-17 12:50:46 +02:00
artica 9d0fde648a Auto-updated build strings. 2017-04-17 00:01:21 +02:00
artica 98f61b991a Auto-updated build strings. 2017-04-16 00:01:15 +02:00
artica 5f2884950d Auto-updated build strings. 2017-04-15 00:01:15 +02:00
artica 3dfdfad220 Auto-updated build strings. 2017-04-14 00:01:18 +02:00
artica f081f81569 Auto-updated build strings. 2017-04-13 00:01:18 +02:00
artica b3e1125526 Auto-updated build strings. 2017-04-12 00:01:17 +02:00
Ramon Novoa a2e42134f0 Do not crash if an interface does not have an IP address. 2017-04-11 18:10:46 +02:00
nramon fc5635381a Merge branch '116-Remote_config-did-not-work-at-Pandora-Agent-for-Windows' into 'develop'
Resolve "Remote_config did not work at Pandora Agent for Windows."

Closes #116

See merge request !357
2017-04-11 12:29:08 +02:00
Ramon Novoa e492ea0334 Fix a typo in ifaces.vbs. 2017-04-11 12:27:27 +02:00
artica ac738f682f Auto-updated build strings. 2017-04-11 00:01:17 +02:00
Hirofumi Kosaka ddf6919654 "agent_alias" could not work at Pandora Agent for Windows. #116 2017-04-10 18:27:34 +09:00
Hirofumi Kosaka ad05691e2d "remote_config" did not work at Pandora Agent for Windows. #116 2017-04-10 18:26:29 +09:00
artica ea6deaea04 Auto-updated build strings. 2017-04-10 08:54:41 +02:00
artica b3d6575176 Auto-updated build strings. 2017-04-10 00:01:18 +02:00
artica 20caf87fd5 Auto-updated build strings. 2017-04-09 00:01:19 +02:00
artica 16b0bc83a1 Auto-updated build strings. 2017-04-08 00:01:18 +02:00
artica 6b0d42c4a4 Auto-updated build strings. 2017-04-07 00:01:16 +02:00
artica 37142657a5 Auto-updated build strings. 2017-04-06 00:01:16 +02:00
artica d25dc0b13a Auto-updated build strings. 2017-04-05 00:01:20 +02:00
vgilc 09b9866b89 Merge branch '31-mostrar-espacio-en-descripcion-agente-windows-integria-4378' into 'develop'
Added disk free (in MB) in percent disk free native windows module

See merge request !263
2017-04-04 09:30:57 +02:00
artica 6039772b20 Auto-updated build strings. 2017-04-04 00:01:19 +02:00
artica b769531d16 Auto-updated build strings. 2017-04-03 00:01:17 +02:00
artica 6ca2d24786 Auto-updated build strings. 2017-04-02 00:01:18 +02:00
artica 1121f8ffc5 Auto-updated build strings. 2017-04-01 00:01:18 +02:00
artica 3d1bdc799e Auto-updated build strings. 2017-03-31 00:01:19 +02:00
artica da17532889 Auto-updated build strings. 2017-03-30 00:01:18 +02:00
artica a6a9f7eff4 Auto-updated build strings. 2017-03-29 00:01:21 +02:00
artica f81998b294 Auto-updated build strings. 2017-03-28 00:01:18 +02:00
artica 10b145463f Auto-updated build strings. 2017-03-27 00:01:16 +02:00
artica 149e8be750 Auto-updated build strings. 2017-03-26 00:01:17 +01:00
artica d1c4512977 Auto-updated build strings. 2017-03-25 00:01:19 +01:00
artica bac8b24853 Auto-updated build strings. 2017-03-24 00:01:21 +01:00
artica db7d154aa9 Auto-updated build strings. 2017-03-23 00:01:20 +01:00
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
fermin831 92af61ce83 Added disk free (in MB) in percent disk free native windows module 2017-03-15 16:26:59 +01:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
Daniel Maya 40562d56f2 Added alias in broker agents 2017-03-13 17:21:35 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
fermin abf4d88955 Added df_percent_used_op.vbs (op version) 2017-03-10 15:01:53 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01:00
artica 342bcbb4ef Auto-updated build strings. 2017-03-08 00:01:20 +01:00
artica 03741b62d9 Auto-updated build strings. 2017-03-07 00:01:16 +01:00
artica cf5ade4972 Auto-updated build strings. 2017-03-06 09:13:26 +01:00
Ramon Novoa bc47dac5b1 Revert pandora.mpi (it was messed up!) 2017-03-06 09:02:58 +01:00
artica 31556a20cc Auto-updated build strings. 2017-03-06 00:04:00 +01:00
artica b1995afb6e Auto-updated build strings. 2017-03-05 00:04:15 +01:00
artica 5e1b14a75a Auto-updated build strings. 2017-03-03 00:01:30 +01:00
artica 01784bd083 Auto-updated build strings. 2017-03-02 00:01:16 +01:00
artica 8ab66f6d64 Updated version and build strings for the NG BETA release. 2017-03-01 16:01:27 +01:00
artica 02332570de Revert "Updated version and build strings."
This reverts commit 8867a17baf.
2017-03-01 15:25:58 +01:00
artica 8867a17baf Updated version and build strings. 2017-03-01 15:25:30 +01:00
fermin831 b5a61c8d12 Permission changed agent and tarball installers 2017-03-01 14:58:28 +01:00
artica 8d092ef24d Auto-updated build strings. 2017-03-01 00:01:17 +01:00
Ramon Novoa 3b8c174b64 Fix some file permissions. 2017-02-28 15:46:20 +01:00
fermin831 3106b55fbd Removed unwanted windows agent traces 2017-02-28 15:06:35 +01:00
artica 19dcc729da Auto-updated build strings. 2017-02-28 00:01:17 +01:00
Ramon Novoa 2109fcc875 Update the Tentacle clients. 2017-02-27 16:15:05 +01:00
fermin831 e074b021f3 Solved no swap in pandora_mem_usage 2017-02-27 14:40:04 +01:00
fermin831 268cff6d55 Modified mem_percent_used win32 plugin 2017-02-27 14:40:04 +01:00
artica 163b061af0 Auto-updated build strings. 2017-02-27 00:01:16 +01:00
artica ef50808832 Auto-updated build strings. 2017-02-26 00:01:15 +01:00
artica 4d6e26a496 Auto-updated build strings. 2017-02-25 00:01:17 +01:00
Ramon Novoa 12be2a0a10 SSL_verify_mode must be a number.
(cherry picked from commit 6a2833b9a4)
2017-02-24 16:40:09 +01:00
Ramon Novoa e6746835e9 Update all the Tentacle servers.
(cherry picked from commit c6bc284b21)
2017-02-24 16:30:26 +01:00
fbsanchez d48131179a Updates over grep_log plugin (W+L) 2017-02-24 13:16:35 +01:00
fermin 8e86861fef Merge branch 'ent-352-revision-completa-de-los-ficheros-de-configuracion-de-los-agentes-windows-y-linux' into 'develop'
Ent 352 revision completa de los ficheros de configuracion de los agentes windows y linux

See merge request !204
2017-02-24 13:05:51 +01:00
fermin831 999a051391 Added network win32 agent plugin 2017-02-24 12:50:48 +01:00
artica 62ab9f0a55 Auto-updated build strings. 2017-02-24 00:01:16 +01:00
fermin831 1bb6dae844 Added df_percent_used and mem_percent_used plugins 2017-02-23 12:54:33 +01:00
fermin831 5f0c6a8b81 Added ehorus_conf to agent file 2017-02-23 12:44:21 +01:00
artica 39e380097b Auto-updated build strings. 2017-02-23 00:01:18 +01:00
fermin831 7b9e053389 Modified default Linux config file and added pandora_mem_used plugin 2017-02-22 12:25:05 +01:00
artica 54d228c00e Auto-updated build strings. 2017-02-22 00:01:20 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Alejandro Gallardo Escobar 3715b9da5d Merge branch 'feature/alias_friendly_name' of https://brutus.artica.lan:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-20 15:33:02 +01:00
Ramon Novoa 89b7f516c7 Generate random agent names by default. 2017-02-20 15:23:18 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
artica f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica 2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica 1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
artica 0677a62be0 Auto-updated build strings. 2017-02-17 00:01:17 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
artica 96b160adc2 Auto-updated build strings. 2017-02-16 00:01:14 +01:00
artica 7e7713ae04 Auto-updated build strings. 2017-02-15 00:01:14 +01:00
artica 22e81a0c2f Auto-updated build strings. 2017-02-14 00:01:17 +01:00
artica 7b95f9dbfe Auto-updated build strings. 2017-02-13 00:01:13 +01:00
artica 5426cd36f6 Auto-updated build strings. 2017-02-12 00:01:12 +01:00