tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-25 03:38:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
19,909 Commits 34 Branches 30 Tags
Commit Graph

3077 Commits

Author SHA1 Message Date
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