855fc32a7d
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/include/javascript/pandora.js
pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
0ac20717f1
#12200 resolved conflict
2023-12-18 13:15:42 +01:00
c700633fce
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
...
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
2023-12-18 10:54:27 +00:00
8aeee6d876
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-18 11:15:18 +01:00
3fe41179e0
Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
...
Ent 12216 entradas fantasma para elementos de discovery offline
See merge request artica/pandorafms!6740
2023-12-15 09:22:10 +00:00
ea97bb8f60
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
2023-12-14 13:27:03 +01:00
60a2557878
Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop'
...
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion
See merge request artica/pandorafms!6451
2023-12-14 11:19:25 +00:00
352434d69a
Merge branch 'ent-12132-bug-en-welcome-tips-con-muchos-tips' into 'develop'
...
Ent 12132 bug en welcome tips con muchos tips
See merge request artica/pandorafms!6557
2023-12-14 11:03:37 +00:00
2890fd3dab
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-14 11:05:29 +01:00
6e150c1bc2
#12560 alert update manager
2023-12-14 08:59:13 +01:00
645c2d886a
Merge branch 'ent-12390-item-heatmap-se-rompe-al-no-elegir-grupo' into 'develop'
...
Ent 12390 item heatmap se rompe al no elegir grupo
See merge request artica/pandorafms!6652
2023-12-13 12:17:10 +00: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
c593161525
#12398 change urls wiki
2023-12-12 12:22:51 +01:00
812e47603e
some changes in audit view
2023-12-11 18:05:58 +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
ab370f1cf6
Merge branch 'ent-12096-arreglar-apostrofe-en-texto-let-s-do-it-del-mensaje-de-bienvenida' into 'develop'
...
Ent 12096 arreglar apostrofe en texto let s do it del mensaje de bienvenida
See merge request artica/pandorafms!6484
2023-12-11 14:45:06 +00:00
7f75445d75
Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop'
...
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0
See merge request artica/pandorafms!6410
2023-12-11 14:30:51 +00:00
43fd67b072
Merge branch 'ent-12058-incluir-version-de-mysql-en-about-y-diagnostic-info' into 'develop'
...
Ent 12058 incluir version de mysql en about y diagnostic info
See merge request artica/pandorafms!6481
2023-12-11 14:28:31 +00:00
c8e7e1e375
Added text to welcome wizard
2023-12-11 12:08:50 +01:00
8d4e3e78a3
#12579 fixed icons as buttons in action on satellite server agents
2023-12-07 16:00:42 +01:00
0bdc6978e6
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
...
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
2023-12-05 15:30:06 +00:00
457f8e9448
some changes in discovery
2023-12-05 16:07:14 +01:00
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +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
75ddb3b934
minor changes in demo data functionality
2023-12-04 11:37:12 +01:00
b89f182e19
#12213 Resolve conflicts
2023-12-01 10:31:50 +01:00
c4e5a3bebd
Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop'
...
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso
See merge request artica/pandorafms!6501
2023-11-30 12:48:00 +00:00
ca17eef68a
implement load demo data
2023-11-29 18:09:32 +01:00
eebab43e36
Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop'
...
Ent 11907 incluir distro y version en about y diagnostic info
See merge request artica/pandorafms!6420
2023-11-29 14:34:05 +00: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
64cb2ad912
Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop'
...
Ent 11911 welcome dialog no detecta bien el correo configurado
See merge request artica/pandorafms!6440
2023-11-28 07:07:26 +00:00
4406828cc2
Merge branch 'ent-12362-no-se-pueden-anadir-alertas-a-modulos-desde-la-vista-agents-alerts-view' into 'develop'
...
Fix add alerts pandora_enterprise#12362
See merge request artica/pandorafms!6625
2023-11-27 14:37:09 +00:00
9919de1d66
Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop'
...
Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para
See merge request artica/pandorafms!6392
2023-11-27 12:24:45 +00:00
d544ef4ac5
Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
...
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola
See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
c41a2d0f19
Merge branch 'ent-11633-cambiar-ubicacion-del-boton-create-modules-en-wizards' into 'develop'
...
Ent 11633 cambiar ubicacion del boton create modules en wizards
See merge request artica/pandorafms!6436
2023-11-27 11:59:26 +00:00
f46e17f84d
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
2023-11-27 11:51:35 +01:00
b0125d943e
#12138 Resolve conflict
2023-11-27 11:51:00 +01: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
a4cd6d7fe1
#12138 Resolve conflict
2023-11-27 11:43:24 +01:00
ad8e3ac44f
Merge branch 'ent-11436-envio-de-correo-electronico-con-advertencia-a-pesar-de-ya-haber-cambiado-la-configuracion' into 'develop'
...
Ent 11436 envio de correo electronico con advertencia a pesar de ya haber cambiado la configuracion
See merge request artica/pandorafms!6464
2023-11-27 10:40:19 +00:00
092c14fdf4
Merge branch 'ent-11854-error-en-asignacion-de-grupo-de-agente-en-el-nuevo-asistente-de-bienvenida-pfms' into 'develop'
...
Ent 11854 error en asignacion de grupo de agente en el nuevo asistente de bienvenida pfms
See merge request artica/pandorafms!6391
2023-11-27 10:20:54 +00:00
262affeb74
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
2023-11-27 08:18:35 +01:00
d6bffbade1
implement demo data load
2023-11-20 16:52:49 +01:00
aa6aa08df3
#11026 autoupdate as string
2023-11-20 14:49:26 +01:00
d1b2bf1ee2
Merge branch 'develop' into ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para
2023-11-20 14:33:49 +01:00
89be9af98f
#11442 Fix conflicts
2023-11-17 12:33:33 +01:00
78a5a3bfe8
#12168 Hierarchy is added to the title of services
2023-11-14 17:12:22 +01:00
04649dee00
#12168 Fixed sql bringing main services
2023-11-13 13:41:47 +01:00
ad90fb74b2
#12390 Fixed group
2023-11-13 10:42:25 +01:00
4f60c62626
#12132 Fix conflict
2023-11-08 16:31:01 +01:00
c676e7b030
Fix add alerts pandora_enterprise#12362
2023-11-03 12:49:19 +01:00
34c66981be
#12357 fixed pagination datatable
2023-10-31 09:16:42 +01:00
1fd45fb95f
implement demo data feature
2023-10-26 19:05:07 +02:00
868700f9f1
add sliced mode simple graph reports and CV pandora_enterprise#9640
2023-10-25 15:55:54 +02:00
1f8554e8d1
Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop'
...
Ent 11914 editor de alertas de logs
See merge request artica/pandorafms!6505
2023-10-23 12:34:32 +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
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
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
d253dd1fbd
#11818 Fixed link
2023-10-17 10:37:21 +02:00
a456912dd7
#12132 Fix welcome tips
2023-10-16 12:17:42 +02:00
58261effaf
#11914 Added update 2
2023-10-11 17:12:10 +02:00
f5535a1fc8
#11914 Added update
2023-10-11 17:10:14 +02:00
cdc2d48bc5
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-11 12:49:32 +02:00
f058ec5df8
#12213 Fix warp update notification
2023-10-11 08:12:55 +02:00
813a5ecd0d
#12168 Fixed filter to show the service genealogy
2023-10-10 11:34:47 +02:00
10d94daf30
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
2023-10-10 11:09:53 +02:00
049e25f866
#8686 Add filter in managemnet tree group
2023-10-06 13:51:18 +02:00
ae0bb2022d
#12029 Fixed font size
2023-10-04 15:42:19 +02:00
3f41e4f32b
#12138 delete agent access graph
2023-10-02 16:24:23 +02:00
12fbd1e522
some functional changes in gotty
2023-10-02 13:57:11 +02:00
06e42de207
#11391 Fixed date
2023-10-02 12:39:40 +02:00
85598d5012
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
2023-09-28 16:36:59 +02:00
3f2caf9404
some gotty changes
2023-09-27 18:28:12 +02:00
57a0249982
implmented cron in open
2023-09-27 11:38:00 +02:00
831ed2570d
implemented cron in open
2023-09-27 11:35:57 +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
e747e4ef74
#12088 Fix notification
2023-09-26 13:02:07 +02:00
1d5b4ebc0f
#12096 Fix apos in welcome window
2023-09-21 16:26:44 +02:00
2066907ded
#12058 Added database version in diagnostic information and about
2023-09-21 14:36:57 +02:00
f46626e120
refactor cluster view pandora_enterprise#12032
2023-09-21 10:21:45 +02:00
dc9b47a904
#12027 tree view quiet mode
2023-09-20 13:51:56 +02:00
746b9e48d0
#11436 Fix total agents
2023-09-19 17:50:04 +02:00
eed7ff8aba
#11436 Fix notif access stastics performance
2023-09-19 16:18:58 +02:00
a1fd85f486
Merge branch 'develop' into ent-11807-security-hardening-console-informes
2023-09-18 16:49:00 +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
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
35b5de57f1
The filter group is added in the Service View Widget settings.
2023-09-13 11:12:11 +02:00
50351c6ff4
#11911 fixed Item Default mail to send alerts from the Welcome dialog
2023-09-12 10:38:22 +02:00
44f310449b
#11633 Change position of button created module
2023-09-11 13:54:01 +02:00
8a41aa7f7a
Merge branch 'ent-11947-16141-notificacion-access-statistics-performance-permanece-en-la-consola-teniendo-los-tokens' into 'develop'
...
Ent 11947 16141 notificacion access statistics performance permanece en la consola teniendo los tokens
See merge request artica/pandorafms!6372
2023-09-11 07:17:46 +00:00
d48cd703bc
Added distro information in About and Diagnostic info
2023-09-07 10:25:09 +02:00
793c953e07
#11947 Fix notification
2023-09-06 10:38:09 +02:00
f8f13227f8
#11537 Fix metaconsole inventory and hd traces
2023-09-06 10:28:44 +02:00
3327d79ed6
#11442 Change Welcome tips arrows and buttons
2023-09-06 09:35:12 +02:00
b8e8a16e7d
#11537 Fix search with space entitites
2023-09-05 10:11:15 +02:00
f2b99cf38e
Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
...
Ent 10639 unificacion de controles de fecha
See merge request artica/pandorafms!6212
2023-09-05 07:50:45 +00:00
85462b3aae
Add alert modules, queue and status
2023-09-04 08:46:24 -06:00
fa5af7efab
Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
...
# Conflicts:
# pandora_console/extras/mr/66.sql
2023-09-04 11:50:03 +00:00
4129833a38
#11026 message update only for token enable
2023-09-01 11:44:12 +02:00
daniel
Daniel Maya
Alejandro Campos
Daniel Rodriguez
Diego Muñoz-Reja
Matias Didier
Jonathan
Rafael Ameijeiras
Enrique Martin
Jorge Rincon
miguel angel rasteu
Daniel Cebrian
felix.suarez