Commit Graph

729 Commits

Author SHA1 Message Date
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop'
added setup token

See merge request artica/pandorafms!6133
2023-07-21 07:23:33 +00:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +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
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
2023-07-18 10:14:29 +00:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +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
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
2023-06-30 11:39:50 +00:00
Rafael Ameijeiras 2092cfed71 Merge branch 'ent-11648-envio-de-correos-falla-si-se-tiene-la-encriptacion-de-contrasenas-habilitadas-en-771-772' into 'develop'
Draft: Ent 11648 Envío de correos falla si se tiene la encriptación de contraseñas habilitadas en 771-772.

See merge request artica/pandorafms!6177
2023-06-30 07:05:44 +00:00
alejandro.campos@artica.es 087c0c18cc Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF 2023-06-29 12:00:44 +02:00
Daniel Cebrian 70ae1f20e4 #11648 fixed email send with encrypt password 2023-06-27 15:11:18 +02:00
alejandro.campos@artica.es 77ff766f84 remove legacy visual console 2023-06-19 15:25:37 +02:00
alejandro.campos@artica.es 1499af3a2d added setup token 2023-06-19 11:04:08 +02:00
Daniel Cebrian 052852f2d1 #10254 added timeout in active directory 2023-06-13 13:20:28 +02:00
Daniel Cebrian 8678df6982 #10254 added secondary server in ad 2023-06-13 12:37:28 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Félix Suárez 17262c45e0 FrontEnd display and Token DB update 2023-06-06 16:02:04 -06:00
Félix Suárez 593d197016 Remove reference to tnetwork_matrix 2023-06-04 16:12:29 -06:00
Daniel Maya 4f1d5e217a #11416 Added recursive group search in AD 2023-06-01 12:00:46 +02:00
Jorge Rincon be197de69a #11157 Adjusted URL update manager 2023-05-10 11:52:46 +02:00
alejandro.campos@artica.es f2cbfd930c implement sql query item limit 2023-05-03 13:44:58 +02:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop'
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
2023-04-28 06:07:10 +00:00
miguel angel rasteu dc41e1c377 fix if in header and declare correctly a value 2023-04-13 11:36:13 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
alejandro.campos@artica.es d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop'
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
2023-03-30 12:39:06 +00:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
2023-03-24 07:25:52 +00:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +01:00
Rafael Ameijeiras 766664470d Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop'
Ent 9893 nuevo sistema de ha

See merge request artica/pandorafms!5563
2023-03-23 12:58:53 +00:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Daniel Cebrian a60f9be920 #9624 changed default binary path daemon for sflow 2023-03-23 09:53:34 +01:00
Pablo Aragon d6bf16f536 10712-Login 2023-03-22 18:57:36 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
#   pandora_console/install.php
2023-03-22 08:23:07 +00:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Calvo 284e20fc8a Unified default netflow interval and deleted from console setup 2023-03-17 10:58:58 +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
Jose Gonzalez d2a807636e General Setup view 2023-03-15 17:43:35 +01:00
Jonathan d323ab7fe5 Timezonevisual correction and fix conflict 2023-03-15 09:06:07 +01:00
Daniel Cebrian d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Daniel Maya d6dec9d869 #9893 merge develop 2023-03-09 16:27:47 +01:00
Daniel Maya 41e255ff9c #9893 added token legacy_database_ha 2023-03-09 16:24:43 +01:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +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
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00
Daniel Cebrian 2c7d00a664 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 13:34:41 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
Diego Muñoz-Reja 76dbaf46d2 Merge branch 'ent-10321-limitacion-del-numero-de-eventos' into 'develop'
Ent 10321 limitacion del numero de eventos

See merge request artica/pandorafms!5513
2023-02-24 10:06:44 +00:00
Pablo Aragon c30dda1718 10519-New login meta 2023-02-23 10:32:01 +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
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
alejandro.campos@artica.es d2856e09bd implemented per-task sap license 2023-02-13 13:39:20 +01:00
Daniel Cebrian 5927687ad3 #10321 create token events_per_query for limit consult sql 2023-02-07 09:49:46 +01:00
Daniel Cebrian aedf6986b3 #10253 added console alert for control variables performance 2023-02-06 15:22:39 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jonathan 181b172ba8 #9529 timezone visual for new users 2023-02-01 16:57:48 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Daniel Maya eec87fb2de #10032 Fixed config_update_value 2023-01-16 14:51:27 +01:00
Jose Gonzalez 7277e026cd New notifications and added autoclose function 2023-01-13 14:23:48 +01:00
Calvo 867749f9d3 Fix inventory blacklist open 2022-12-29 18:14:43 +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
Rafael Ameijeiras 5934b02738 Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop'
fixed csrf

See merge request artica/pandorafms!5336
2022-12-20 17:50:21 +00:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +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@artica.es 26426c1bfa fixed csrf 2022-12-15 08:48:48 +01:00
Calvo 0eb33032ac Changed eHorus default port 2022-12-12 16:17:11 +01:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history

See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00: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
Calvo c2c62bae06 Fix missing parameter meta on event comments ajax 2022-10-25 17:37:56 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop'
Added exclude words for passwords control

See merge request artica/pandorafms!5174
2022-10-25 09:07:08 +00:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop'
Added ldap timeout

See merge request artica/pandorafms!5134
2022-10-21 10:28:04 +00:00
José González 984fd10897 Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords'
# Conflicts:
#   pandora_console/include/auth/mysql.php
2022-10-21 06:44:47 +00:00
Daniel Rodriguez 6657052308 Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop'
fix several problems in history db settings

See merge request artica/pandorafms!5188
2022-10-20 07:21:11 +00:00
Daniel Barbero f219a9678f minor fix 500 pandora_enterprise#9667 2022-10-18 16:55:05 +02:00
Diego Muñoz-Reja dfb5776f68 Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop'
Added default definition for SNMP Interface Wizard

See merge request artica/pandorafms!5168
2022-10-18 09:25:17 +00:00
Daniel Rodriguez 59c53b4668 Merge branch 'ent-9492-activar-password-policy-no-funciona' into 'develop'
Fix issue

See merge request artica/pandorafms!5175
2022-10-14 10:11:45 +00:00
alejandro.campos@artica.es 07232d82d1 fix several problems in history db settings 2022-10-11 13:26:25 +02:00
José González b5dcc5936e Fix issue 2022-10-04 16:59:25 +02:00
José González dc38e2e50a Added exclude words for passwords control 2022-10-04 15:12:12 +02:00
José González 9f800df034 Added default definition for SNMP Interface Wizard 2022-10-03 12:41:55 +02:00
Daniel Barbero 4609e141ee remove tmetaconsole_history token pandora_enterprise#9579 2022-09-30 08:56:19 +02:00
Diego Muñoz-Reja 0488eec00d Merge branch 'ent-8775-separar-el-paso-a-historico-de-datos-y-string' into 'develop'
Historic string data separated from normal data

See merge request artica/pandorafms!5093
2022-09-22 14:47:23 +00:00
Calvo 8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00
alejandro.campos@artica.es 9343796ae1 traps history 2022-09-20 17:26:29 +02:00
alejandro.campos@artica.es 91194155b0 implemented trap history 2022-09-19 11:15:22 +02:00
edu.corral 544f337181 ent 9154 SSL MySQL console connection 2022-09-14 14:19:47 +02:00
Calvo 30ffe64abc Historic string data separated from normal data 2022-09-08 14:28:36 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop'
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
2022-07-01 10:47:27 +00:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00