Commit Graph

1542 Commits

Author SHA1 Message Date
artica 62ab9f0a55 Auto-updated build strings. 2017-02-24 00:01:16 +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
artica 570bc28301 Auto-updated build strings. 2017-02-11 00:01:16 +01:00
artica 060c6236c4 Auto-updated build strings. 2017-02-10 00:01:14 +01:00
artica 5af516078c Auto-updated build strings. 2017-02-09 00:01:14 +01:00
artica 16f4281de7 Auto-updated build strings. 2017-02-08 00:02:21 +01:00
artica 4cb1f6466a Auto-updated build strings. 2017-02-07 00:01:16 +01:00
artica d7dc408f4e Auto-updated build strings. 2017-02-06 00:01:14 +01:00
artica 7e65547661 Auto-updated build strings. 2017-02-05 00:01:15 +01:00
artica 4a06176731 Auto-updated build strings. 2017-02-04 00:01:17 +01:00
artica 423a6c434d Auto-updated build strings. 2017-02-03 00:01:19 +01:00
artica 707381284e Auto-updated build strings. 2017-02-02 00:01:16 +01:00
artica 295cd3806f Auto-updated build strings. 2017-02-01 00:01:16 +01:00
m-lopez-f 29a0b192b1 Fixed a typo error. GitHub #78 2017-01-31 09:35:29 +01:00
artica 2f7a6f0286 Auto-updated build strings. 2017-01-31 00:01:18 +01:00
artica c3c9189cc0 Auto-updated build strings. 2017-01-30 00:01:16 +01:00
artica 6ad1682ef9 Auto-updated build strings. 2017-01-29 00:01:14 +01:00
artica 5cf006e82e Auto-updated build strings. 2017-01-28 00:01:14 +01:00
artica ce306aa1d6 Auto-updated build strings. 2017-01-27 00:01:16 +01:00
artica 8465cd5266 Auto-updated build strings. 2017-01-26 00:01:16 +01:00
artica 1970167df4 Auto-updated build strings. 2017-01-25 00:01:13 +01:00
artica c4a49f1ac9 Auto-updated build strings. 2017-01-24 00:01:16 +01:00
artica 33301a89d0 Auto-updated build strings. 2017-01-22 00:01:13 +01:00
artica 5042fedfd6 Auto-updated build strings. 2017-01-21 00:01:16 +01:00
artica f154705317 Auto-updated build strings. 2017-01-20 00:01:17 +01:00
artica fea876396a Auto-updated build strings. 2017-01-19 00:01:12 +01:00
artica e0a3dec263 Auto-updated build strings. 2017-01-18 00:01:11 +01:00
artica 42487d8a6d Auto-updated build strings. 2017-01-17 00:01:13 +01:00
Ramon Novoa 66ae3460ce Add the token group_password to agent configuration files. 2017-01-16 11:34:44 +01:00
artica 28989fc4db Auto-updated build strings. 2017-01-16 00:01:12 +01:00
artica 3956ce300f Auto-updated build strings. 2017-01-15 00:01:12 +01:00
artica 233fe5e839 Auto-updated build strings. 2017-01-14 00:01:17 +01:00
artica 2773b3f2f9 Auto-updated build strings. 2017-01-13 00:01:15 +01:00
artica c0446bfde0 Auto-updated build strings. 2017-01-12 00:01:15 +01:00
artica 2d872bf2ee Auto-updated build strings. 2017-01-11 00:01:13 +01:00
artica c0f46fbd2f Auto-updated build strings. 2017-01-10 00:01:13 +01:00
artica 1abf229079 Auto-updated build strings. 2017-01-09 00:01:12 +01:00
artica 403e5f6678 Auto-updated build strings. 2017-01-08 00:01:10 +01:00
artica c5074d72aa Auto-updated build strings. 2017-01-07 00:01:12 +01:00
artica 71b1322b76 Auto-updated build strings. 2017-01-06 00:01:13 +01:00
artica d9e51bde9a Auto-updated build strings. 2017-01-05 00:01:14 +01:00
artica 013c40fed4 Auto-updated build strings. 2017-01-04 00:01:13 +01:00
artica 4c21746c5a Auto-updated build strings. 2017-01-03 00:01:14 +01:00
artica ea20b0e5fa Auto-updated build strings. 2017-01-02 00:01:12 +01:00
artica ef46f85c29 Auto-updated build strings. 2017-01-01 00:01:12 +01:00
artica a5169e2d31 Auto-updated build strings. 2016-12-31 00:01:13 +01:00
artica 33370bdb52 Auto-updated build strings. 2016-12-30 00:01:13 +01:00
artica 8f1acf702b Auto-updated build strings. 2016-12-29 00:01:13 +01:00
artica 6efb0c2c16 Auto-updated build strings. 2016-12-28 00:01:16 +01:00
artica 82b87ba993 Auto-updated build strings. 2016-12-27 00:01:10 +01:00
artica 7e8cc8211e Auto-updated build strings. 2016-12-26 00:01:12 +01:00
artica ef7e61d57a Auto-updated build strings. 2016-12-25 00:01:11 +01:00
artica 816c98d1b0 Auto-updated build strings. 2016-12-24 00:01:14 +01:00
artica 0c656edcf8 Auto-updated build strings. 2016-12-23 00:01:12 +01:00
Junichi Satoh 3e1220bdb8 Updated configuration files for FreeBSD. 2016-12-22 11:14:19 +09:00
artica 0a7c3882a4 Auto-updated build strings. 2016-12-22 00:01:15 +01:00
artica 8a0fec657c Auto-updated build strings. 2016-12-21 00:01:14 +01:00
artica 54e31c5a10 Auto-updated build strings. 2016-12-20 00:01:15 +01:00
artica 021eb37ba5 Auto-updated build strings. 2016-12-18 00:01:11 +01:00
artica 5930edd610 Auto-updated build strings. 2016-12-17 00:01:14 +01:00
artica 72c5160326 Auto-updated build strings. 2016-12-16 00:01:13 +01:00
artica 8c02779ee9 Auto-updated build strings. 2016-12-15 00:01:14 +01:00
artica 3675df6113 Auto-updated build strings. 2016-12-14 00:01:12 +01:00
Ramon Novoa 9919322ba4 Added a new group_id configuration option. 2016-12-13 15:01:02 +01:00
artica 820ff676dc Auto-updated build strings. 2016-12-13 00:01:16 +01:00
nramon 58fe27a664 Merge branch 'feature/123-deteccion-de-ekid-automatica' into 'develop'
Feature/123 deteccion de ekid automatica

