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

167 Commits

Author SHA1 Message Date
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
daniel 01a9621eb5 Custom fields view add new filters 2018-12-03 11:36:34 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop' 
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
 2018-11-20 11:33:00 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
fermin831 d63666cbbc Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/godmode/alerts/alert_actions.php

Modified files extra:
	pandora_console/include/functions_alerts.php
 2018-11-08 14:00:49 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
manuel.montes 9d7f063ef2 Changed tlayout_template name table to varchar 600 2018-10-24 12:39:58 +02:00
manuel.montes f4add9a7f8 Changed tlayout_template name table to varchar 600 2018-10-24 11:49:18 +02:00
fermin831 3946124cc7 Inaugurate the 22 mr with an alter table in talert_commands 2018-10-22 09:49:06 +02:00
daniel 6bb478ea1a Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-22 08:04:36 +02:00
daniel a7918a1816 delete field flash chart php7 2018-10-19 11:56:49 +02:00
daniel e299209a92 fixed visual console custam graph in meta 2018-10-18 13:24:15 +02:00
fermin831 aff2879340 Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos 
Conflicts:
	pandora_console/extras/mr/21.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2018-10-16 11:35:14 +02:00
fbsanchez 42caddeadd Modified query to match MR requirements 2018-10-10 14:32:43 +02:00
fbsanchez 9b7ae31344 MR change 2018-10-09 16:09:44 +02:00
enriquecd c1af14b90e Change tlayou name table to varchar 600 - #2823 2018-10-05 12:25:15 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
fermin831 8979890964 Added is_favourite to tservice table 2018-09-18 19:05:20 +02:00
fermin831 8196ed21df New mr 21.sql commit 2018-09-18 18:55:53 +02:00
manuel.montes 65010d7080 Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487 
Conflicts:
	pandora_console/extras/mr/20.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2018-09-18 11:17:47 +02:00
vgilc 080cfb20ca Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2018-09-17 14:44:24 +02:00
danielmaya 50a3e43bd4 Insert apache log model in tlog_graph_models 2018-09-17 12:43:51 +02:00
fermin831 c9af020d91 Remove unwanted git traces on 20.sql 2018-09-17 10:16:12 +02:00
manuel.montes 19645f0550 Modified trecon_task table 2018-09-13 18:17:28 +02:00
Alejandro Gallardo Escobar e9752e790e Added columns for a policy feature 2018-09-13 16:57:13 +02:00
manuel.montes a2b3d6e07f Deleted reports from cron 2018-09-12 13:43:23 +02:00
Alejandro Gallardo Escobar 40ff7b9042 Now is possible to link visual consoles from different nodes to the visual console elements 2018-09-10 11:25:44 +02:00
danielmaya 816b969741 Added table tlog_graph_models 2018-09-06 16:48:18 +02:00
Alejandro Gallardo Escobar 36247d391f Merge branch 'develop' into ent-2588-service-like-visual-console-status 2018-09-04 17:25:23 +02:00
Alejandro Gallardo Escobar 22696a0fc6 Added new modes to calculate the status of the linked visual maps 2018-09-04 17:23:42 +02:00
danielmaya 19f7a5180c Added default value in parent_module_id 2018-09-04 12:48:58 +02:00
danielmaya 5b30aa5560 Added source, comment and id_extra in event filter 2018-08-31 16:25:12 +02:00
alejandro-campos 5f4d76f3a7 fixed recursion option in custom report's item editor 2018-08-28 16:38:32 +02:00
Alejandro Gallardo Escobar 8a5495a283 Merge branch 'develop' into ent-2335-gis-group-items 2018-08-17 11:17:29 +02:00
Alejandro Gallardo Escobar 7da4557abc Added the feature of the new map items (groups) and fixed more bugs 2018-08-17 11:07:42 +02:00
fermin831 4678c0df53 Fixed copy is_secondary to no_hierarchy in mr 19 2018-08-14 14:16:40 +02:00
fermin831 3daea977b0 Fixed migration rebranding Event commands 2018-08-13 14:10:19 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
fbsanchez f10058428f Added backend functions to create vconsole template 2018-08-01 12:22:13 +02:00
daniel cb77a299bb add templates console visual 2018-08-01 09:58:48 +02:00
fbsanchez 079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
danielmaya c09a91b284 Added server-name in tautoconfig_rules 2018-07-19 08:35:33 +02:00
fermin831 b6347072c5 Migrate sql meta policies (add id_node) 2018-07-18 19:19:57 +02:00
daniel 86c21aea5d merge develop 2018-07-12 13:37:46 +02:00
daniel 78f17b9970 fixed error bbdd new field CPS in tpolicy_modules 2018-07-12 09:48:51 +02:00
fbsanchez 23a9cf7842 Minor fixes 2018-07-04 19:59:31 +02:00
fbsanchez c800061bc2 Autoconfiguration v1 2018-07-04 18:39:06 +02:00
fbsanchez f430b8998f Added DB changes to support ProvisioningServer 2 2018-07-03 12:01:37 +02:00
daniel 1b1bc4aa2e add new column evaluate_sla into table tservice 2018-06-28 13:34:55 +02:00