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

711 Commits

Author SHA1 Message Date
danielmaya 610c5a5147 Updated MR and current_package_enterprise 2018-02-28 15:45:58 +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
vgilc 7fd534c68f Merge branch 'MR-Sistema-de-gestión-de-Clusters' into 'develop' 
MR 12 clusters - #1748

See merge request artica/pandorafms!1280
 2018-02-07 15:41:43 +01:00
enriquecd c0ee22dbd9 MR 12 clusters - #1748 2018-02-07 15:19:17 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
vgilc 6194f84f13 Merge branch '1403-Db-changes-for-clocks-in-visual-console-MR' into 'develop' 
MR 12 changes for animation clock ticket - #1403

See merge request artica/pandorafms!1274
 2018-02-06 11:02:05 +01:00
vgilc acd1d97a94 Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-dbchanges' into 'develop' 
Db changes for clocks in visual console - #1403

See merge request artica/pandorafms!1150
 2018-02-06 11:01:45 +01:00
enriquecd 65dccd3935 MR 12 changes for cnimation clock ticket - #1403 2018-02-06 10:52:49 +01:00
danielmaya fb39c1e39b Updated current_package_enterprise 719 and MR12 2018-02-06 10:27:07 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop' 
Added type graph selection in container graph

See merge request artica/pandorafms!1113
 2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
enriquecd 2b07a7a8a9 Change po,mo,mr and package - #1257 2018-01-25 15:49:21 +01:00
enriquecd a149b3119e Final Wizard without js, view list, cluster creation - #1748 2018-01-23 15:34:44 +01:00
enriquecd 099cd3bbe8 Wizard first and second step, clusters functions - #1478 2018-01-17 18:56:44 +01:00
enriquecd cce92cc961 Clusters creator main page, fix pandoradb - #1748 2018-01-16 19:24:58 +01:00
enriquecd 749bc20018 Add db changes to pandora_migrate - #1748 2018-01-16 16:02:20 +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 410ecab211 fixed error in bbdd tsnmp_filter 2018-01-02 14:49:42 +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
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
enriquecd afcd03658e Fix sending mails for reports an templates reports by cronjobs - #1611 2017-12-05 11:40:41 +01:00
enriquecd 236012bdd8 Db changes for clocks in visual console - #1403 2017-12-01 12:56:32 +01:00
nramon ac06725d99 Merge branch '1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db' into 'develop' 
Apply db changes to hide no data field event template reports - #1326

See merge request artica/pandorafms!941
 2017-11-30 13:31:48 +01:00
nramon cf32b4163c Merge branch '1326/1382-MR-db-changes' into 'develop' 
1326 / 1382 - Mr 10 changes

See merge request artica/pandorafms!1137
 2017-11-30 13:12:41 +01:00
nramon 3390dc7c24 Merge branch '1382-Ordenar-elementos-custom-graphs-4606-db' into 'develop' 
Db changes for tgraph_source field order - #1382

See merge request artica/pandorafms!965
 2017-11-30 13:12:31 +01:00
enriquecd 688736288c Change treport_content_template fileds order - #1326 2017-11-30 12:46:29 +01:00
enriquecd 097bc39d74 Merge branch 'develop' into 1326-Crear-un-checkbox-para-que-no-se-muestren-datos-vacíos-en-los-informes-open-db 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2017-11-30 12:28:21 +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 897d7bf258 Added type graph selection in container graph 2017-11-23 18:01:32 +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
enriquecd 8fa2acfd2a Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/pandoradb.sql
 2017-11-15 17:35:51 +01:00
Arturo Gonzalez b5cff77a4f Added visual console querys 2017-11-15 16:10:43 +01:00
Enrique Camargo 4eae50f0f1 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2017-11-15 16:03:39 +01:00
vgilc a72f7b006e Merge branch 'develop' into '1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2017-11-15 12:04:11 +01:00
danielmaya 66547d28b0 Updated to MR 9 2017-11-15 11:15:12 +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
Arturo Gonzalez 776aca90d6 Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/pandoradb.sql
 2017-11-15 09:43:33 +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
vgilc 90b99c491a Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop' 
Added new system of calculate status if user set a parent weight

See merge request artica/pandorafms!1043
 2017-11-15 09:28:10 +01:00
danielmaya e6d5adbf22 Changed MR 2017-11-14 10:38:50 +01:00
vgilc 3493b9c15c Revert "code backup" 
This reverts commit b9851a3a71
 2017-11-13 10:21:38 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
daniel baab22bb28 add queries mr8 and migrate 2017-11-07 11:44:09 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop' 
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
 2017-11-02 15:35:38 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +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
enriquecd f608c686b8 Graph and table mode for max, min and avg reports an template reports - #654 2017-10-30 17:23:59 +01:00
nramon 8163200f54 Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'" 
This reverts merge request !871
 2017-10-30 16:11:58 +01:00
nramon 65ae5ed2eb Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop' 
Graph and table mode for max, min and avg reports and template reports - #654

See merge request artica/pandorafms!871
 2017-10-30 15:51:51 +01:00
nramon 49a1f7d872 Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop' 
Added time autorefresh

