tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,901 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

973 Commits

Author SHA1 Message Date
m-lopez-f e5ec0cb35a Kill pink unicorns 2017-03-07 16:30:40 +01:00
daniel c25595f64b add new checkbox for alias 2017-03-06 15:22:01 +01:00
m-lopez-f 7f0359283d Fixed problems with ACL permmisions. Gitlab: #451 2017-03-06 12:54:48 +01:00
daniel 93f7a3cef7 fixed errors in dynamic treshold 2017-03-03 10:51:19 +01:00
daniel ee932946cc fixed errors dynamic threshold+ 2017-03-02 18:22:42 +01:00
daniel a182f3f102 fixed errors in dynamic threshold 2017-03-02 16:37:49 +01:00
enriquecd 983d00535a Change background color when mouse over rows in agent and module managers - #81 2017-02-27 14:28:09 +01:00
m-lopez-f dc6c024611 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 13:48:19 +01:00
m-lopez-f 1e4d784e72 Remove text from header and only indicated name of networkmap or agents. Gitlab: #353 2017-02-22 13:48:11 +01:00
daniel 83af8bd639 fixed visual errors edit modules 2017-02-22 13:18:56 +01:00
Daniel Maya b9b26c4543 Change in name hash 2017-02-22 11:46:54 +01:00
Daniel Maya c21bbfd88c Merge branch 'feature/alias_friendly_name' of https://192.168.50.5:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-21 15:31:45 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 430ae3e201 Merge branch 'develop' into feature/alias_friendly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-21 15:23:44 +01:00
m-lopez-f 3b97095fda Fixed problems with check discard unknown events in module configuration. Integria: #4242, Gitlab: #324 2017-02-21 12:09:07 +01:00
Alejandro Gallardo Escobar 354377a56a Changed the agent name by its alias 2017-02-20 17:28:38 +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
Arturo Gonzalez 2cfce8979e Added new funtion to module cron interval with "from" and "to" forms. Ticket #246 2017-02-13 11:32:04 +01:00
Arturo Gonzalez 9a73cb56d7 Added module crontab to local modules with rc. Ticket #246 2017-02-10 11:43:12 +01:00
Arturo Gonzalez 47338f240f Fixed module cron interval seter. Ticket #246 2017-02-09 15:54:33 +01:00
enriquecd 294d95481c Enable fields in web modules created by policy when is unlinked - #237 2017-02-08 16:54:17 +01:00
daniel 188807c4cf change name modules create from wizard SNMP 2017-02-06 10:54:51 +01:00
daniel 0a26a31bd3 fixed errors in modules templates 2017-02-06 09:45:46 +01:00
enriquecd f9817a26ad Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41 2017-02-02 19:12:22 +01:00
enriquecd cf4283c632 Make agent manager search bar case insensitive - #33 2017-01-31 11:42:12 +01:00
artu30 20fcd7ef32 Merge branch 'feature/ux_modules_hierarchy' into 'develop' 
Feature/ux modules hierarchy

See merge request !81
 2017-01-25 15:35:09 +01:00
Arturo Gonzalez 42dc9d2522 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-01-25 14:00:03 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
enriquecd d066c5f88f Erase integria incidents integration with integria tickets - #29 2017-01-25 12:40:42 +01:00
enriquecd 3cec295b9e Escape quotes in str_warning and str_critical fields in agent editor - #26 2017-01-24 11:55:46 +01:00
Arturo Gonzalez cfce014ad3 UX console in progress... (Fixed filter form in policy modules) 2017-01-19 10:13:59 +01:00
Arturo Gonzalez 55063a20dc UX console in progres... (Added hierachy mode in modules list) 2017-01-18 17:33:28 +01:00
daniel c8a33eb115 ip dinamic in policies 2017-01-18 17:20:55 +01:00
daniel 9e391e0210 Allow dinamic ip 2017-01-17 09:21:46 +01:00
daniel cf2c0a87b6 Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'" 
This reverts merge request !31
 2017-01-17 09:03:17 +01:00
daniel 7261b50a4e Allow automatic ip 2017-01-16 17:46:59 +01:00
m-lopez-f a78690ff6f Fixed problems with cron interval qhen type of module is a data server. Ticket: #4242 
(cherry picked from commit 53c2558939)
 2016-12-22 12:07:46 +01:00
Arturo Gonzalez 3e31f5d6e8 Operation netflow module. Ticket #4274 2016-12-20 13:26:34 +01:00
daniel 7056de8070 fixed minor error 2016-12-16 12:47:37 +01:00
Arturo Gonzalez e59dc3af21 Added new field to create and update modules (parent_module_id). Ticket #122 GitLab 2016-12-14 16:04:04 +01:00
m-lopez-f c98242e996 Fixed problems with text of definition and fixed other problems. Ticket: #4242 2016-11-30 13:05:37 +01:00
m-lopez-f 0763f09cc3 Fixed problems with 'Discard unknown events' Ticket: #4242 
(cherry picked from commit 07b92fd38a)
 2016-11-28 13:02:51 +01:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557" 
This reverts commit e7021d8a0f.
 2016-11-18 13:01:13 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: #3557 2016-11-07 09:12:58 +01:00
enriquecd 9523557145 Add remote agent filter in manage agent, add remote field in database #4121 2016-11-02 16:58:53 +01:00
enriquecd 43abce6393 Fix scheuled downtime recursive filter checkbox ,optional graph watermark #64 2016-10-27 17:30:45 +02:00
daniel 968654ee67 fixed change property disabled for readonly 2016-10-26 08:31:41 +02:00
daniel 32969076b5 fixed ticket 4124 and 4123 policys 2016-10-24 17:45:35 +02:00
daniel bc5f00a2e7 fixed ticket 4123 and 4124 2016-10-24 17:43:54 +02:00
daniel 93341a60e1 visual graph for critical and warning threshold 2016-10-20 16:26:05 +02:00