1728 Commits

Author SHA1 Message Date
vgilc
1f0feebd1a Merge branch '2324-Error-en-servidor-de-Pandora-FMS-dev' into 'develop'
Update mr and current package

See merge request artica/pandorafms!1807
2018-09-25 13:41:43 +02:00
danielmaya
02f1e4a83a Update mr and current package 2018-09-25 13:37:47 +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
manuel.montes
49f747f739 Fixed visual bug 2018-08-20 10:09:09 +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
vgilc
6b700d337a Merge branch '572-Extension-de-self-assestment' into 'develop'
Extension self assestment

See merge request artica/pandorafms!1676
2018-08-13 12:56:04 +02:00
fermin831
962e793c1b Reupload the manuel.montes changes 2018-08-13 12:52:01 +02:00
fermin831
837df1f196 Revert "Extension self assestment"
This reverts commit de459c7761d2484649abe85bf2742189d1b01aa4.
2018-08-13 12:49:41 +02:00
vgilc
9dd9ad71a8 Merge branch '2609-cambios-en-la-forma-de-gestionar-grupos-secundarios-en-la-vista-de-usuario' into 'develop'
2609 cambios en la forma de gestionar grupos secundarios en la vista de usuario

See merge request artica/pandorafms!1665
2018-08-13 10:28:14 +02:00
manuel.montes
de459c7761 Extension self assestment 2018-08-10 17:56:43 +02:00
manuel.montes
bb8fc7a765 fix bug in pandora_diag.php 2018-08-10 10:41:18 +02:00
manuel.montes
2c72ec54b8 Update self-assestment 2018-08-09 13:08:08 +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
daniel
17b726d7a0 changes bd for mr, schema and migrate and update tocken mr 2018-06-21 14:15:27 +02:00
Ramon Novoa
dc103988ae Fix the current enterprise package number. 2018-06-20 15:18:50 +02:00
Ramon Novoa
7a026bd1c0 Update the MR version. 2018-06-20 14:40:47 +02:00
Alejandro Gallardo Escobar
faccbec12d Added a new inventory module to the database 2018-06-19 15:55:33 +02:00
Alejandro Gallardo Escobar
04aad98871 Added the database changes for the custom fields of the remote inventory modules 2018-06-19 13:49:36 +02:00
vgilc
822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop'
2042 ha cluster dev

See merge request artica/pandorafms!1524
2018-06-13 16:14:29 +02:00
danielmaya
6f689f0d0e Added mr 17 and update migrate 2018-06-13 15:39:31 +02:00