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

349 Commits

Author SHA1 Message Date
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
daniel 17b726d7a0 changes bd for mr, schema and migrate and update tocken mr 2018-06-21 14:15:27 +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
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
enriquecd d76f8f6c76 Fix MR - #2007 2018-04-30 14:59:35 +02:00
enriquecd 6affae9872 drop agents foreign keys in tcluster tables - #2007 2018-04-30 13:06:08 +02:00
fermin831 1f79326e97 [Secondary groups] Added SQL changes to migrate scripts 2018-04-10 09:38:00 +02:00
danielmaya 364daa8579 Added group_id in cron job(mr and migrate) 2018-03-21 16:51:08 +01:00
enriquecd 19b566d4c2 Fix cluster id_os bug - #2090 2018-03-20 15:42:37 +01:00
enriquecd 43e374f454 Fix id_os 100 cluster - #1748 2018-03-19 19:09:45 +01:00
fermin831 458938b751 Fixed mr 13 2018-03-15 14:32:51 +01:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa 560f18f3a2 Add tables for agent provisioning to the schema. 2018-03-13 18:01:04 +01:00
fbsanchez 9b9b46ac65 1923 added new tables to MR and migrate sql script 2018-03-13 16:38:09 +01:00
enriquecd beac30513d Ad id_os cluster to tconfig_os - #2001 2018-03-01 16:17:26 +01:00
danielmaya 9d36887a02 Fixed graph precision 2018-02-28 14:33:22 +01:00
enriquecd a6b28cb40e Fix MR - #1748 2018-02-13 15:59:30 +01:00
enriquecd c0ee22dbd9 MR 12 clusters - #1748 2018-02-07 15:19:17 +01:00
enriquecd 65dccd3935 MR 12 changes for cnimation clock ticket - #1403 2018-02-06 10:52:49 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
Ramon Novoa 934ab8ed91 Add support for periodically updating the status of unknown modules. 2018-01-11 16:00:22 +01:00
daniel b10e9cfc67 fixed errors in favourite consola visual 2018-01-04 13:10:25 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
enriquecd 9a0438bc36 Merge branch 'develop' into 1611-No-se-envían-los-informes-por-correo-desde-Metaconsola-4881-vodat 
Conflicts:
	pandora_console/extras/mr/10.sql
 2018-01-02 16:56:48 +01:00
daniel ff60278060 fixed error in bbdd tsnmp_filter 2018-01-02 13:54:08 +01:00
daniel 0b5678fba6 add new funtionality view favourite console visual 2017-12-28 15:13:06 +01:00
enriquecd d0d0f8b229 Fix custom graph builder order bar - #1382 2017-12-13 13:08:41 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
enriquecd afcd03658e Fix sending mails for reports an templates reports by cronjobs - #1611 2017-12-05 11:40:41 +01:00
enriquecd 6075c9b6b9 1326 / 1382 - Mr 10 changes 2017-11-30 11:55:11 +01:00
Arturo Gonzalez 828d19a47a Added mr file 2017-11-29 14:00:27 +01:00
danielmaya ede677f07c Added safe_mode_module in metaconsole 2017-11-16 13:38:59 +01:00
Alejandro Gallardo Escobar f2ad76636c Merge branch 'develop' into varias-consolas-visuales-en-un-solo-dashboard-modo-slideshow-opcional 
Conflicts resolved:
	pandora_console/extras/mr/9.sql
 2017-11-16 09:49:11 +01:00
Arturo Gonzalez b565500182 Added sql to MR 2017-11-16 08:32:39 +01:00
Arturo Gonzalez b5cff77a4f Added visual console querys 2017-11-15 16:10:43 +01:00
vgilc e8076645d0 Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev' 
# Conflicts:
#   pandora_console/extras/mr/9.sql
 2017-11-15 09:47:21 +01:00
vgilc b12d529578 Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop' 
1276 cascade protection a nivel de módulo dev

See merge request artica/pandorafms!933
 2017-11-15 09:31:05 +01:00
daniel baab22bb28 add queries mr8 and migrate 2017-11-07 11:44:09 +01:00
enriquecd 2da1e57dc1 Change pandora migrate and add mr8 changes - #654 
Conflicts:
	pandora_console/extras/mr/8.sql
 2017-10-30 17:26:35 +01:00
