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

1889 Commits

Author SHA1 Message Date
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
Daniel Cebrian 9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
Jorge Rincon ec738436eb #11881 the lts_name token is set empty 2023-08-14 13:54:09 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon 1669859f03 #11881 lts_name token has been cleaned. 2023-08-14 13:18:31 +02:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel 554570fda0 ITSM pandora_enterprise#11471 2023-08-11 14:31:20 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
Daniel Cebrian 4c3432cf40 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-11 11:09:49 +02:00
Daniel Rodriguez c4ff61a2c0 Merge branch 'ent-11326-security-hardening-console' into 'develop' 
Ent 11326 Security hardening: Console

See merge request artica/pandorafms!6242
 2023-08-11 08:20:03 +00:00
Daniel Cebrian 24b346ddd6 #11326 fixed tentacle_client and changed security module name 2023-08-11 10:14:35 +02:00
Jonathan 8aff02beb9 #11864 remove foreign key id_user tevent_comment 2023-08-11 08:11:35 +02:00
Daniel Cebrian 8a312ed2cf Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 14:28:22 +02:00
Daniel Cebrian 843dbef258 #11326 added security module in inventary windows 2023-08-10 14:18:01 +02:00
Jorge Rincon 236ad09ad6 #11843 Added MR and pandorabd_data 2023-08-10 14:08:31 +02:00
Daniel Cebrian 8da33cd0ca #11326 codify tsca data 2023-08-10 13:25:55 +02:00
Daniel Cebrian c21b16bd45 #11326 added security module in inventary 2023-08-10 12:26:24 +02:00
Daniel Cebrian f871f4e4d0 Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 08:19:03 +02:00
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jonathan 5964cdecc0 #10598 fix error sql on create web and check web 2023-08-09 11:55:37 +02:00
Daniel Cebrian 2035286f3a #11326 fixed mr session_max_time_expire conclict 2023-08-09 10:15:48 +02:00
Daniel Cebrian 0a23448259 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-09 09:29:19 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
rafael 9d08261a2c 11850 adding files to delete to delete_file.txt 2023-08-08 15:17:13 +02:00
alejandro.campos@artica.es 68525f0a12 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:03:25 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
alejandro.campos@artica.es 9f76e7cc83 update mr 2023-08-03 09:09:13 +02:00
alejandro.campos@artica.es 27766d9650 remove snmp version 2 2023-08-02 11:07:24 +02:00
Daniel Cebrian 022ccc6ace https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/11807 2023-07-28 13:54:51 +02:00
Daniel Cebrian a0fdb2a791 #11326 new report vulnerabilities 2023-07-28 12:11:36 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
alejandro.campos@artica.es c8393ae210 fixed snmp traps time 2023-07-18 10:40:33 +02:00
Daniel Cebrian 092e1dfd62 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:46:19 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Daniel Rodriguez 5a52abab74 Merge branch 'ent-11539-eliminar-wizard-de-metaconsola' into 'develop' 
Ent 11539 Eliminar wizard de metaconsola

See merge request artica/pandorafms!6083
 2023-07-17 07:43:51 +00:00
Alejandro Sánchez c66c0484cb Merge branch 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' into 'develop' 
9735 adding inventory_solaris.pl to plugin path on unix agent and adding...

See merge request artica/pandorafms!5595
 2023-07-11 08:09:47 +00:00
Daniel Cebrian aae86cd7ee Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:04:04 +02:00
Alejandro Sánchez 73ee9807d0 Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' 
# Conflicts:
#   pandora_console/extras/mr/65.sql
 2023-07-10 09:43:28 +00:00
