Commit Graph

1979 Commits

Author SHA1 Message Date
nramon 215192a265 Merge branch '186-tentacle-inverso-sync-server' into 'develop'
186 tentacle inverso sync server

See merge request !201
2017-02-23 16:09:28 +01:00
artica 39e380097b Auto-updated build strings. 2017-02-23 00:01:18 +01:00
Ramon Novoa bb6ab10fdb Merge branch 'develop' into 186-tentacle-inverso-sync-server 2017-02-22 13:41:36 +01:00
Ramon Novoa 3cada51373 Add a basic implementation of the Sync Server. 2017-02-22 12:59:29 +01:00
artica 54d228c00e Auto-updated build strings. 2017-02-22 00:01:20 +01:00
Alejandro Gallardo Escobar edddad2b5f Now the server uses the alias for the new agent event 2017-02-21 15:16:38 +01:00
Ramon Novoa e3205226e1 Make sure the alias is always set. 2017-02-21 14:24:50 +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 ce451154db Add an alias to the self-monitoring XML. 2017-02-20 15:18:39 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
Arturo Gonzalez 89f0ec658c Added data precision to events. Ticket #288 2017-02-20 09:50:57 +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
Ramon Novoa 9fef698df4 Do not add module_parent to extended_info. 2017-02-16 11:44:02 +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
fbsanchez 83ca7e898f Minor fix (performance)
Moved transactional subsystem enabled update to "new module" section
2017-02-09 10:15:50 +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
Ramon Novoa 18a84a7d58 Fix undeclared variables in Core.pm. 2017-02-07 11:22:57 +01:00
Arturo Gonzalez 4e479ccb47 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-02-07 10:42:58 +01:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +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
daniel a6fadecd47 add new macro in alerts 2017-02-02 16:11:46 +01:00
Ramon Novoa af276ab7ac Do not constrain UTC time offsets. 2017-02-02 12:50:24 +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
Arturo Gonzalez b5438effbc Deleted agent version update. Ticket #212 2017-01-31 13:25:21 +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
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
Junichi Satoh e82f31dc02 Improved to be able to pass agent's custom fields to plugin parameters. 2017-01-06 10:56:18 +09: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
Ramon Novoa 93d7cc5253 Remove debugging code. 2016-12-22 11:35:21 +01:00
Arturo Gonzalez 907ba03b1a Added a minor modification to alert snmp macros. Ticket #4290 2016-12-22 10:00:04 +01: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
Ramon Novoa 01217fe3b2 Add support to link modules via XML data files. 2016-12-14 12:59:31 +01:00
artica 3675df6113 Auto-updated build strings. 2016-12-14 00:01:12 +01:00
Ramon Novoa c11b1c1150 Parse group_id XML attributes. 2016-12-13 15:03:30 +01:00
artica 820ff676dc Auto-updated build strings. 2016-12-13 00:01:16 +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