Closes Issue artica/pandora_enterprise#123

See merge request !3
2016-12-12 12:12:46 +01:00
artica d8ddf49e97 Auto-updated build strings. 2016-12-11 00:01:12 +01:00
artica 3ee06679f9 Auto-updated build strings. 2016-12-10 00:01:11 +01:00
artica d1552cc8c2 Auto-updated build strings. 2016-12-09 00:01:14 +01:00
artica 14c5ec6b87 Auto-updated build strings. 2016-12-08 00:01:13 +01:00
Ramon Novoa a5cc574061 Send the eHorus key as a custom field. 2016-12-07 15:52:41 +01:00
artica 2ca7276443 Auto-updated build strings. 2016-12-07 00:01:12 +01:00
Hirofumi Kosaka 5d5164c2c0 Added package dependency (tentacle_client depends on it). 2016-12-06 18:29:15 +09:00
artica f6ddfa0fd4 Auto-updated build strings. 2016-12-06 00:01:13 +01:00
Ramon Novoa e8e1eeaed3 Read the eHorus key if available. 2016-12-05 15:29:05 +01:00
artica 024719d9d6 Auto-updated build strings. 2016-12-04 00:01:12 +01:00
artica c9e1a34458 Auto-updated build strings. 2016-12-03 00:01:12 +01:00
artica c6ad7526c2 Auto-updated build strings. 2016-12-02 00:01:14 +01:00
artica 635d59a2d2 Auto-updated build strings. 2016-12-01 00:01:15 +01:00
artica 6842abcd58 Auto-updated build strings. 2016-11-30 00:01:14 +01:00
artica 26b50bd95e Auto-updated build strings. 2016-11-29 00:01:17 +01:00