daniel f97cf3a824 change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 13:02:00 +02:00
Jonathan 82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Daniel Cebrian 24358b5e95 Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-06 12:07:49 +02:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
alejandro e3e270233e added inventory solarix modules in 65.sql 2023-06-29 16:25:14 +02:00
Daniel Cebrian eac3cf409b #9771 new input for select mode of interval and changes in database 2023-06-27 17:37:41 +02:00
Daniel Cebrian d2413ed461 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-26 13:15:09 +02:00
Daniel Cebrian 7e2e81efb4 #11539 added delete files in .txt 2023-06-26 12:56:20 +02:00
Daniel Maya 686cd0be4d #11493 Delete refr 2023-06-21 10:54:07 +02:00
Jonathan 9fd08c928a #11573 network filters 2023-06-19 16:14:21 +02:00
Jorge Rincon 89355f07a4 #11595 The title and the url of the Tip are updated in the English language. 2023-06-16 12:03:44 +02:00
Daniel Cebrian 363f29d333 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-14 11:23:32 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
Jonathan 0463d3bea3 #11093 grid position recolocation after drag 2023-06-08 13:54:05 +02:00
daniel aa5658ac0f mr and translates pandora_enterprise#11457 2023-06-07 15:23:42 +02:00
Jonathan dd375dc73e #11093 grid background VC 2023-06-07 12:46:39 +02:00
daniel 674c49fc91 mr and translates pandora_enterprise#11457 2023-06-07 08:12:14 +02:00
miguel angel rasteu c1dd5d39c5 #11446 Add column in tlayout_template_data 2023-06-02 13:03:20 +02:00
Jonathan 01ec39bde0 Merge branch 'develop' into ent-11001-15457-tips-solo-en-espanol 2023-05-30 13:19:23 +02:00
Daniel Cebrian e44fee7d3a Merge branch 'ent-10011-nuevo-item-tabla-de-coincidencias-informe-logs' into ent-10012-item-grafico-coincidencias-informe-logs 2023-05-30 12:04:11 +02:00
Alejandro Campos 988db793da Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-24 09:20:14 +00:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
Miguel Angel Rasteu 5470e4d749 Merge branch 'develop' into 'ent-11117-edicion-usuario-entorno-meta-nodo' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
#   pandora_console/godmode/users/user_management.php
 2023-05-19 10:25:31 +00:00
miguel angel rasteu efc2990a5c #11117 Fix homscreen in metaconsole 2023-05-19 10:49:16 +02:00
Alejandro Campos 097dc8ef12 Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-17 07:41:02 +00:00
Jonathan 7b414c6b69 #10362 change MR 64 correction ticket #11109 2023-05-17 09:39:35 +02:00
Jonathan e87da5e1e5 #10362 change MR after change Milestone 2023-05-17 08:09:26 +02:00
Jonathan 0ee3692d5b Merge branch 'develop' into ent-10362-15039-fallo-en-groups-items-de-consolas-visuales 2023-05-17 08:06:03 +02:00
Daniel Rodriguez 018f024815 Merge branch 'ent-11109-cambiar-estado-de-seleccion-por-defecto-de-power-supply-en-snmp-wizard' into 'develop' 
Draft: Ent 11109 cambiar estado de seleccion por defecto de power supply en snmp wizard

See merge request artica/pandorafms!5846
 2023-05-16 10:32:20 +00:00
Daniel Cebrian 37f24d3b5f #10011 fixed mr 2023-05-11 14:54:34 +02:00
Daniel Cebrian 24848df3ba #1001 new item report for group elastic log 2023-05-10 17:47:20 +02:00
Jonathan 13f0e3db23 #10362 recursive group visual console 2023-05-09 16:45:44 +02:00
Jorge Rincon b8611573f2 #11109 Default value of the module_enabled field to 1 from the tnetwork_component table 2023-05-08 10:55:13 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Jonathan 51630d32ef #10185 filters log select group 2023-05-05 11:28:58 +02:00
Calvo 56a587791c Change correct MR 2023-05-05 09:10:49 +02:00
Calvo 8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Jonathan d0281443a4 #10185 MR 63.sql 2023-04-28 10:07:55 +02:00
Jonathan afa26e45db #10185 change MR 63 to 64.sql 2023-04-28 09:16:29 +02:00
alejandro.campos@artica.es 9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
Daniel Cebrian 966dc63a92 #9771 changes in summary and new fields for trecon_task 2023-04-26 17:16:34 +02:00
Daniel Cebrian cc2ab53db4 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-26 13:02:13 +02:00
Jonathan 442daf0282 #11001 change MR 63 to 64 2023-04-25 14:28:51 +02:00
Jonathan dfffed1912 #11001 fix sql error MR 2023-04-25 10:07:27 +02:00
Jonathan cde914fb69 #11001 welcome tips english version 2023-04-25 09:10:34 +02:00
Jonathan 6a2d5165f8 #10960 remove alter table MR 63.sql 2023-04-24 07:48:32 +02:00
alejandro.campos@artica.es a453ed7cea changes regarding encoding of tables 2023-04-21 15:16:51 +02:00
Jonathan e7186b99ba #10185 log viewer filter save/update/load 2023-04-20 16:21:29 +02:00
Daniel Cebrian 7514195572 #9771 added mr 63 2023-04-18 15:56:50 +02:00
Jonathan f026c76f69 #10960 fix mr63.sql add tsesion_filter 2023-04-18 11:27:07 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Calvo 834be58631 Fix erorrs 2023-03-21 12:28:46 +01:00
Calvo cd2f8021f5 Updated MR netflow server 2023-03-21 12:12:54 +01:00
Calvo 1686a758b9 Updated MR netflow server 2023-03-21 12:11:07 +01:00
Calvo 803e23fbac Updated MR netflow server 2023-03-21 11:28:11 +01:00
Daniel Maya 1eae8a5a4d #9893 fixed images 2023-03-16 12:04:18 +01:00
Daniel Maya 1d4aeef893 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-16 10:10:16 +01:00
Calvo 1be124059e FIX MR 2023-03-14 19:48:49 +01:00
Calvo 4adaf31a5a Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-14 19:45:48 +01:00
Calvo 6950624cc9 Added new netflow server filters form 2023-03-14 18:55:43 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 
Conflicts:
	pandora_console/extras/mr/62.sql
 2023-03-14 18:17:54 +01:00
