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

362 Commits

Author SHA1 Message Date
enriquecd 1a50cdf950 Change web module options for curl commandos - #1903 2018-02-16 15:35:46 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-02-06 10:46:59 +01:00
daniel 955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +01:00
enriquecd 26d115a84e Merge branch 'develop' into 1470-Editar-modulo-web-analysis 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-12-21 14:37:55 +01:00
enriquecd a97c8dde6d Fix agent sinchronization from node to metaconsole when enable/disable and have same id_agent in their nodes - #1669 2017-12-04 13:50:13 +01:00
vgilc 86051a861f Merge branch '1458-Error-al-actualizar-custom-fields' into 'develop' 
Not show error when only update custom fields in agents - #1458

See merge request artica/pandorafms!929
 2017-11-29 15:42:03 +01:00
enriquecd afd84ce74d Change system audit log extended info to table format with change info - #1571 2017-11-24 10:59:44 +01:00
enriquecd 213e8e6d18 Fix Run performance tests checkbox in web analysis module updater - #1470 2017-11-16 11:52:51 +01:00
Daniel Maya 405cf9e16c Fixed issue 2017-10-17 17:05:31 +02:00
Daniel Maya 74308ae42b Created Safe operation mode 2017-10-17 16:58:05 +02:00
enriquecd 3a80eeeefc Not show error when only update custom fields in agents - #1458 2017-10-17 11:30:52 +02:00
Daniel Maya 237755a84c Merge branch 'develop' into '393-Feature-para-mostrar-los-timesticks-en-Dias-Horas-Minutos-Seg-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-09-25 15:34:39 +02:00
daniel 7a8135f36d fixed error merge dani 2017-09-25 09:45:58 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
fbsanchez 9a8e80bf68 Updates wux_module to web_analysis 2017-08-28 19:55:01 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
vgilc 870be2c4ea Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop' 
Fixed issue with cascade_protection_module

See merge request !720
 2017-08-18 12:34:31 +02:00
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
daniel 788cb8cbd8 fixed errors in form wux 2017-08-09 12:08:52 +02:00
daniel be0a91ed2c fixed minor error sql delete module 2017-08-09 10:35:57 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
Hirofumi Kosaka 76c951183c [bug fix] deleting a module had caused unextected alert deletion. #156 2017-08-02 15:41:44 +09:00
vgilc e2a175327e Merge branch '1140-Gráficas_con_entities' into 'develop' 
fixed errors entities in mail

See merge request !682
 2017-07-28 10:21:04 +02:00
Arturo Gonzalez 02ce575d9f Added a last fix 2017-07-27 12:39:38 +02:00
Arturo Gonzalez 39f4b48d84 Added some changes about update modules from local component with macros 2017-07-27 11:08:19 +02:00
Arturo Gonzalez 82b6904289 Changed some lines in configurar_agente 2017-07-26 13:36:42 +02:00
daniel 66d9dd9d27 fixed errors entities in mail 2017-07-20 13:36:16 +02:00
vgilc 6dba0a5040 Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev' 
# Conflicts:
#   pandora_console/extras/mr/4.sql
 2017-07-18 12:24:49 +02:00
Daniel Maya f0e43e252c New feature: Add groups to policies 2017-07-18 12:06:57 +02:00
Daniel Maya c13644951f update agent 2017-07-17 09:22:28 +02:00
enriquecd 1a34c7413c Fix creation prediction modules, add prediction_module param when create - #698 2017-06-26 12:22:05 +02:00
enriquecd 13376bce42 Take prediction_module param when create module and init module - #698 2017-06-02 09:54:33 +02:00
Daniel Maya 1897ee59a3 fixed problem with parent agents 2017-05-17 10:34:35 +02:00
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 a182f3f102 fixed errors in dynamic threshold 2017-03-02 16:37:49 +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 Maya b9b26c4543 Change in name hash 2017-02-22 11:46:54 +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 47338f240f Fixed module cron interval seter. Ticket #246 2017-02-09 15:54:33 +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