85315fab60
Fixed JSON values import and export for dashboards and autocreate eval
2024-02-13 15:22:37 +01:00
23bd170ff0
Fixed JSON values import and export for dashboards
2024-02-13 15:15:10 +01:00
c7d61902fb
Fixed JSON values import and export for dashboards
2024-02-13 15:00:46 +01:00
57b50e4c85
Fixed skip items creations
2024-02-13 10:43:44 +01:00
59020ea572
Fixed skip items creations
2024-02-13 10:36:55 +01:00
0dcced8b53
#12695 wip removing warnings
2024-02-12 17:59:27 +01:00
a43b2b1c59
#12687 Initialize result
2024-02-12 15:27:56 +01:00
c6a662a070
fix reload server update to license pandora_enterprise#12178
2024-02-12 14:58:00 +01:00
45ffdb1cc5
fix visual errors not working servers pandora_enterprise#12178
2024-02-12 10:34:43 +01:00
d382ca4066
Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida
...
Conflicts:
pandora_console/extras/mr/68.sql
2024-02-12 09:29:28 +01:00
2f24344025
Removed temporal comment
2024-02-09 15:16:48 +01:00
07ec59290b
Added info messages to import output
2024-02-09 15:11:47 +01:00
63b2541e61
Fixed get values from references and viceversa
2024-02-09 13:55:53 +01:00
4cdea9d8ef
Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop'
...
Ent 12460 Cientos de errores en el log de apache
See merge request artica/pandorafms!6748
2024-02-09 09:22:48 +00:00
a41d420245
Fixed inverse import key
2024-02-08 17:47:28 +01:00
ac016c4c9d
Fixed policies export order
2024-02-08 17:36:05 +01:00
4e48142205
Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd
2024-02-08 17:33:55 +01:00
53964da048
Fixed inverse join key select
2024-02-08 17:33:30 +01:00
6e1fb2f061
#12695 wip removing warnings
2024-02-08 17:17:17 +01:00
b68663b966
#12687 changes in sla_service
2024-02-08 17:01:49 +01:00
9084a34514
#12695 wip removing warnings
2024-02-08 12:31:55 +01:00
86c33119c8
Updated welcome windows styles
2024-02-08 11:32:45 +01:00
9901dea9a0
Fixed services import when agent not found
2024-02-07 21:24:41 +01:00
afb6892ef0
Remove only not ref keys in items creation
2024-02-07 19:32:08 +01:00
5d000a03d1
Improved import and export. Supported Array and CSV fields.
2024-02-07 18:26:22 +01:00
2246fd8049
#12695 WIP warnings
2024-02-07 16:39:33 +01:00
af334e21be
#12687 Added import prd 2
2024-02-07 12:13:50 +01:00
834635a487
Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log
2024-02-07 10:39:47 +01:00
59e53cc4cc
Fixed PRD export process
2024-02-07 04:13:43 +01:00
3ce2c6ae3e
Encoded SQL fields for queries
2024-02-07 03:13:52 +01:00
ad0984d312
Removed values safe_output and safe_input
2024-02-07 02:53:31 +01:00
f69b1af3bd
Fixed export and import json formats
2024-02-07 02:18:39 +01:00
064393ed14
Fixed inverseRecursiveJoin
2024-02-07 01:37:31 +01:00
4139910167
Fixed tables crossed references and tables import order
2024-02-07 01:29:43 +01:00
e0d1352201
Get result, errors, items. Fix create items function.
2024-02-06 20:28:43 +01:00
f072936f21
Merge branch 'ent-12845-errores-visuales-en-nuevas-modales' into 'develop'
...
Ent 12845 errores visuales en nuevas modales
See merge request artica/pandorafms!6913
2024-02-06 16:55:38 +00:00
d308aa6822
#12687 Added import
2024-02-06 16:02:37 +01:00
e7f74210dc
Merge branch 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola' into 'develop'
...
get data in file count from module
See merge request artica/pandorafms!6746
2024-02-06 13:49:02 +00:00
64f13f1ae3
Merge branch 'develop' into 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola'
...
# Conflicts:
# pandora_console/include/class/ConsoleSupervisor.php
2024-02-06 09:02:36 +00:00
f00e491738
Fix merge issues
2024-02-05 23:30:35 +01:00
d1c6c9843b
Added net scan options to welcome wizard
2024-02-05 23:26:55 +01:00
59fd298215
#12845 fix styles events
2024-02-05 17:24:52 +01:00
c984da1ac7
#12848 reload when new credentials
2024-02-05 15:35:38 +01:00
4b40a8e9c5
Merge branch 'ent-12810-visualizacion-de-tipo-de-licencia' into 'develop'
...
Ent 12810 Visualizacion de tipo de licencia
See merge request artica/pandorafms!6907
2024-02-02 13:08:43 +00:00
c6cb0c8747
#12810 changed text licensed in info status
2024-02-02 12:14:49 +01:00
3e40558443
#12810 fixed license_mode status
2024-02-02 10:55:57 +01:00
d8fdb22c89
#12810 change value status license in diagnostics
2024-02-02 10:47:36 +01:00
05af441f19
minor fix
2024-02-01 17:36:21 +01:00
44e546af39
minor fix
2024-02-01 17:34:42 +01:00
64698c4951
#12149 upload max file size in about and diagnostic info
2024-02-01 15:38:52 +01:00
48d7a63eb1
#12149 added post_max_size notification
2024-02-01 14:54:23 +01:00
688f235c6b
#12687 Fixed export with json_ref 2
2024-02-01 10:48:34 +01:00
9337cc28e7
#12687 added recursive function
2024-01-31 11:41:20 +01:00
7acd687b9b
#12687 Fixed export with json_ref
2024-01-31 09:21:27 +01:00
a83577d1a8
#12687 Added import/export prd 4
2024-01-30 17:34:37 +01:00
f68615cba0
#12460 fixed deprecated
2024-01-30 17:00:38 +01:00
f430d3ce9f
#12797 fix select2
2024-01-30 14:53:48 +01:00
c0ad547625
#12460 fixed deprecated
2024-01-30 13:14:54 +01:00
e07d89883f
#12687 Added import/export prd 3
2024-01-29 17:38:01 +01:00
22598b4bc2
#12460 fixed deprecated
2024-01-29 17:31:19 +01:00
fd8d233cf8
#12460 fixed deprecated
2024-01-24 13:28:43 +01:00
401b1973be
#12687 Added import/export prd 2
2024-01-24 12:15:16 +01:00
b11651aa6e
Merge branch 'ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico' into 'develop'
...
Ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico
Closes pandora_enterprise#12580
See merge request artica/pandorafms!6791
2024-01-23 09:20:40 +00:00
95f8519d5d
#12687 Added import/export prd
2024-01-22 17:22:23 +01:00
a9c16e1f69
#12538 added url in new notificacions
2024-01-22 10:55:37 +01:00
d85a488cb0
#12538 new notifications in console supervisor
2024-01-22 10:37:03 +01:00
fadb70d740
Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos
2024-01-19 13:06:37 +01:00
a4f67d353b
Merge branch 'ent-12725-16851-tree-view-no-marca-agentes-en-estado-quiet' into 'develop'
...
Ent 12725 16851 tree view no marca agentes en estado quiet
See merge request artica/pandorafms!6849
2024-01-19 11:36:30 +00:00
510a06a347
Merge branch 'ent-12579-formato-erroneo-de-los-botones-accion-sobre-agentes-del-Satellite-Server' into 'develop'
...
Ent 12579 formato erroneo de los botones accion sobre agentes del satellite server
See merge request artica/pandorafms!6747
2024-01-18 12:56:43 +00:00
030d34224e
Merge branch 'ent-12523-Problemas-visualizacion-de-eventos-de-auditoria' into 'develop'
...
some changes in audit view
See merge request artica/pandorafms!6754
2024-01-18 12:50:40 +00:00
1f64fb6115
Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
...
Ent 12320 wizard de bienvenida mas molon visualmente
See merge request artica/pandorafms!6842
2024-01-18 11:16:08 +00:00
bfa087413c
Merge branch 'ent-12560-notificacion-del-alert-correlation-changed-in-v774-sigue-apareciendo' into 'develop'
...
Ent 12560 notificacion del alert correlation changed in v774 sigue apareciendo
See merge request artica/pandorafms!6770
2024-01-18 08:45:26 +00:00
234f4d2df1
#12579 add title on images
2024-01-15 14:32:52 +01:00
ed165423fd
#12725 add quiet agent tree view
2024-01-15 09:38:29 +01:00
12f6f2e02b
12320-Welcome wizard new styles
2024-01-11 09:33:51 +01:00
d8a5f1a521
#12560 fix type
2024-01-08 16:35:37 +01:00
22baa45387
#12537 new icons for notifications
2024-01-03 11:39:15 +01:00
696ca72a80
#12684 Fix tree view filter
2023-12-27 13:20:36 +01:00
dd322ad283
Merge branch 'develop' into ent-12684-vista-tree-view-no-filtra-por-modulo-en-algunas-pestanas
2023-12-27 13:02:22 +01:00
8f69c109d5
#12686 fixed filter in tree module tag
2023-12-26 17:55:41 +01:00
590c7f7480
#12686 fixed filter in tree module group
2023-12-26 17:22:19 +01:00
83c6d3735e
#12688 fixed filter module status in tree
2023-12-26 17:06:16 +01:00
d6363d37b7
#12684 Fix tree view filter
2023-12-26 13:22:24 +01:00
5bdf1b0766
Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop'
...
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2
See merge request artica/pandorafms!6758
2023-12-21 12:00:44 +00:00
421eb1fe23
Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica
2023-12-19 18:59:07 +01:00
d4e6c09acb
Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
...
implement demo data feature
See merge request artica/pandorafms!6606
2023-12-19 15:40:09 +00:00
0d33a412ae
Remove additional concatenation
2023-12-19 08:56:54 -06:00
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
2eae64407d
get data in file count from module
2023-12-07 14:17:42 +01:00
3d63544939
get data in file count from module
2023-12-07 14:14:12 +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
Enrique Martin
Jonathan
Daniel Maya
daniel
Rafael Ameijeiras
Alejandro Campos
Daniel Cebrian
Daniel Rodriguez
Matias Didier
Pablo Aragon
miguel angel rasteu
Calvo
felix.suarez
Diego Muñoz-Reja
Jorge Rincon