Jose Gonzalez 93a912b76b Fix MR 2023-03-14 10:01:09 +01:00
Daniel Maya b446e89728 Merge branch 'develop' into ent-9893-nuevo-sistema-de-ha 2023-03-13 15:08:44 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Daniel Maya d6dec9d869 #9893 merge develop 2023-03-09 16:27:47 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian abf8792ec9 #9073 fixed error error for multiple io_safe_input 2023-03-08 09:13:04 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Daniel Maya 4b773671a9 #9893 changed mr 2 2023-03-03 11:49:25 +01:00
Daniel Maya 62673d8292 #9893 changed mr 2023-03-03 10:26:21 +01:00
Daniel Maya 297a21c11d Merge branch 'develop' into 'ent-9893-nuevo-sistema-de-ha' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-03 09:18:56 +00:00
Daniel Maya b5ea1c5868 #9893 Added mr 2023-03-03 10:15:02 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-03 08:12:57 +00:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
 2023-03-02 16:53:42 +00:00
Diego Muñoz-Reja 5d756ee393 Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop' 
Ent 9819 crear tip en consola sonora de eventos

See merge request artica/pandorafms!5466
 2023-03-02 15:25:31 +00:00
Jonathan 590ddc827c #9819 Change MR and add pandoradb.sql create table teventsound 2023-03-02 08:29:06 +01:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
Jonathan 2f4543a023 #9517 Change MR sql 2023-03-02 08:20:43 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-02-28 16:11:46 +00:00
Matias Didier 25413c7173 Merge branch 'ent-10235-anadir-mas-indices-al-modelo-de-datos-2' into 'develop' 
Added new indexes to mr and pandoradb

See merge request artica/pandorafms!5562
 2023-02-28 14:27:38 +00:00
Matias Didier cccae56b8a Merge branch 'ent-9517-buscar-por-campos-avanzados-de-agente' into 'develop' 
Ent 9517 buscar por campos avanzados de agente

See merge request artica/pandorafms!5446
 2023-02-28 11:59:01 +00:00
Daniel Cebrian 3dee690e42 #10324 added table tfavmenu_user in mr 2023-02-24 13:58:16 +01:00
Calvo d1a3795acb Added new indexes to mr and pandoradb 2023-02-23 12:58:33 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
alejandro.campos@artica.es 2a9494b48d fix conflicts 2023-02-22 10:10:59 +01:00
alejandro.campos@artica.es 6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez 333a93fad2 Added MR 2023-02-20 11:45:59 +01:00
Daniel Maya 5b263981c4 #10118 Added group multiselector 2023-02-13 17:06:09 +01:00
alejandro.campos@artica.es 97ade7c461 deleted 2023-02-06 14:13:14 +01:00
alejandro.campos@artica.es bdb29231bc mr changes 2023-02-06 14:12:17 +01:00
alejandro.campos@artica.es 1998829b85 Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-06 14:02:39 +01:00
Daniel Rodriguez 67a4e2b04b Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop' 
fix server status when distinct timezones

See merge request artica/pandorafms!5439
 2023-02-02 16:07:02 +00:00
