Commit Graph

460 Commits

Author SHA1 Message Date
Arturo Gonzalez 0ce515197b new sql mr 2017-03-17 09:19:55 +01:00
vanessa gil 08c20fcfab new file 2017-03-17 09:19:55 +01:00
vanessa gil cb3c9c0cdb New file 2017-03-17 09:19:55 +01:00
vanessa gil 16febc3d67 New mr. 2017-03-17 09:19:55 +01:00
vanessa gil f4051b825a Deleted files. 2017-03-17 09:19:55 +01:00
vanessa gil a094f67dd9 New file. 2017-03-15 15:50:36 +01:00
vanessa gil 025b8329ea Deleted oracle and postgre files. 2017-03-15 10:34:25 +01:00
vanessa gil a85298d432 new file 2017-03-14 17:11:47 +01:00
vanessa gil 26339b39f0 delete file 2017-03-14 16:57:51 +01:00
vanessa gil 01945c3cb5 new mr 2017-03-14 16:56:00 +01:00
vanessa gil 32f984020b new mr
o
2017-03-14 16:51:38 +01:00
vanessa gil cc39f6d1a8 New file. 2017-03-14 16:46:21 +01:00
vanessa gil fd4b62f604 Delete files 2017-03-14 15:47:11 +01:00
vanessa gil f18f2e1068 New file. 2017-03-14 12:11:16 +01:00
vanessa gil f49d7f3eec New file. 2017-03-14 10:21:38 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
m-lopez-f 68803706d4 Add querys to remove from DB graph availability widget. Gitlab: #470 2017-03-08 13:53:24 +01:00
vanessa gil 469c276512 Added file. 2017-03-08 13:26:06 +01:00
Ramon Novoa dff80fed84 Add a new Recon module that will be used by the Satellite Server too. 2017-03-08 13:20:00 +01:00
vanessa gil bbab12f50e added file. 2017-03-08 13:12:31 +01:00
vanessa gil ef0f55e2c2 added file. 2017-03-08 11:44:49 +01:00
daniel 631a4d0777 fixed minor error in table metaconsole_agent 2017-03-06 16:19:03 +01:00
daniel 8bab8bbada add checkbox alias_as_name recon task 2017-03-06 16:10:07 +01:00
daniel c25595f64b add new checkbox for alias 2017-03-06 15:22:01 +01:00
vanessa gil eea926255b Added new files. 2017-03-06 13:44:41 +01:00
Arturo Gonzalez bcf1fc2e1b Merge db system. Ticket #444 2017-03-03 10:27:52 +01:00
Junichi Satoh 17015c4afc Fixed syntax error. 2017-03-03 16:05:58 +09:00
Arturo Gonzalez 217cffbf05 Merge um packages system. Ticket #439 2017-03-02 15:45:27 +01:00
daniel 45ea30e5b3 fixed nome agent for alias agent 2017-02-24 13:59:03 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Arturo Gonzalez 651e7ea8e6 Changed migration file name. Ticket #297 2017-02-20 12:35:52 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
Arturo Gonzalez f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
Arturo Gonzalez f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
enriquecd c8c79e6fec Add session_time column to tusuario table - #61 2017-02-16 17:33: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
nramon 165b59656e Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7'
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
2017-02-15 15:49:16 +01:00
Ramon Novoa de392d26ad Update the Update Manager URLs. 2017-02-15 15:41:54 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
2017-02-13 14:19:25 +01:00
Arturo Gonzalez 46e1d41ce0 Fixed netflow filter. Ticket #207 2017-02-09 12:55:11 +01:00
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
Arturo Gonzalez 3e0b0f231b Added more fields to alert macro fields. Ticket #233 2017-02-06 16:20:39 +01:00
enriquecd 08f4f9524b Add titem, tmap, trel_item tables to migration 6 - 6.1 script - #34 2017-01-31 15:39:06 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
Junichi Satoh d16aa71c53 Added missing ';'. 2017-01-17 16:14:17 +09:00
enriquecd 6447189606 Improve visual console - #110 2017-01-16 13:31:56 +01:00
daniel 4e1dcc5aba add new field in tgraph 2016-12-27 13:35:18 +01:00
m-lopez-f c3d1ba7aa6 Fixed problems with cron interval qhen type of module is a data server. Ticket: #4242 2016-12-22 12:13:53 +01:00
Ramon Novoa 01217fe3b2 Add support to link modules via XML data files. 2016-12-14 12:59:31 +01:00