See merge request artica/pandorafms!945
 2017-10-30 10:58:07 +01:00
enriquecd 7e6adb5d40 Db changes for tgraph_source field order - #1382 2017-10-24 19:02:16 +02:00
daniel 92d2179469 updated version 2017-10-24 17:11:56 +02:00
Daniel Maya 9b1cbf3c9b Changed column in tuser_task_scheduled 2017-10-24 13:10:07 +02:00
enriquecd ea51df8b20 Add show on top option to all visual console elements - #1313 2017-10-23 18:54:57 +02:00
Daniel Maya f6e012e0fa Added time autorefresh 2017-10-23 13:17:06 +02:00
enriquecd c9ff9e77a3 Apply db changes to hide no data field event template reports - #1326 2017-10-18 18:22:00 +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
enriquecd c86bd5cc3c Fix pandora diag texts and delete old secitons files - #1350 2017-10-09 15:36:28 +02:00
vgilc 80495ddaf7 Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop' 
create mr8 for send mail plain/text

See merge request !863
 2017-10-09 10:11:07 +02:00
enriquecd 570a209861 Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350 2017-10-04 19:02:45 +02:00
enriquecd 788265713e Graph and table mode for max, min and avg reports an template reports - #654 2017-10-02 18:23:26 +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
fbsanchez ae971ded58 Fix on migrate 6.0 to 7.0 2017-08-28 19:15:10 +02:00
fbsanchez 2b18b1589c Added new module type: web_analysis 2017-08-28 19:05:08 +02:00
enriquecd 068be133ed Add password reset table in MR - #1211 2017-08-28 12:22:59 +02:00
Arturo Gonzalez f021bedb5c Added proxy servers to events response form 2017-08-24 12:34:06 +02:00
Arturo Gonzalez 3291526195 Added new fields to server table 2017-08-23 12:41:36 +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 Maya 059dec7cc9 Fixed delimiter 2017-08-16 17:04:21 +02:00
Arturo Gonzalez bf77ea14d1 Added recover delimiter 2017-08-16 10:36:30 +02:00
vgilc 47c851be95 Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop' 
Added recover delimiter

See merge request !666
 2017-08-14 12:25:35 +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
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
Enrique Camargo 88879462a3 Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2017-07-28 10:34:06 +02:00
vgilc 9a791dc0a5 Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop' 
Added some fixes to reset pass feature

See merge request !677
 2017-07-28 10:23:31 +02:00
Arturo Gonzalez 278330e8f6 Added some fixes to reset pass feature 2017-07-19 11:37:17 +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
Arturo Gonzalez d594b98cc3 Added recover delimiter 2017-07-18 11:48:59 +02:00
enriquecd 4aa04cfef0 Set texport_server table name field varchar 600 - #1015 2017-07-17 16:19:38 +02:00
vgilc 66ad86a302 Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop' 
Change tserver_export_data to varchar 600 - #1015

See merge request !600
 2017-07-17 15:41:45 +02:00
Arturo Gonzalez 1ea465b7d4 Added db changes to package 708 2017-07-17 10:46:26 +02:00
enriquecd e6e993538b Add historical db check to reports template SQL items - #853 2017-07-03 10:38:04 +02:00
enriquecd 342db3c4fb Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071 2017-06-29 17:33:29 +02:00
enriquecd 7e383262bb Change tserver_export_data to varchar 600 - #1015 2017-06-20 13:56:20 +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
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
Arturo Gonzalez 7a9f63f212 Added change to db 2017-06-01 14:30:34 +02:00
Arturo Gonzalez 4d46470e96 Added target_ip to policy_modules table 2017-06-01 14:24:24 +02:00
Arturo Gonzalez efd28c0513 Added Enrique Camargo db changes to mr number 2 2017-06-01 11:28:24 +02:00
enriquecd 2216f7ecb9 Add token to Sql query report items for use historical database - #853 2017-05-31 12:42:43 +02:00
Arturo Gonzalez 47862600a4 Added los querys to migrate 2017-05-30 15:33:16 +02:00
Arturo Gonzalez 1e0af6ec26 Added field to db 2017-05-29 11:58:42 +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
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
artu30 37757f7ace Merge branch 'develop' into '596-default_event_filter_by_user' 
# Conflicts:
#   pandora_console/godmode/users/configure_user.php
 2017-05-23 09:48:37 +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
Daniel Maya bd5cda07c4 deleted 1.sql 2017-04-25 10:28:46 +02:00
Arturo Gonzalez 82530c9b59 Added external query to mr 2017-04-20 16:18:37 +02:00
vanessa gil c3ccb00b2a new file. 2017-04-20 13:36:03 +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
fermin831 bf368a155b Drop addcol procedure if not exists 2017-04-17 13:25:36 +02:00
fermin831 4178343313 Added procedure to avoid migrate fail in tbackup 2017-03-30 17:11:49 +02:00
daniel 13620b1489 fixed custom logo login 2017-03-27 12:01:31 +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
daniel 173141c90a add news field trecorn-task migrate 2017-03-22 16:31:34 +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
m-lopez-f e34ec2109a Fixed problem with extension backup. Add new column in migrate sql. 2017-03-21 13:15:45 +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