Jonathan f80f1c9e70 Merge branch 'develop' into ent-9517-buscar-por-campos-avanzados-de-agente 2023-02-02 11:15:31 +01:00
alejandro.campos@artica.es e4f5a9a61a Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-01 09:36:42 +01:00
Jonathan 34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +01:00
Alejandro Campos 87d09d47ca Merge branch 'develop' into 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' 
# Conflicts:
#   pandora_console/extras/mr/61.sql
 2023-01-26 09:53:51 +00:00
Daniel Cebrian 082d3b5532 #10166 added index in MR and pandoradb 2023-01-24 12:10:40 +01:00
Jonathan 1e7cbb5521 #9517 Custom sql - Agent safe mode not enable 2023-01-24 10:18:01 +01:00
Jonathan 01ed220e1f #9517 Custom sql - Agent safe mode not enable 2023-01-24 10:16:31 +01:00
Jonathan b64c1ee44c #9517 Custom sql - Agent safe mode not enable 2023-01-23 16:19:54 +01:00
Diego Muñoz-Reja c462f389a4 Merge branch 'ent-10014-filtros-personalizados-para-logviewer' into 'develop' 
Ent 10014 filtros personalizados para logviewer

See merge request artica/pandorafms!5414
 2023-01-23 13:27:11 +00:00
alejandro.campos@artica.es a2076ffd0c fix server status when distinct timezones 2023-01-20 13:11:49 +01:00
Jonathan 7461c0d03f #10014 Change SQL after change milestone 2023-01-20 08:03:03 +01:00
alejandro.campos@artica.es 67b7234e58 implement filter save and load feature in monitor view 2023-01-19 10:49:48 +01:00
daniel e0ee00aa7c fix name lts pandora_enterprise#10173 2023-01-18 09:28:57 +01:00
Daniel Rodriguez a165eec2a1 Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop' 
Move inventory to open

See merge request artica/pandorafms!5105
 2023-01-16 13:43:19 +00:00
Jonathan f3cd19c315 #10014 New filters log viewer 2023-01-16 11:34:28 +01:00
Calvo af800fa886 Updated MR 2022-12-30 16:03:49 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
Daniel Rodriguez b64ce98241 Merge branch 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' into 'develop' 
Ent 8297 mejoras en gestion de acceso a pandora md5 sha256 y salt opcional

See merge request artica/pandorafms!5343
 2022-12-22 15:38:45 +00:00
Calvo b46f9c9319 Move inventory to open 2022-12-22 12:47:03 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Daniel Rodriguez cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop' 
implement cluster in open project

See merge request artica/pandorafms!5204
 2022-12-21 09:05:01 +00:00
Alejandro Campos 93c1c040dd Merge branch 'develop' into 'ent-8297-Mejoras-en-gestion-de-acceso-a-pandora-MD5-SHA256-y-Salt-opcional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-20 12:05:31 +00:00
alejandro.campos@artica.es 22b63222c9 bcrypt implementation 2022-12-20 12:27:58 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Rafael Ameijeiras e18277bc89 Merge branch 'ent-9847-cambiar-plugins-de-inventario-remoto-de-windows-para-que-usen-pandorawmic-2' into 'develop' 
added updates to mr with new code to update the scripts and changed the code...

See merge request artica/pandorafms!5337
 2022-12-19 14:33:52 +00:00
alejandro c6637d59e4 added also the updates in the mr and updated the inserts in pandoradb_data.sql for the motherboards, monitors, printers, product_key, product_id inventory plugins. 2022-12-16 12:19:30 +01:00
alejandro.campos@artica.es 7e507d454b change password field length 2022-12-16 12:12:11 +01:00
alejandro.campos@artica.es 8f3f8679d5 Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open 2022-12-16 11:29:00 +01:00
alejandro 5c41b88ed2 added updates to mr with new code to update the scripts and changed the code of the windows tmodule_inventory inserts in pandoradb_data.sql 2022-12-16 09:00:01 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
alejandro.campos@artica.es 4ea10b5a5b changed user password hashing 2022-12-15 13:24:51 +01:00
Alejandro Campos 867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' 
# Conflicts:
#   pandora_console/extras/mr/60.sql
 2022-12-13 11:42:41 +00:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 
Conflicts:
	pandora_console/extras/mr/59.sql
 2022-12-13 09:17:39 +01:00
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' 
implemented custom field

