53b56b31af
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-14 08:38:52 +01:00
88784de3ef
#12143 fix datepicker dashboard widget hardening
2023-12-13 13:03:08 +01:00
5fa9cd5877
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
2023-12-13 11:19:32 +01:00
f4d2a40f13
Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
2023-12-13 10:58:57 +01:00
cc12c77008
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/include/styles/pandora.css
2023-12-13 10:39:48 +01:00
a3feac4f2e
#12065 Resolve conflicts
2023-12-13 08:32:12 +01:00
206bdc4acb
Merge branch 'ent-12168-GISS-Jerarquia-en-vista-de-arbol-de-servicios-no-se-muestra-bien-al-hacer-búsquedas-en-el-filtro-Nodo-y-Meta' into 'develop'
...
Ent 12168 giss jerarquia en vista de arbol de servicios no se muestra bien al hacer búsquedas en el filtro nodo y meta
See merge request artica/pandorafms!6547
2023-12-11 14:45:36 +00:00
fd212e7c20
fix error hide/show input sliced mode pandora_enterprise#9640
2023-12-11 11:24:45 +01:00
a418673489
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-11 11:09:54 +01:00
49fd9435dd
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-12-11 10:13:46 +01:00
385989f185
Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop'
...
VC Public links pandora_enterprise#12329
See merge request artica/pandorafms!6633
2023-12-07 15:27:57 +00:00
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
5c6f11511c
fix error events sound modal pandora_enterprise#12607
2023-12-05 16:48:12 +01:00
77cf0ce6ca
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/include/styles/pandora.css
2023-12-05 08:02:55 +01:00
5191739658
#12542 fixed local component module group
2023-12-01 12:05:42 +01:00
87f4a6e15f
#12384 Fixed acl
2023-12-01 10:08:25 +01:00
8cfb0353dd
Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop'
...
fix sound alerts severity filter pandora_enterprise#12378
See merge request artica/pandorafms!6663
2023-11-30 11:41:30 +00:00
c41b360a6e
#8365 merge conflict
2023-11-30 12:04:28 +01:00
b99c9240de
#8365 NCM Merge conflict
2023-11-30 08:32:15 +01:00
75d57337af
#11705 Fix merge conflict
2023-11-30 08:10:32 +01:00
7a5201db4f
#8365 NCM V3 Minor fix
2023-11-29 16:31:06 +01:00
f1a8c4b31d
#12541 change message export graph
2023-11-29 16:12:12 +01:00
b6722214de
#12541 changes in graph analytics
2023-11-29 15:43:38 +01:00
0d285802b1
#12520 Fixed form
2023-11-29 15:32:46 +01:00
33ca5ab4ab
Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
...
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer
See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
447e788ab3
Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
...
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado
See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
837f1ff73c
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 13:04:13 +01:00
730cfb30ff
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
...
Conflicts:
pandora_console/include/styles/pandora.css
2023-11-28 08:40:07 +01:00
9819c3a5ff
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-28 08:30:23 +01:00
f6f0f15731
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
2dec31485a
Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer
2023-11-28 08:19:53 +01:00
3b2c5237d1
Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'
...
Ent 12036 error en el nombre de la copia de un dashboard cualquiera
See merge request artica/pandorafms!6457
2023-11-28 07:09:11 +00:00
def169abb8
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 07:58:50 +01:00
964321d1bd
Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
...
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas
See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
95cf2a2654
Merge branch 'ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar' into 'develop'
...
Ent 12268 dashboard widget de eventos no se puede clickar
See merge request artica/pandorafms!6620
2023-11-27 12:05:52 +00:00
47a0c8e956
Merge branch 'ent-11442-consejos-de-bienvenida-tienen-controles-confusos' into 'develop'
...
Ent 11442 consejos de bienvenida tienen controles confusos
See merge request artica/pandorafms!6414
2023-11-27 10:47:18 +00:00
e744942f33
Merge branch 'ent-12164-no-se-establece-el-intervalo-inverso-en-los-modulos-creados-a-traves-de-remote-components' into 'develop'
...
Ent 12164 no se establece el intervalo inverso en los modulos creados a traves de remote components
See merge request artica/pandorafms!6530
2023-11-27 10:33:28 +00:00
9f72dd7d6e
#12200 Added setup flag for easter egg
2023-11-24 14:01:17 +01:00
51a152d86d
#12202 Added setup flag for easter egg
2023-11-24 13:25:42 +01:00
305f8c7658
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
2023-11-23 14:18:44 +01:00
b497e573fe
fix modal events sound bottom bar pandora_enterprise#12378
2023-11-23 14:18:29 +01:00
4f707a5a1b
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-23 09:27:46 +01:00
b6582b7f7e
#12202 added Asteroids game
2023-11-22 13:30:44 +01:00
89be9af98f
#11442 Fix conflicts
2023-11-17 12:33:33 +01:00
4ba13ad0e7
#12200 increase the duration of the snow effect from about
2023-11-17 10:07:13 +01:00
8635617815
#12200 The Christmas effect is added after 25 clicks on the about image
2023-11-16 10:24:03 +01:00
33c4833200
fix image pdf pandora_enterprise#12472
2023-11-15 17:28:16 +01:00
f725752f32
#12168 fixed filter in service tree genealogy
2023-11-14 12:33:29 +01:00
04649dee00
#12168 Fixed sql bringing main services
2023-11-13 13:41:47 +01:00
813bc4b851
#12424 class error input ranges warning critical
2023-11-13 09:49:19 +01:00
8ca94d4096
#11126 fixed normal link graph
2023-11-10 10:47:26 +01:00
ca8d0ed7f8
Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop'
...
Ent 12376 Problemas vistos en la nueva vista táctica
See merge request artica/pandorafms!6628
2023-11-08 13:36:10 +00:00
8f8e5ecf45
#12376 multiple changes in general tactical view
2023-11-07 13:18:44 +01:00
aaa590b65f
VC Public links pandora_enterprise#12329
2023-11-07 09:20:48 +01:00
5486b500f0
Add action ITSM in SNMP alert pandora_enterprise#12327
2023-11-06 13:12:14 +01:00
513a0bc296
#8365 Added csv report for device lists.
...
Fixed overlay for modals
2023-11-03 14:25:44 +01:00
ab6aa1ba57
#12268 dashboard widget events redirect event view
2023-11-02 17:13:16 +01:00
868700f9f1
add sliced mode simple graph reports and CV pandora_enterprise#9640
2023-10-25 15:55:54 +02:00
d8dfaf0fe3
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-10-23 17:02:51 +02:00
ef70444d71
add sliced mode simple graph widget pandora_enterprise#9640
2023-10-23 17:02:08 +02:00
4d5917e4b7
#12269 widget editor title name widget
2023-10-23 14:56:09 +02:00
0e58c64a39
#12260 Adjusted icon path depending on icon extension
2023-10-23 11:14:30 +02:00
48c314669a
Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop'
...
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)
See merge request artica/pandorafms!6485
2023-10-23 07:24:20 +00:00
9aee38aa0b
Merge branch 'ent-11391-pandora-indexer-cambios-en-el-collector-de-logs' into 'develop'
...
#11391 Fixed ace editor and log viewer
See merge request artica/pandorafms!6461
2023-10-23 07:19:51 +00:00
13ba9aff39
#12168 filtered only for services
2023-10-20 10:49:08 +02:00
581d78fc33
Merge branch 'develop' into ent-12168-GISS-Jerarquia-en-vista-de-arbol-de-servicios-no-se-muestra-bien-al-hacer-búsquedas-en-el-filtro-Nodo-y-Meta
2023-10-20 09:15:04 +02:00
ec8fed69b3
#12168 tree hierarchical filtering
2023-10-19 15:04:49 +02:00
eb5e56cc78
Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile
2023-10-19 08:16:33 +02:00
a840550759
Merge branch 'ent-11818-16015-mapas-de-red-se-descolocan-tras-aparecer-un-nuevo-dispositivo' into 'develop'
...
Ent 11818 16015 mapas de red se descolocan tras aparecer un nuevo dispositivo
See merge request artica/pandorafms!6535
2023-10-17 13:08:52 +00:00
55c5251a67
Merge branch 'ent-12113-desplegable-de-credenciales-discovery-se-queda-abierto-tras-seleccionar' into 'develop'
...
Ent 12113 desplegable de credenciales discovery se queda abierto tras seleccionar
See merge request artica/pandorafms!6504
2023-10-17 12:27:17 +00:00
d54a6faede
#10194 adjust bars 24 hrs in events and changed numbers
2023-10-16 20:47:47 +02:00
9237e4038a
Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion
2023-10-16 17:10:33 +02:00
744a563034
Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile
2023-10-11 10:50:05 +02:00
d19b506781
fix cv in mobile pandora_enterprise#12196
2023-10-11 10:48:26 +02:00
a02482ac5d
#10194 added links
2023-10-10 15:15:43 +02:00
d3ada18866
fix cv in mobile pandora_enterprise#12196
2023-10-10 09:38:50 +02:00
2c352ad9dd
#10194 new graph for license and changes in design
2023-10-09 19:04:01 +02:00
a822f6db86
Fix discovery migration bugs
2023-10-09 16:52:52 +02:00
588f19fa18
fix cv in mobile pandora_enterprise#12196
2023-10-06 12:59:33 +02:00
1a89761727
#10194 adjust max height divs
2023-10-05 18:15:33 +02:00
d091ee8194
Migration dicovery fix bugs and changed script paths
2023-10-05 10:52:52 +02:00
9bdaed3cd0
#11818 Fixed refresh
2023-10-05 09:31:43 +02:00
b9d08c2e0c
#12164 Fix inverse interval in remote components
2023-10-03 15:49:19 +02:00
438cb11f95
#10194 added automonitoritation modules and interval refresh async
2023-10-02 16:44:53 +02:00
528c5a726a
Merge branch 'develop' into ent-11391-pandora-indexer-cambios-en-el-collector-de-logs
2023-10-02 10:27:14 +02:00
bfe9bcaac0
Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda
2023-09-29 15:18:08 +02:00
b1fa001fe8
#12091 Change selection type in agents and modules in Bulk Operations Add alerts
2023-09-29 12:50:18 +02:00
b8df74dace
Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion
2023-09-28 16:22:58 +02:00
9f5836e2cc
#10194 new sections in general tactical view
2023-09-28 16:10:57 +02:00
b84ffc124b
Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop'
...
fix show comment events ticket pandora_enterprise#12066
See merge request artica/pandorafms!6488
2023-09-28 14:06:30 +00:00
6db13cc55a
merge conflict solution
2023-09-28 13:14:49 +02:00
05cd8142bf
Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
...
wip integration integriaIMS pandora_enterprise#11471
Closes pandora_enterprise#11471
See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
d1f2fa4b44
#12113 Set select to close when an option is chosen
2023-09-27 10:50:33 +02:00
03700d2653
Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
...
refactor cluster view pandora_enterprise#12032
See merge request artica/pandorafms!6476
2023-09-26 15:15:27 +00:00
91393c9e39
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
...
Conflicts:
pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
e5c5f91576
#11705 change name event_custom_id
2023-09-25 10:32:23 +02:00
b1c3eb7f3c
Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop'
...
Ent 12100 graph analysis no puedo exportar a grafica combinada
See merge request artica/pandorafms!6483
2023-09-25 07:11:48 +00:00
c6a04d5d8f
fix show comment events ticket pandora_enterprise#12066
2023-09-22 12:56:01 +02:00
79fe89c3c5
#11705 new custom_field tevento
2023-09-22 12:24:15 +02:00
e637866f72
#12100 Fix custom graph
2023-09-21 16:11:58 +02:00
Jonathan
daniel
miguel angel rasteu
Rafael Ameijeiras
Matias Didier
Jorge Rincon
Daniel Maya
Daniel Cebrian
Diego Muñoz-Reja
Daniel Rodriguez
Calvo