d4e2fb4fea
resolved conflict
2023-09-21 18:04:15 +02:00
56cb2c3232
Merge branch 'ent-12060-quitar-subrayado-curvo-en-las-pestanas-de-eventos' into 'develop'
...
Ent 12060 quitar subrayado curvo en las pestanas de eventos
See merge request artica/pandorafms!6453
2023-09-21 15:45:50 +00:00
fb45a73279
Merge branch 'ent-12027-tree-view-muestra-raro-los-elementos-en-modo-quiet' into 'develop'
...
Ent 12027 tree view muestra raro los elementos en modo quiet
See merge request artica/pandorafms!6473
2023-09-21 15:45:12 +00:00
bcd12e8ffd
Merge branch 'ent-12038-meter-enlace-a-setup-en-el-header' into 'develop'
...
Ent 12038 meter enlace a setup en el header
See merge request artica/pandorafms!6474
2023-09-21 15:42:43 +00:00
d136b7a9e3
Merge branch 'ent-9857-complex-alert-processing' into 'develop'
...
Ent-9857-complex-alert-processing
Closes pandora_enterprise#9857
See merge request artica/pandorafms!6347
2023-09-21 15:41:24 +00:00
902317fa70
Merge branch 'ent-12097-operacion-view-summary-en-discovery-tasks-no-funciona' into 'develop'
...
Ent 12097 operacion view summary en discovery tasks no funciona
See merge request artica/pandorafms!6479
2023-09-21 15:40:57 +00:00
576ee1bf37
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop'
...
Ent 11965 Security hardening: Console - Vistas estaticas
See merge request artica/pandorafms!6370
2023-09-21 14:57:06 +00:00
e637866f72
#12100 Fix custom graph
2023-09-21 16:11:58 +02:00
80b0522c7c
#12097 Fix view discovery
2023-09-21 14:21:54 +02:00
d7f774bf57
#12099 Fix filter header
2023-09-21 13:12:11 +02:00
7d5f4f17c6
#12097 Fix view summary in discovery task
2023-09-21 13:06:39 +02:00
f46626e120
refactor cluster view pandora_enterprise#12032
2023-09-21 10:21:45 +02:00
192ec72b32
#12038 header link setup
2023-09-21 10:06:08 +02:00
23756e8495
#12038 header link setup
2023-09-21 08:46:09 +02:00
963664c1d8
Auto-updated build strings.
2023-09-21 01:00:30 +02:00
dbd418d6dc
remove trace
2023-09-20 16:01:23 +02:00
ae74caf7b1
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
2023-09-20 15:52:56 +02:00
2f95504038
Merge branch 'ent-12001-modulos-de-inventario-no-se-muestran' into 'develop'
...
Ent 12001 Módulos de inventario no se muestran
See merge request artica/pandorafms!6465
2023-09-20 13:49:07 +00:00
6f8212ed40
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
2023-09-20 15:46:47 +02:00
976a32617f
Add logic to complex alerts
2023-09-20 08:18:39 -05:00
2de84982cf
Updates to save new Complex templates
2023-09-20 08:16:22 -05:00
dc9b47a904
#12027 tree view quiet mode
2023-09-20 13:51:56 +02:00
ff2cc62c4f
Merge branch 'ent-11921-discovery-2-0-crear-paquetes-especificos-de-server-y-consola-el7-y-el8-con-los-binarios-del' into 'develop'
...
Add open discovery to packaging
See merge request artica/pandorafms!6448
2023-09-20 11:18:18 +00:00
05320f7ad4
#11990 Fixed enable_horizontal_tree
2023-09-20 12:42:01 +02:00
73d179e52f
#12001 added autoselect module in inventory
2023-09-20 12:14:55 +02:00
fcefe5a225
#12044 fix acoustic console open error 500
2023-09-20 12:07:19 +02:00
aea61a6144
#12060 fix border radius sound events
2023-09-20 11:57:16 +02:00
06e23338cb
Merge branch 'ent-12089-lineas-dobles-en-la-vista-de-modulos' into 'develop'
...
Ent 12089 lineas dobles en la vista de modulos
See merge request artica/pandorafms!6466
2023-09-20 09:00:41 +00:00
65b4bba0c6
Merge branch 'ent-11807-security-hardening-console-informes' into 'develop'
...
Ent 11807 Security hardening: Console - Informes
See merge request artica/pandorafms!6292
2023-09-20 07:59:02 +00:00
92b8446110
Auto-updated build strings.
2023-09-20 01:00:27 +02:00
954a225279
#12090 Fix intervals
2023-09-19 17:47:12 +02:00
cba3e39f6c
Merge branch 'develop' into ent-11807-security-hardening-console-informes
2023-09-19 17:32:06 +02:00
32b7a103eb
#12001 fixed list modules when select agent
2023-09-19 17:26:36 +02:00
6609571482
#12089 Add nowrap class to timestamp
2023-09-19 17:21:44 +02:00
940447d2b0
#12050 new icon security hardening widget
2023-09-19 16:43:55 +02:00
1465400fb6
#12001 fixed filter in inventary
2023-09-19 16:22:58 +02:00
f5c4ce872b
Merge branch 'ent-11729-plugin-proxmox-discovery-disco' into 'develop'
...
Added Proxmox discovery APP to MR and pandoradb_data
See merge request artica/pandorafms!6443
2023-09-19 10:16:53 +00:00
8b267c530f
Merge branch 'ent-12006-filtro-order-by-agent-de-inventario-rompe-la-vista-si-se-especifica-modulo' into 'develop'
...
Ent 12006 Filtro "Order by agent" de inventario rompe la vista si se especifica módulo
See merge request artica/pandorafms!6459
2023-09-19 10:09:40 +00:00
e5ea35abca
Merge branch 'ent-12072-error-al-crear-item-sql-en-metaconsola-con-local-metaconsole' into 'develop'
...
fix error report sql pandora_enterprise#12072
See merge request artica/pandorafms!6458
2023-09-19 10:09:02 +00:00
7a725d0c16
Merge branch 'develop' into 'ent-11729-plugin-proxmox-discovery-disco'
...
Conflicts:
pandora_console/extras/mr/66.sql
2023-09-19 08:42:38 +00:00
0a7152f3fa
#12050 align text left in widget
2023-09-19 09:44:46 +02:00
592d7ab745
#11807 fixed empty field agent
2023-09-19 09:21:42 +02:00
1bb1bb11b2
Auto-updated build strings.
2023-09-19 01:00:29 +02:00
6e794f74bb
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard
2023-09-18 16:54:16 +02:00
b85d622d51
Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas
2023-09-18 16:52:57 +02:00
a1fd85f486
Merge branch 'develop' into ent-11807-security-hardening-console-informes
2023-09-18 16:49:00 +02:00
2d7baeb912
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard
2023-09-18 16:30:24 +02:00
ed8f766c00
Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas
2023-09-18 16:27:37 +02:00
5491feb845
#12050 control widget installed only in interprise
2023-09-18 16:09:23 +02:00
67ebf73bc0
#12050 widget security hardening
2023-09-18 15:57:09 +02:00
83732250da
Merge branch 'ent-11363-automonitoring-alertserver' into 'develop'
...
Ent-11363-automonitoring-alertserver
Closes pandora_enterprise#11363
See merge request artica/pandorafms!6406
2023-09-18 13:20:37 +00:00
ce38970c38
Merge branch 'ent-12007-16207-error-vmware-en-discovery-por-falta-de-atributo' into 'develop'
...
Changed version for VMware discovery plugin
See merge request artica/pandorafms!6439
2023-09-18 13:19:33 +00:00
a75369aeda
Merge branch 'ent-11839-error-en-direccion-url-por-correo-electronico-con-incorrect-config-value-y-error-en-causa-raiz' into 'develop'
...
Ent 11839 error en direccion url por correo electronico con incorrect config value y error en causa raiz
See merge request artica/pandorafms!6381
2023-09-18 13:18:36 +00:00
1e9e74ce92
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard
2023-09-18 12:15:17 +02:00
adbbb688de
#12006 fixed interface in inventary widget
2023-09-18 12:11:45 +02:00
b167a4b4c5
fix error report sql pandora_enterprise#12072
2023-09-18 11:55:01 +02:00
6ecd8ca899
Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
...
Draft: Ent 10065 post filtros de eventos privados
See merge request artica/pandorafms!6318
2023-09-18 07:55:18 +00:00
ca928bd4a4
#11807 new input interval in report hardening
2023-09-18 09:41:53 +02:00
ecba5065d4
Merge branch 'ent-11806-16007-icono-de-edicion-de-alertas-en-agente-no-tiene-el' into 'develop'
...
Ent 11806 16007 icono de edicion de alertas en agente no tiene el
See merge request artica/pandorafms!6449
2023-09-18 07:23:01 +00:00
b568085841
Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop'
...
not show edition buttons of alert detail pandora_enterprise#12035
See merge request artica/pandorafms!6444
2023-09-18 07:22:13 +00:00
bed83f1406
11839-Add max in User->Block size pagination
2023-09-18 08:23:05 +02:00
2c055a4488
Auto-updated build strings.
2023-09-18 01:00:20 +02:00
4450f4d5fe
Auto-updated build strings.
2023-09-17 01:00:20 +02:00
495780b8a8
Auto-updated build strings.
2023-09-16 01:00:25 +02:00
25e0834db0
Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas
2023-09-15 14:57:18 +02:00
f1c153231f
#11807 added period in evolution
2023-09-15 14:55:49 +02:00
08fe98a8ba
fixed filter display permissions in modal
2023-09-15 13:57:14 +02:00
9394446a1e
Fix inventory view agent secondary groups
2023-09-15 13:46:29 +02:00
2844dfd4f0
#11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports
2023-09-15 13:34:07 +02:00
95f9ddba01
Auto-updated build strings.
2023-09-15 01:00:29 +02:00
977a18b829
#11807 fixed pdf exports in hardening
2023-09-14 17:56:19 +02:00
09bcedde62
ITSM pandora_enterprise#11471
2023-09-14 16:36:52 +02:00
c05178ccf9
Merge branch 'ent-12033-vista-tactica-vista-de-servidores-no-muestra-modulos-de-red' into 'develop'
...
Fix counters tactical view pandora_enterprise#12033
See merge request artica/pandorafms!6441
2023-09-14 12:34:58 +00:00
5f35bbc1c0
#12060 fix line active
2023-09-14 13:01:54 +02:00
c101389a26
#12050 new widget security hardening
2023-09-14 12:44:03 +02:00
c62a3aa2f4
Added execution permission for console disco binaries
2023-09-14 12:03:51 +02:00
f410f09745
change mr
2023-09-14 10:43:35 +02:00
af968b5e13
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
2023-09-14 08:08:05 +02:00
018938cb8e
Auto-updated build strings.
2023-09-14 01:00:27 +02:00
0f13b6d862
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard
2023-09-13 15:05:01 +02:00
046657e78a
Merge branch 'ent-12028-la-vista-group-detail-no-esta-mostrando-los-agentes-que-tienen-el-grupo-mostrado-como-gru' into 'develop'
...
Ent 12028 La vista "group detail" no está mostrando los agentes que tienen el grupo mostrado como grupo secundario
See merge request artica/pandorafms!6446
2023-09-13 12:50:55 +00:00
69030a9e3b
Merge branch 'ent-12010-header-de-los-welcome-tips-se-corta' into 'develop'
...
Ent 12010 Header de los Welcome Tips se corta
See merge request artica/pandorafms!6445
2023-09-13 12:46:07 +00:00
e2cf8de7a9
fixed errors pandora_enterprise#12035
2023-09-13 14:15:07 +02:00
8ecb57a498
#11807 fixed bug in open
2023-09-13 13:53:53 +02:00
db20db8244
#11965 fixed bug in opensource
2023-09-13 13:12:23 +02:00
d1fcbca557
Merge branch 'ent-10846-Vista-HA-en-Metaconsola' into 'develop'
...
implemented database ha view in metaconsole
See merge request artica/pandorafms!6275
2023-09-13 10:47:03 +00:00
8f146d1af7
Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into ent-12050-security-hardening-console-widget-dashboard
2023-09-13 09:52:09 +02:00
959a2e9110
11806-Add alert icon in Manage agent
2023-09-13 08:14:11 +02:00
a46a43fd89
Auto-updated build strings.
2023-09-13 01:00:30 +02:00
8ae2631a56
Add open discovery to packaging
2023-09-12 16:46:05 +02:00
9619854ba2
#12028 added secondary groups in tactical view
2023-09-12 16:35:45 +02:00
91aee79ab2
#12037 Resolve conflicts
2023-09-12 15:07:00 +02:00
8e29973128
ITSM pandora_enterprise#11471
2023-09-12 13:10:23 +02:00
1a9b770a9e
#12010 fixed header modal
2023-09-12 12:42:40 +02:00
802f0bf83b
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
2023-09-12 12:37:31 +02:00
16f1d80919
not show edition buttons of alert detail pandora_enterprise#12035
2023-09-12 12:30:52 +02:00
8d0213f841
#11807 fixed selected module in report list check
2023-09-12 12:13:01 +02:00
64effb2e91
Added Proxmox discovery APP to MR and pandoradb_data
2023-09-12 11:48:29 +02:00
1cd5d1b0fa
#11965 new view hardening
2023-09-12 10:45:23 +02:00
6f5b20ac54
Changed version for VMware discovery plugin
2023-09-12 09:51:49 +02:00
Daniel Maya
Rafael Ameijeiras
Diego Muñoz-Reja
miguel angel rasteu
daniel
Jonathan
artica
alejandro.campos@artica.es
felix.suarez
Daniel Cebrian
Enrique Martin
Daniel Rodriguez
Pablo Aragon
Jorge Rincon
Calvo