See merge request artica/pandorafms!5271
 2022-12-12 08:20:08 +00:00
alejandro.campos@artica.es 0f8b7ad834 removed linebreak 2022-12-09 12:50:13 +01:00
alejandro.campos@artica.es 39920692ef Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional 2022-12-09 12:49:04 +01:00
alejandro.campos@artica.es 2c020bcd46 fixed vc template creation 2022-11-30 18:50:57 +01:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
alejandro.campos@artica.es cdddc07b86 changed mr 2022-11-23 12:22:19 +01:00
alejandro.campos@artica.es 767624b0c3 implemented link type custom field 2022-11-22 11:50:07 +01:00
Daniel Barbero 19f587b73a fixed filters pandora_enterprise#9864 2022-11-22 11:37:33 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00
alejandro.campos@artica.es 5e510e7e12 implemented custom field 2022-11-16 10:28:50 +01:00
alejandro.campos@artica.es a357dcfb0d updated delete files file 2022-11-11 13:20:23 +01:00
alejandro.campos@artica.es 780e6ac514 Removed transactional server 2022-11-11 12:53:41 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop' 
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
 2022-11-07 12:44:23 +00:00
Daniel Barbero 33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
edu.corral ba70e8dd0d ent 7914 status scaling time based 2022-11-02 12:58:45 +01:00
edu.corral 6a9e30ae6d ent 7914 status scaling 2022-11-02 12:53:14 +01:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-31 14:13:45 +01:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-31 10:46:44 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop' 
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
 2022-10-31 10:02:44 +00:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-27 09:50:24 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
edu.corral 1a0fa24188 ent 7914 restore migration script 2022-10-26 11:04:53 +02:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
edu.corral 47521e7e3c ent 7914 database adjustements 2022-10-26 09:07:48 +02:00
edu.corral 90f8122232 ent 7914 table change for status scaling based on time 2022-10-26 08:51:51 +02:00
edu.corral 0f6f7b6563 ent 7914 status scaling based on time 2022-10-21 13:22:14 +02:00
edu.corral 0fd29caffe ent 7914 status scaling based on time 2022-10-21 13:10:12 +02:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop' 
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
 2022-10-20 12:10:59 +00:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-18 07:23:29 +00:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-18 07:59:26 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Barbero 9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02:00
Diego Muñoz-Reja 8154ef5533 Merge branch 'ent-9391-Cambios-en-el-inventario-remoto' into 'develop' 
added change to allow inventory modules to load script from a path

See merge request artica/pandorafms!5151
 2022-10-11 15:14:45 +00:00
alejandro.campos@artica.es 2ea3c3038c fixed vulnerabilities 2022-10-04 18:13:50 +02:00
alejandro.campos@artica.es 05cbc2fb0e fixed vulnerability 2022-10-04 18:00:47 +02:00
Daniel Maya 2d747caede #4043 mr 58 2022-10-04 09:58:07 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Diego Muñoz-Reja 9aa1d4d82f Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop' 
removed mr

See merge request artica/pandorafms!5150
 2022-09-28 14:02:06 +00:00
alejandro.campos@artica.es 4dd0075b72 removed mr 2022-09-28 15:53:44 +02:00
alejandro.campos@artica.es 042362991d implemented option to skip inoperative interfaces on demand 2022-09-28 15:34:45 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 9c7e70c7de changes to mr 2022-09-27 17:19:10 +02:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop' 
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
 2022-09-27 12:26:24 +00:00
alejandro.campos@artica.es 7e85bea0f4 added change to allow inventory modules to load script from a path 2022-09-26 15:30:31 +02:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop' 
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
 2022-09-26 11:03:52 +00:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
alejandro.campos@artica.es 520a820625 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' of brutus.artica.es:artica/pandorafms into ent-8217-Comando-Accion-de-alerta-para-enviar-informes 2022-09-23 13:00:40 +02:00
alejandro.campos@artica.es 23bb4d0750 minor fix 2022-09-23 13:00:28 +02:00
alejandro.campos@artica.es 8918682f67 minor change 2022-09-23 09:58:37 +02:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02:00
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-23 06:41:57 +00:00
alejandro.campos@artica.es 2af04e7de0 change mr 2022-09-21 15:22:20 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
Daniel Barbero cefc5c4605 fixed size field bbdd tmodule_group pandora_enterprise#9453 2022-09-13 08:30:37 +02:00