Daniel Maya 9b1cbf3c9b Changed column in tuser_task_scheduled 2017-10-24 13:10:07 +02:00
Daniel Maya f6e012e0fa Added time autorefresh 2017-10-23 13:17:06 +02:00
Alejandro Gallardo Escobar b641323eed [artica/pandora_enterprise#1462] Added the DB changes needed by the dashboard items slideshow feature 2017-10-18 17:29:06 +02:00
Daniel Maya 74308ae42b Created Safe operation mode 2017-10-17 16:58:05 +02:00
vgilc 1838a6b30a Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'" 
This reverts merge request !863
 2017-10-16 16:44:16 +02:00
daniel 2d673c8ac1 create mr8 for send mail plain/text 2017-09-27 13:46:29 +02:00
enriquecd 8ce6920e44 DB changes for visual console group elements - #1245 2017-09-07 12:11:13 +02:00
daniel f954b92aae fixed error in mr for WUX 2017-09-05 11:06:49 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Enrique Camargo 6b4a15534d Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR' 
# Conflicts:
#   pandora_console/extras/mr/6.sql
 2017-08-31 18:21:08 +02:00
Enrique Camargo afd184f466 Update 6.sql 2017-08-31 17:58:34 +02:00
Arturo Gonzalez 2fe8849708 Added db changes to mr 6 2017-08-31 11:33:08 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
enriquecd 068be133ed Add password reset table in MR - #1211 2017-08-28 12:22:59 +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
daniel 1d7d55a451 fixed errors in form wux 2017-08-09 13:27:51 +02:00
Daniel Maya 3ef3679f10 Fixed issue with cascade_protection_module 2017-08-08 10:38:30 +02:00
daniel 590bfbfe84 mr-5 add queries 2017-08-07 13:57:04 +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
enriquecd 4aa04cfef0 Set texport_server table name field varchar 600 - #1015 2017-07-17 16:19:38 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
Ramon Novoa 035829ce91 Replaced procedures with prepared statements. 
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
 2017-06-15 15:43:00 +02:00
Ramon Novoa d2d56b4b89 Add a missing MR. 2017-06-15 13:47:20 +02:00
Ramon Novoa 7c3ef317b0 Revert "Add a missing MR." 
This reverts commit 16b0da1515.
 2017-06-15 10:50:31 +02:00
Ramon Novoa 16b0da1515 Add a missing MR. 2017-06-15 10:33:30 +02:00
Arturo Gonzalez 7a9f63f212 Added change to db 2017-06-01 14:30:34 +02:00
Arturo Gonzalez efd28c0513 Added Enrique Camargo db changes to mr number 2 2017-06-01 11:28:24 +02:00
Arturo Gonzalez a4636f3435 Added changes in db 2017-05-29 11:55:04 +02:00
Daniel Maya 0f9a2cf2f8 New feature: Graphic grouping. added mr 2017-05-23 17:17:40 +02:00
Arturo Gonzalez 2e3f6ad700 Added change to mr 2017-05-10 15:21:42 +02:00
Arturo Gonzalez de650b9ef2 Added change to mr (enriquecd) 2017-04-25 16:26:45 +02:00
Arturo Gonzalez 82530c9b59 Added external query to mr 2017-04-20 16:18:37 +02:00
Arturo Gonzalez 29ad608ddb Added ; to query transaction 2017-04-18 11:41:51 +02:00
Arturo Gonzalez 97abef62c4 Added db field to mr 2017-04-18 11:39:46 +02:00
vanessa gil ef95602157 delete file 2017-04-07 10:48:28 +02:00
vanessa gil 3d506d2967 new file. 2017-04-06 15:43:02 +02:00
vanessa gil 12548bddc8 new file. 2017-04-06 14:13:19 +02:00
vanessa gil 5582240770 removed file. 2017-04-05 17:47:27 +02:00
vanessa gil 0d21e46939 new file. 2017-04-05 11:09:48 +02:00
vanessa gil a445877497 new file. 2017-03-31 10:36:05 +02:00
vanessa gil 644eeaa7aa delete file 2017-03-23 16:51:00 +01:00
vanessa gil d006c81eb0 delete files. 2017-03-23 15:53:44 +01:00
vanessa gil b00ddd9beb new file. 2017-03-22 11:29:28 +01:00
vanessa gil 5cf45a08ec new file 2017-03-22 11:10:09 +01:00
vanessa gil 2b7e5de6a1 new file 2017-03-22 11:03:38 +01:00
vanessa gil be188dcf68 new file 2017-03-22 10:47:51 +01:00
vanessa gil 7c94400e7b MR 2017-03-22 10:29:10 +01:00
vanessa gil 0b564c2866 new file 2017-03-21 13:43:01 +01:00
vanessa gil 2994a9f8a1 new file. 2017-03-21 13:32:08 +01:00
vanessa gil c23767c5d7 new mr file. 2017-03-21 13:11:17 +01:00
vanessa gil d6fb515034 new file. 2017-03-21 12:23:46 +01:00
vanessa gil d5a70bc15e Deleted files. 2017-03-21 12:04:05 +01:00
vanessa gil cb1cd58d83 new file 2017-03-17 11:36:10 +01:00
Arturo Gonzalez 37fd8f8851 new sql mr 2017-03-16 12:23:25 +01:00
vanessa gil 5d09cfdef3 new file 2017-03-16 12:03:29 +01:00
vanessa gil e7fa5d1f00 New file 2017-03-16 11:15:36 +01:00
vanessa gil 309ed42a8f New mr. 2017-03-15 17:20:16 +01:00
vanessa gil def9172bb9 Deleted files. 2017-03-15 17:04:40 +01:00
vanessa gil a094f67dd9 New file. 2017-03-15 15:50:36 +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
vanessa gil 469c276512 Added file. 2017-03-08 13:26:06 +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
vanessa gil eea926255b Added new files. 2017-03-06 13:44:41 +01:00
Arturo Gonzalez cf2915ec73 Added dir estructure to minor release system. 2016-07-20 10:54:08 +02:00