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
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
f80f1c9e70
Merge branch 'develop' into ent-9517-buscar-por-campos-avanzados-de-agente
2023-02-02 11:15:31 +01:00
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
34fede2ce1
#9819 New section configuration sound event
2023-01-27 12:42:23 +01:00
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
082d3b5532
#10166 added index in MR and pandoradb
2023-01-24 12:10:40 +01:00
1e7cbb5521
#9517 Custom sql - Agent safe mode not enable
2023-01-24 10:18:01 +01:00
01ed220e1f
#9517 Custom sql - Agent safe mode not enable
2023-01-24 10:16:31 +01:00
b64c1ee44c
#9517 Custom sql - Agent safe mode not enable
2023-01-23 16:19:54 +01:00
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
a2076ffd0c
fix server status when distinct timezones
2023-01-20 13:11:49 +01:00
7461c0d03f
#10014 Change SQL after change milestone
2023-01-20 08:03:03 +01:00
67b7234e58
implement filter save and load feature in monitor view
2023-01-19 10:49:48 +01:00
e0ee00aa7c
fix name lts pandora_enterprise#10173
2023-01-18 09:28:57 +01:00
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
f3cd19c315
#10014 New filters log viewer
2023-01-16 11:34:28 +01:00
af800fa886
Updated MR
2022-12-30 16:03:49 +01:00
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
566344ef0e
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
2022-12-28 11:00:44 +01:00
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
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
b46f9c9319
Move inventory to open
2022-12-22 12:47:03 +01:00
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
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
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
22b63222c9
bcrypt implementation
2022-12-20 12:27:58 +01:00
3e071a7d33
remove phamtomjs pandora_enterprise#9554
2022-12-20 12:23:18 +01:00
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
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
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
7e507d454b
change password field length
2022-12-16 12:12:11 +01:00
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
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
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
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
4ea10b5a5b
changed user password hashing
2022-12-15 13:24:51 +01:00
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
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
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
0f8b7ad834
removed linebreak
2022-12-09 12:50:13 +01:00
39920692ef
Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional
2022-12-09 12:49:04 +01:00
2c020bcd46
fixed vc template creation
2022-11-30 18:50:57 +01:00
306d0f0cf2
#9927 changed lts_name
2022-11-28 09:24:50 +01:00
cdddc07b86
changed mr
2022-11-23 12:22:19 +01:00
767624b0c3
implemented link type custom field
2022-11-22 11:50:07 +01:00
19f587b73a
fixed filters pandora_enterprise#9864
2022-11-22 11:37:33 +01:00
4118a46b9f
add new filter search events pandora_enterprise#9135
2022-11-18 14:04:54 +01:00
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
5e510e7e12
implemented custom field
2022-11-16 10:28:50 +01:00
a357dcfb0d
updated delete files file
2022-11-11 13:20:23 +01:00
780e6ac514
Removed transactional server
2022-11-11 12:53:41 +01:00
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
33b1c0ab8f
add new filter pandora_enterprise#9135
2022-11-03 12:00:58 +01:00
ba70e8dd0d
ent 7914 status scaling time based
2022-11-02 12:58:45 +01:00
6a9e30ae6d
ent 7914 status scaling
2022-11-02 12:53:14 +01:00
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
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
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
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
382e74ae36
resolved conflict
2022-10-27 09:42:40 +02:00
8d611a8e7f
implemented float formatting and option in reports to change visualization format
2022-10-26 18:25:16 +02:00
1a0fa24188
ent 7914 restore migration script
2022-10-26 11:04:53 +02:00
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
47521e7e3c
ent 7914 database adjustements
2022-10-26 09:07:48 +02:00
90f8122232
ent 7914 table change for status scaling based on time
2022-10-26 08:51:51 +02:00
0f6f7b6563
ent 7914 status scaling based on time
2022-10-21 13:22:14 +02:00
0fd29caffe
ent 7914 status scaling based on time
2022-10-21 13:10:12 +02:00
688597a006
multiple external alert policies pandora_enterprise#8733
2022-10-20 16:42:26 +02:00
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
17d7261173
implement cluster in open project
2022-10-20 13:17:26 +02:00
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
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
3099ffa7cb
add mode maintenance VC pandora_enterprise#4822
2022-10-13 13:44:39 +02:00
9c93a99fb2
add mode maintenance VC pandora_enterprise#4822
2022-10-13 11:03:49 +02:00
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
2ea3c3038c
fixed vulnerabilities
2022-10-04 18:13:50 +02:00
05cbc2fb0e
fixed vulnerability
2022-10-04 18:00:47 +02:00
2d747caede
#4043 mr 58
2022-10-04 09:58:07 +02:00
c1b4501da5
resolved conflict
2022-10-03 14:41:14 +02:00
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
8438045cf6
filter recursive groups in events pandora_enterprise#2133
2022-09-29 12:54:46 +02:00
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
4dd0075b72
removed mr
2022-09-28 15:53:44 +02:00
042362991d
implemented option to skip inoperative interfaces on demand
2022-09-28 15:34:45 +02:00
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
9c7e70c7de
changes to mr
2022-09-27 17:19:10 +02:00
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
7e85bea0f4
added change to allow inventory modules to load script from a path
2022-09-26 15:30:31 +02:00
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
67c8a945bf
resolved conflict
2022-09-26 11:08:18 +02:00
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
23bb4d0750
minor fix
2022-09-23 13:00:28 +02:00
8918682f67
minor change
2022-09-23 09:58:37 +02:00
3bf2dd1b5c
make policy group application optional
2022-09-23 09:50:38 +02:00
96f81475f7
resolved conflict
2022-09-23 09:20:59 +02:00
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
2af04e7de0
change mr
2022-09-21 15:22:20 +02:00
d1cc2458b6
implemented alert commands and actions to send report by email
2022-09-13 12:16:53 +02:00
cefc5c4605
fixed size field bbdd tmodule_group pandora_enterprise#9453
2022-09-13 08:30:37 +02:00
9cdb8788ff
DB Files for IP Allow control
2022-09-12 12:41:33 +02:00
d53ee55663
#9331 Fixed wizard wmi
2022-09-08 15:18:48 +02:00
9f30d66328
Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien
2022-09-02 14:06:50 +02:00
d3612439fb
#8898 conflict resolved
2022-08-29 14:06:15 +02:00
de55200659
Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada
2022-08-29 10:06:41 +02:00
16554cfc7a
#8898 networkmap
2022-08-29 09:39:47 +02:00
fe4e27018c
Merge branch 'ent-9350-perdida-de-sincronizacion-en-modo-centralizado-y-duplicado-de-metaconsole_node_id' into 'develop'
...
fixed error metaconsole_node_id pandora_enterprise#9350
See merge request artica/pandorafms!5056
2022-08-25 12:48:26 +00:00
ded2fb08ff
implemented cron based scheduled downtimes
2022-08-16 18:42:51 +02:00
0d5640bf9b
ent 9398 fixed ip field tmetaconsole_agent
2022-08-16 12:31:42 +02:00
50bb50418d
fixed error metaconsole_node_id pandora_enterprise#9350
2022-08-12 11:34:35 +02:00
cd1dfa6361
fixed error metaconsole_node_id pandora_enterprise#9350
2022-08-12 11:32:07 +02:00
de1977fec1
Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal'
...
# Conflicts:
# pandora_console/extras/mr/56.sql
2022-08-10 11:26:05 +00:00
1e4fa95730
discovery server to none pandora_enterprise#9282
2022-08-08 12:24:04 +02:00
33f9972293
Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal'
...
# Conflicts:
# pandora_console/extras/mr/56.sql
2022-07-29 11:20:22 +00:00
027f61daff
Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
...
Conflicts:
pandora_console/extras/mr/56.sql
2022-07-19 10:18:04 +02:00
3ee8f6b431
Added switch to agetn conf to avoid automatic Ip update
2022-07-15 13:40:54 +02:00
4011ca99fe
#8769 Resolved conflict 2
2022-07-14 13:02:39 +02:00
e8c7c38c1f
#8732 Resolved conflict
2022-07-13 11:31:18 +02:00
994c76a39b
#8732 Added autoconfiguration scheduled
2022-07-08 11:02:58 +02:00
12f73d86fd
new filter search eventspandora_enterprise#8942
2022-07-05 17:02:40 +02:00
e839d82e00
resolved conflict
2022-07-04 13:40:06 +02:00
b43b7b4fa5
#9226 Added tuser_task tables
2022-07-01 10:37:08 +02:00
653226d45b
Clean version.
2022-06-23 19:54:26 +02:00
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
58f5f4e9f1
refactor events meta pandora_enterprise#9086
2022-06-23 12:47:49 +02:00
d6ab78ba68
Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop'
...
Ent 8912 problemas en recuperación alertas de evento necesaria refactorizacion
See merge request artica/pandorafms!4959
2022-06-23 07:53:11 +00:00
f241202168
Update delete_files.txt
2022-06-22 14:34:23 +00:00
59ea9a716e
Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion
2022-06-22 11:46:19 +02:00
44fdf1c321
#7926 Added asynchronous mode
2022-06-21 16:31:56 +02:00
036505fa68
Fix DB issue
2022-06-21 09:38:13 +02:00
71326bf8bb
Update pandoradb_migrate_6.0_to_759.mysql.sql
2022-06-20 14:57:45 +00:00
0c2823f23f
Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente
2022-06-17 12:38:11 +02:00
6d70353254
Fix mistake
2022-06-16 16:09:05 +00:00
33e1d7aca4
DB Changes
2022-06-16 16:49:09 +02:00
32bfa233d5
Merge
2022-06-16 11:45:58 +02:00
ea60e4be71
Added database changes
2022-06-16 11:14:00 +02:00
fa28b5b7e1
Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop'
...
Ent 9000 cambio update manager a warp update
See merge request artica/pandorafms!4957
2022-06-16 08:43:12 +00:00
709b49a371
Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop'
...
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql
See merge request artica/pandorafms!4954
2022-06-14 12:10:22 +00:00
ec7a2f89bd
revert migrate file
2022-06-14 10:17:43 +02:00
4d3d684eeb
revert migrate file
2022-06-14 10:15:15 +02:00
ac246aefb1
revert migrate file
2022-06-14 10:06:28 +02:00
c09d1334d6
revert migrate file
2022-06-14 10:05:05 +02:00
b5de60fb69
Update manager to Warp manager
2022-06-13 12:33:03 +02:00
519fd13299
#9134 Added dsiabled in mr
2022-06-09 15:22:14 +02:00
5297123d17
Console changes for 8950
2022-06-08 13:10:01 +02:00
6f0782782e
Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario
2022-06-08 11:54:35 +02:00
12b0f5cda1
database changes
2022-06-08 11:49:48 +02:00
c9b94273be
#8769 removed metaconsole_assigned_server
2022-06-07 15:21:07 +02:00
ea16aac7af
#8897 conflict resolved
2022-06-06 11:18:14 +02:00
91d949942a
Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario'
...
# Conflicts:
# pandora_console/extras/mr/55.sql
2022-06-03 10:26:35 +00:00
0a51c5f916
Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop'
...
Ent 8587 nueva representacion de servicios sunburst
See merge request artica/pandorafms!4819
2022-06-02 07:21:17 +00:00
fc7b4d8a11
#8897 Fixed tdashboard name
2022-05-25 13:13:09 +02:00
0d3b14da40
#9005 Added lts_name
2022-05-23 13:00:01 +02:00
5c789125f2
changed id_user field length from tusuario
2022-05-09 12:40:36 +02:00
aad40cb004
#8897 name changed
2022-05-04 16:11:08 +02:00
e272003396
Fix
2022-04-25 10:52:15 +02:00
9f1be4531b
#8587 Added sunburst
2022-04-12 17:24:47 +02:00
9406fa2c09
switch order of drops in MR
2022-04-08 11:31:36 +02:00
037bf016fb
Swap some stuff in MR becouse some environments had FK in deprecated tables
2022-04-07 17:26:14 +02:00
686ba0a5a5
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
...
Conflicts:
pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
2471bbf1d4
Merge branch 'ent-8540-contel-nuevo-informe-custom-render' into 'develop'
...
add new report custom render pandora_enterprise#8540
See merge request artica/pandorafms!4793
2022-04-06 12:16:26 +00:00
9de7f0564e
update version
2022-04-06 09:42:09 +02:00
c049f18bf1
Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render
2022-04-05 08:20:21 +02:00
71fef65f35
Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop'
...
implemented custom data filter in event view
See merge request artica/pandorafms!4787
2022-04-04 10:38:30 +00:00
e4c58fcb40
fix in UMC
2022-04-01 10:37:03 +02:00
318ac668e9
add new report custom render pandora_enterprise#8540
2022-03-31 20:11:52 +02:00
e70c85fc65
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
2022-03-30 15:05:04 +02:00
2ac8defa48
cleanup old UMC files from proyect
2022-03-30 14:54:08 +02:00
2d334f7860
Historical view for update manager
2022-03-30 14:41:47 +02:00
134ee890eb
Merge branch 'ent-8300-gestion-ejecucion-console-tasks' into 'develop'
...
Added enable console task feature
See merge request artica/pandorafms!4776
2022-03-30 09:29:22 +00:00
3e5865b539
Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos'
...
# Conflicts:
# pandora_console/extras/mr/53.sql
2022-03-30 08:03:08 +00:00
d137e0d798
implemented custom data filter in event view
2022-03-29 18:09:19 +02:00
44e93fa1ed
#8693 Emptying collate for alias and nombre
2022-03-28 13:48:33 +02:00
187a633bae
Fix mistake
2022-03-25 11:19:41 +00:00
cae8290c77
Missed MR file
2022-03-24 14:20:20 +01:00
0c41459b83
Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM'
...
# Conflicts:
# pandora_console/extras/mr/53.sql
2022-03-16 14:07:23 +00:00
4dc6f7764c
Merge branch 'ent-8400-borrado-backups-generados-por-tareas-de-consolas' into 'develop'
...
Missed tables
See merge request artica/pandorafms!4721
2022-03-15 10:09:32 +00:00
953aa2887c
Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop'
...
some tools for policy-auto-application
See merge request artica/pandorafms!4526
2022-03-01 12:53:36 +00:00
32c5396dd3
cleaned files
2022-02-25 14:12:12 +01:00
182fac98f1
Missed tables
2022-02-24 18:27:57 +01:00
c319c30e24
added new field to ipam vlan
2022-02-24 13:58:04 +01:00
3f7067fe48
Merge branch 'ent-I-do-now-like-procedures' into 'develop'
...
Allow both behaviours in alert time slots
See merge request artica/pandorafms!4711
2022-02-24 09:55:40 +00:00
bf88c54480
added new field to ipam vlan
2022-02-24 09:35:12 +01:00
deb46436d3
Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
...
Conflicts:
pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
9dc7c77cb0
remove procedure and retrocompatibility pandora_enterprise#3943
2022-02-23 10:58:38 +01:00
9f96c4e287
Merge branch 'ent-8551-cambio-nombre-fichero-migrate' into 'develop'
...
Moved migrate fielename
See merge request artica/pandorafms!4708
2022-02-23 08:25:09 +00:00
237a7feb98
remove procedure and retrocompatibility pandora_enterprise#3943
2022-02-22 13:20:53 +01:00
ef75a260d0
Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
2022-02-21 17:58:32 +01:00
6bd5624a81
Moved migrate fielename
2022-02-21 10:41:43 +01:00
5ba7b47b85
Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad
2022-02-18 09:26:55 +01:00
261fbe0ba3
Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
...
Conflicts:
pandora_console/extras/mr/52.sql
pandora_console/pandoradb.sql
2022-02-16 10:17:24 +01:00
bed223e27d
latest changes
2022-02-14 11:04:01 +01:00
9ba2eb0c74
Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
...
Conflicts:
pandora_console/extras/mr/52.sql
pandora_console/pandoradb.sql
2022-02-10 18:52:51 +01:00
8f59f4158f
Merge branch 'ent-8435-11626-Vulnerabilidad-JQuery' into 'develop'
...
Ent 8435 11626 vulnerabilidad j query
See merge request artica/pandorafms!4683
2022-02-10 11:05:53 +00:00
4a61efd7b6
added tpolicy_group_agents
2022-02-08 22:52:54 +01:00
816bbf4d00
#8435 Added jquery mobile 1.5
2022-02-07 12:29:57 +01:00
fcfb5e0d2a
Schema, allow certain autoconfigurations being disabled on MC environments
2022-02-07 11:26:36 +01:00
7b9790fa36
mig 6->7 alert_execution_Queue
2022-02-02 13:40:28 +01:00
cea110e209
Alert server improved
2022-02-02 13:37:45 +01:00
f1dca5e525
Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad
2022-02-02 10:38:53 +01:00
293c1cfb3a
Chaged to correct MR
2022-02-02 10:36:54 +01:00
b91109d747
Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios
2022-02-02 08:06:05 +01:00
74c2dafed0
added token to display or hide command in event response execution
2022-02-01 14:30:25 +01:00
a7da2faa32
alert template schedule pandora_enterprise#3943
2022-02-01 13:16:11 +01:00
34a9c2f1f2
Added token local user to allow enabling local auth at user level
2022-02-01 09:37:02 +01:00
15ada66942
alert template schedule pandora_enterprise#3943
2022-01-31 16:50:48 +01:00
c02abbc508
alert template schedule pandora_enterprise#3943
2022-01-31 13:45:44 +01:00
3f9b5f0a8a
fix mr and current package
2022-01-21 11:56:38 +01:00
c84a9a1634
Merge branch 'ent-7999-12427-introduccion-index-en-servicios' into 'develop'
...
Added index to service elements (modules)
See merge request artica/pandorafms!4621
2022-01-12 15:15:26 +00:00
46d995a983
Added index to service elements (modules)
2022-01-10 11:24:32 +01:00
1e92ad99ad
Fix merge
2022-01-05 11:14:04 +01:00
32a98ee5ae
Regenerate DB Backup Manager
2022-01-05 11:08:49 +01:00
02dfea8e58
Merge branch 'ent-8304-correccion-en-comportamiento-al-aplicar-politicas' into 'develop'
...
Fix db lock stopping policy apply
See merge request artica/pandorafms!4589
2021-12-27 12:46:17 +00:00
16c35a000e
Merge branch 'ent-8103-Metaconsole-vista-logs-auditoria' into 'develop'
...
Updated audit logs view and added controller
Closes pandora_enterprise#8103
See merge request artica/pandorafms!4582
2021-12-27 09:22:07 +00:00
1053062f72
Update pandora_console/extras/mr/51.sql
2021-12-16 11:48:03 +00:00
935c7f6937
fixed MR
2021-12-16 11:45:42 +01:00
0bad3761a7
Fix db lock stopping policy apply
2021-12-16 10:26:45 +01:00
b4131431af
fixed mr
2021-12-15 09:55:03 +01:00
4924e0d6bc
Updated audit logs view and added controller
2021-12-14 12:06:20 +01:00
f852df2f1c
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
b55679cbfd
Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites
2021-12-10 08:18:46 +01:00
b97ecda12b
db changes
2021-12-09 16:19:05 +01:00
5c25fa8406
mr updates and a pretty icon
2021-12-09 15:07:35 +01:00
cb6184a943
mr fix
2021-12-09 14:02:06 +01:00
2cbfca2cdd
mr rev + timap_sites
2021-12-09 13:51:20 +01:00
a94f6be37e
force db_process_sql
2021-12-03 12:59:50 +01:00
3e7a81ea33
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
00d79b553c
missing in merge mr
2021-12-02 14:46:31 +01:00
69590afef6
Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
...
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor
See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
cad0c6cea6
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-02 10:43:30 +01:00
345cbcf5ba
Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop'
...
fix setup centraliced active directory
See merge request artica/pandorafms!4540
2021-11-30 14:44:48 +00:00
347769299b
outocreate remote user centralized node
2021-11-30 14:23:19 +01:00
73cde9ee48
db changes
2021-11-29 14:58:34 +01:00
68c2400b9c
fix
2021-11-29 10:32:54 +01:00
9c17625c77
ncm2
2021-11-26 18:11:34 +01:00
ba8087f49b
ncm2 with schedules
2021-11-24 22:01:21 +01:00
5464a73a12
Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor
2021-11-24 13:28:36 +01:00
4dd931f277
Modules percentage threshold form
2021-11-24 11:33:36 +01:00
cbbfc337df
errata fix
2021-11-23 14:33:59 +01:00
a9485024f4
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-23 14:29:23 +01:00
41dcc95d5a
db changes
2021-11-23 14:26:11 +01:00
b8d884008b
Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls'
...
# Conflicts:
# pandora_console/extras/mr/51.sql
2021-11-22 11:44:06 +00:00
3f395f03dc
Added sql file
2021-11-22 12:33:31 +01:00
192237a452
Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls
2021-11-22 12:31:24 +01:00
3e90bb6490
minor change
2021-11-19 11:53:59 +01:00
582cb9a082
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +01:00
e3183d9e56
fix add file list delete files
2021-11-19 08:19:45 +01:00
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
c47c5e34f6
Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop'
...
set deployment_timeout per agent installation file
See merge request artica/pandorafms!4516
2021-11-18 16:34:12 +00:00
9ff3c8eee1
wip ncm2
2021-11-15 18:58:57 +01:00
c02c03df02
Merge branch 'ent-8099-Vulnerabilidad-JQuery-mobile' into 'develop'
...
Ent 8099 vulnerabilidad j query mobile
See merge request artica/pandorafms!4498
2021-11-15 11:13:07 +00:00
a96d5d68e3
MR updates for NCMv2
2021-11-10 17:13:17 +01:00
900a37ad5d
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-08 08:54:41 +01:00
ea747f25f3
Fix mr pandoradb migrate
2021-11-05 12:29:34 +01:00
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
53361484fd
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-03 11:16:46 +01:00
c73ee2d113
updated mr and version
2021-11-03 11:04:19 +01:00
25268ec9b4
color
2021-11-02 17:49:45 +01:00
08d4323941
set deployment_timeout per agent installation file
2021-11-02 17:37:47 +01:00
a5bf72cca0
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
05bc15f74c
#8099 Added jquery mobile 1.4.5
2021-10-25 11:09:24 +02:00
5ae3bbc4fe
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
2021-10-25 10:28:31 +02:00
796a7125e1
Errata fix
2021-10-21 14:33:44 +02:00
a03e46ecea
Fix parameters in cron_task_generate_report_by_template
2021-10-21 12:25:39 +02:00
df863c6057
minor fix NCM test script
2021-10-21 12:20:12 +02:00
303d6632e1
NCM
2021-10-21 11:28:14 +02:00
bb8dbc9332
NCM
2021-10-21 02:17:17 +02:00
9f71a9ba81
Fix mr 48 breaking tasks
2021-10-18 16:05:37 +02:00
6c0e2d23de
updates
2021-10-15 13:39:23 +02:00
75949691f3
fix mr
2021-10-14 21:22:21 +02:00
6a537e58f4
Fix
2021-10-14 21:09:14 +02:00
79174d512d
Added tncm_vendor and model to manage targetrs
2021-10-14 20:44:05 +02:00
96250dcfa0
WIP NCM
2021-10-13 22:47:31 +02:00
e986005cc0
#8090 Added auto_adjust in tlayout_template
2021-10-13 17:23:34 +02:00
d2f5a04583
WIP NCM
2021-10-11 20:42:43 +02:00
ef42348807
compat mysql 5.1 exceeded key
2021-10-08 16:02:06 +02:00
fa35e6054c
Fixes
2021-10-08 15:30:17 +02:00
1cb2f77945
WIP NCM
2021-10-08 15:12:23 +02:00
6781e513c8
NCM WIP
2021-10-06 19:52:46 +02:00
a70d48514e
Fix Barivion name in license and readme
2021-10-06 13:33:25 +02:00
b8dc85a0dd
wip
2021-10-05 16:42:24 +02:00
31f329a833
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
...
Conflicts:
pandora_console/vendor/composer/autoload_classmap.php
pandora_console/vendor/composer/autoload_static.php
2021-10-05 10:57:00 +02:00
e11d8f3766
minor schema update
2021-10-04 19:43:57 +02:00
6deaee84ac
Merge
2021-10-04 10:00:15 +02:00
be95b5ffd0
updates
2021-10-01 13:56:21 +02:00
277fcd51ca
minor changes
2021-09-30 16:02:14 +02:00
e237d7dd07
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/mr/50.sql
2021-09-30 12:24:19 +02:00
18b1a1e14e
Schema update to avoid using JSON columns until internal CICD is updated
2021-09-30 11:18:13 +02:00
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
d683e192b5
Moved changes for CorrelationServer schema to MR50
2021-09-29 13:43:08 +02:00
fc6fb36293
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-29 13:29:20 +02:00
15c2bdf17b
WIP NCM
2021-09-28 18:53:22 +02:00
894cd0974f
Merge branch 'ent-3407-Informes-en-IPAM' into 'develop'
...
Ent 3407 informes en ipam
See merge request artica/pandorafms!4424
2021-09-27 12:06:00 +00:00
631edabdf9
added changes to mr
2021-09-24 11:42:40 +02:00
9e0729574e
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-24 11:40:25 +02:00
7bfe699802
Fixes minor issues
2021-09-23 17:01:22 +02:00
12ddb4d792
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
2021-09-23 16:23:38 +02:00
ca46285a0e
Merge branch 'develop' into 'ent-3407-Informes-en-IPAM'
...
# Conflicts:
# pandora_console/extras/mr/50.sql
2021-09-23 13:33:02 +00:00
5b40a4f700
Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open
2021-09-23 08:50:50 +02:00
15ec0f4e4d
Fix delete_files
2021-09-22 14:25:44 +02:00
f3923326bc
resolved conflict
2021-09-22 11:08:37 +02:00
fc959f0bc6
created report for ipam networks
2021-09-21 15:59:14 +02:00
ce40b36923
Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
...
Ent 7582 anadir selector horas eventos
Closes pandora_enterprise#7582
See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
538da5ff30
Merge branch 'ent-7998-actualizar-mr' into 'develop'
...
updated MR and current_package token
See merge request artica/pandorafms!4406
2021-09-14 10:24:44 +00:00
c1332a1064
updated MR and current_package token
2021-09-14 12:20:53 +02:00
ae2dc6a0b6
moved to mr 49
2021-09-13 14:54:33 +02:00
10f1894b82
#7982 Added id_template_fields and id_template_conditions
2021-09-10 09:46:00 +02:00
34adf6e9e2
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
2021-09-08 21:21:45 +02:00
de0352f81c
MR changes
2021-09-01 09:35:31 +02:00
d5910e8a3a
Merge remote-tracking branch 'origin/develop' into ent-7587-error-nombre-idioma-aleman
2021-09-01 09:14:39 +02:00
f0791cbd4f
WIP CorrelationServer
2021-08-27 15:07:14 +02:00
c07a112f4b
migrate histrogram report items
2021-08-19 16:23:52 +02:00
fe30b9c785
Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
...
implemented capacity to handle string data for event data
See merge request artica/pandorafms!4184
2021-08-17 12:19:54 +00:00
54ae7e5783
modified availability report
2021-08-16 09:43:11 +02:00
7673e40613
Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop'
...
fixed font reference
See merge request artica/pandorafms!4238
2021-08-11 07:12:13 +00:00
ff93169049
Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
...
# Conflicts:
# pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
a5f9e74b50
#7881 Fixed snmp alert
2021-08-05 15:53:44 +02:00
befd3dcf15
Fix mr database name in update
2021-07-22 17:08:25 +02:00
ebc4df2080
Changes in debug_content db field
2021-07-22 15:20:06 +02:00
e4a08855e5
Exclude LOAD section from MR until UMC-756 is deployed
2021-07-21 18:09:20 +02:00
f71ae73c84
Load procedures (or complex queries) in UMC
2021-07-21 17:31:03 +02:00
0cec3afba0
Deactivated nodes if not unified
2021-07-19 13:47:43 +02:00
3880cf09ea
Fix german language misspell
2021-07-14 18:48:41 +02:00
ae9dbd9b8e
Fixed query - duplicated
2021-07-13 13:17:13 +02:00
84c7e6172a
Query updated
2021-07-13 13:14:48 +02:00
9b31906bdf
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
a4203aaee2
Ent 7272 nuevos elementos consola visual odómetro
2021-07-12 10:27:10 +00:00
554a32b567
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-09 14:40:44 +02:00
04c402bc03
Merge branch 'ent-7772-agentes-con-id-grupo-inexistente-entornos-metaconsola' into 'develop'
...
remove any agent belonging to a non-existent group
See merge request artica/pandorafms!4256
2021-07-06 09:29:14 +00:00
e6acc2c28b
restore centralised mode for all
2021-07-05 21:20:49 +02:00
9e49ed8efa
MR file for this feature
2021-07-05 17:43:17 +02:00
f52d389327
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-05 09:55:14 +02:00
367789f2dd
Ent 7775 eliminar event alerts metaconsola
2021-07-05 07:47:17 +00:00
159920a05d
Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop'
...
Add the AlertServer to the repo.
See merge request artica/pandorafms!4251
2021-07-02 09:15:27 +00:00
f8bcd1660f
Add the AlertServer to the repo.
...
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
2a964b52f1
remove any agent belonging to a non-existent group
2021-07-01 16:11:09 +02:00
074fbf916c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 20:03:07 +02:00
b37bbcd944
Ent 7143 autoajuste de la consola visual
2021-06-29 10:02:13 +00:00
c64b972564
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 10:51:55 +02:00
f74b74675a
Removed new wiki url from talert_templates and actions from mr and added to migrate
2021-06-28 09:58:29 +00:00
548c0c3013
fixed font reference
2021-06-28 11:27:41 +02:00
7fa398b027
fixed font reference
2021-06-28 11:25:22 +02:00
4c2ac234b8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
497ecb329d
Changed new wiki url on helps
2021-06-24 12:31:15 +00:00
faa9fee273
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
pandora_agents/unix/Darwin/dmg/resources/text/license.html
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/48.sql
2021-06-21 17:33:45 +02:00
7937a988df
Merge branch 'ent-5023-limpiar-toda-referencia-a-event-alert' into 'develop'
...
remove help_event_alert.php
See merge request artica/pandorafms!3057
2021-06-21 14:08:03 +00:00
ebceaebb58
Ent 7253 opcion formato envio informes templates
2021-06-21 13:41:14 +00:00
827524e6d2
Update delete_files.txt
2021-06-21 06:12:55 +00:00
43cd308ef1
fixed conflicts and add removed files in delete_files.txt
2021-06-18 12:37:06 +02:00
81254cf3fb
WIP Plugins sync
2021-06-16 18:18:38 +02:00
841842da59
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
2021-06-16 08:46:21 +02:00
64dd4f2c2b
Wip command center, Plugins in meta
2021-06-15 17:24:03 +02:00
14495ebdc3
Current package updates
2021-06-15 11:06:46 +02:00
94cd4c96dd
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
d8dcdb5af4
Wip command center, alerts SNMP source in mr file
2021-06-07 10:32:59 +02:00
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
8d847bb071
Merge branch 'ent-7544-11866-bug-en-datos-inc-con-18-digitos' into 'develop'
...
Enlarge numeric data fields
See merge request artica/pandorafms!4151
2021-05-26 13:35:50 +00:00
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
e6713c2f2c
#6917 metaconsole config changes
2021-05-25 09:58:18 +00:00
d95eec0188
Enlarge numeric data fields
2021-05-25 09:57:23 +02:00
337450a1f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/ajax.php
pandora_console/extras/delete_files/delete_files.txt
2021-05-24 17:41:28 +02:00
8c0a9859a8
remove synch old and check api
2021-05-19 17:08:13 +02:00
09ccaf254e
Fixed public access and added PublicLogin interface, including code style fixex
2021-05-19 11:31:52 +02:00
a0982cd260
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/users/profile_list.php
2021-05-18 08:39:06 +02:00
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +02:00
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
5b376568a4
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/47.sql
2021-05-13 08:25:59 +02:00
13fa1159ce
Merge branch 'ent-6858-Goliat-opensource' into 'develop'
...
Backup upload
See merge request artica/pandorafms!3936
2021-05-12 13:10:48 +00:00
3758c80019
Fixed delete_files entries.
2021-05-12 13:07:45 +00:00
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
9e9ea4d00a
Merge with last develop
2021-05-12 09:17:32 +02:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
55a1ea6f2a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-04 17:19:35 +02:00
34b02982e1
Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag
2021-04-30 15:01:43 +02:00
366e9a08d5
minor fix
2021-04-30 14:36:47 +02:00
6b83deacdd
Migrate old rules
2021-04-30 14:34:10 +02:00
2ca981b03e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-29 08:34:41 +02:00
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
78487fa4e5
Auto-synchronizer MC
2021-04-22 15:37:59 +02:00
100ae705f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 13:33:40 +02:00
b8b9fa561f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 08:07:21 +02:00
50f580c112
Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas
2021-04-19 14:35:59 +02:00
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214
2021-04-15 00:20:42 +02:00
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b730
2021-04-14 21:42:19 +02:00
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
1b21652ed2
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-14 08:35:02 +02:00
3d359dab36
Fixed merge with 7161
2021-04-13 12:55:35 +02:00
751d7ec3cf
Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop'
...
Ent 7161 cambiar opciones de skin en usuarios y grupos
See merge request artica/pandorafms!3972
2021-04-13 09:26:50 +00:00
9bbac06771
Ent 7161 cambiar opciones de skin en usuarios y grupos
2021-04-13 09:26:50 +00:00
4a028b2ee3
Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo'
...
# Conflicts:
# pandora_console/extras/mr/46.sql
2021-04-13 07:52:48 +00:00
alejandro.campos@artica.es
Daniel Rodriguez
Jonathan
Daniel Cebrian
Diego Muñoz-Reja
daniel
Calvo
Rafael Ameijeiras
alejandro
Daniel Maya
edu.corral
Jimmy Olano
José González
Ramon Novoa
Luis
vanessa gil
José González
Daniel Maya
fbsanchez
Jose Gonzalez
Ramon Novoa
Marcos Alconada
marcos