36703 Commits

Author SHA1 Message Date
vgilc
14bd1131e5 Merge branch 'revert-06dff1e3' into 'develop'
Revert "Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'"

See merge request artica/pandorafms!6690
2023-11-21 16:01:59 +00:00
vgilc
bdd4628d24 Revert "Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'"
This reverts merge request !6674
2023-11-21 16:00:27 +00:00
Alejandro Sánchez
06dff1e3a5 Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'
mr changes

See merge request artica/pandorafms!6674
2023-11-21 15:32:32 +00:00
felix.suarez
5514b0735e Remove reset when reach normal but status not change 2023-11-21 09:22:12 -06:00
vgilc
b236c1a5e4 Merge branch 'ent-12479-bug-en-update-manager-online-ubuntu-y-rocky8' into 'develop'
fix update manager pandora_enterprise#12479

See merge request artica/pandorafms!6688
2023-11-21 10:37:14 +00:00
artica
7d8eb2a4e7 Auto-updated build strings. 2023-11-21 01:00:23 +01:00
daniel
ee93c86982 fix update manager pandora_enterprise#12479 2023-11-20 17:19:39 +01:00
Gorka Sanchez
23552eb164 Merge branch 'ent-10097-14749-anadir-filtro-de-busqueda-en-vista-de-dashboards' into 'develop'
Ent 10097 14749 anadir filtro de busqueda en vista de dashboards

See merge request artica/pandorafms!6455
2023-11-20 15:30:42 +00:00
Gorka Sanchez
7748b59694 Merge branch 'ent-9946-meter-busqueda-en-listado-de-dashboard' into 'develop'
Ent 9946 meter busqueda en listado de dashboard

See merge request artica/pandorafms!6398
2023-11-20 15:20:46 +00:00
Jonathan
aa6aa08df3 #11026 autoupdate as string 2023-11-20 14:49:26 +01:00
Jonathan
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
Calvo
50406748bf Fix server names uppercases on server list 2023-11-20 12:04:25 +01:00
Matias Didier
ce978d5c9e Merge branch 'ent-12457-informes-dashboard-y-mapa-de-red-por-defecto-en-instalaciones-nuevas' into 'develop'
add demo data pandora_enterprise#12457

See merge request artica/pandorafms!6666
2023-11-20 10:32:59 +00:00
Daniel Cebrian
25033501a2 Merge branch 'ent-12249-vista-de-seguridad-por-agentes' into ent-12251-integracion-de-los-datos-de-seguridad-en-la-vista-ppal-de-agente 2023-11-20 10:23:17 +01:00
Daniel Cebrian
f8d3ac088a Merge branch 'ent-12252-vista-tactica-de-seguridad-vulnerabilidades' into ent-12249-vista-de-seguridad-por-agentes 2023-11-20 10:16:14 +01:00
Rafael Ameijeiras
0815740472 Merge branch 'ent-12453-limitar-la-busqueda-de-log-sources-en-vista-de-agente-a-24h-y-limitar-en-la-vista-de-logs-en' into 'develop'
Ent 12453 limitar la busqueda de log sources en vista de agente a 24h y limitar en la vista de logs en

See merge request artica/pandorafms!6670
2023-11-20 07:57:15 +00:00
Rafael Ameijeiras
978c0c0d6b Merge branch 'ent-12472-actualizar-opciones-avanzadas-de-informe-elimina-logo-por-defecto-de-portada' into 'develop'
fix image pdf pandora_enterprise#12472

See merge request artica/pandorafms!6677
2023-11-20 07:24:58 +00:00
artica
838ba785da Auto-updated build strings. 2023-11-20 01:00:19 +01:00
artica
4293669702 Auto-updated build strings. 2023-11-19 01:00:18 +01:00
artica
1649585929 Auto-updated build strings. 2023-11-18 01:00:23 +01:00
Calvo
0eea4788bf Added blankspaces in server view 2023-11-17 13:24:44 +01:00
miguel angel rasteu
89be9af98f #11442 Fix conflicts 2023-11-17 12:33:33 +01:00
Rafael Ameijeiras
90fbf1f95e Merge branch 'ent-12477-no-aparece-la-opción-de-editar-usuarios-en-las-operaciones-masivas-del-nodo' into 'develop'
Ent 12477 no aparece la opción de editar usuarios en las operaciones masivas del nodo

See merge request artica/pandorafms!6684
2023-11-17 08:22:20 +00:00
artica
f386274dc0 Auto-updated build strings. 2023-11-17 01:00:20 +01:00
Jorge Rincon
4e9f2ac9d8 #12477 Added the option to edit bulk users and adjusted the home screen 2023-11-16 16:50:47 +01:00
Daniel Cebrian
35447154aa #12473 fixed status and group in export csv 2023-11-16 16:34:06 +01:00
alejandro
42e278bd7c update version and tasks with the new macros 2023-11-16 15:55:07 +01:00
Daniel Cebrian
134da0c646 #12475 fixed alias agent 2023-11-16 15:31:10 +01:00
Daniel Maya
de905b2e95 #12453 Fixed interval 4 2023-11-16 12:47:33 +01:00
alejandro
f75baa72e9 update vmwre md5 code 2023-11-16 10:07:28 +01:00
artica
e80b590214 Auto-updated build strings. 2023-11-16 01:00:22 +01:00
daniel
33c4833200 fix image pdf pandora_enterprise#12472 2023-11-15 17:28:16 +01:00
alejandro
de7fc79d95 mr changes 2023-11-15 16:46:12 +01:00
Daniel Maya
7219471ff8 #12453 Fixed interval 3 2023-11-15 16:10:00 +01:00
Daniel Maya
6059f4dea0 #12453 Changed string 2023-11-15 13:10:19 +01:00
Daniel Maya
440adc4109 #12453 Fixed interval 2 2023-11-15 13:07:06 +01:00
artica
c7a746ea41 Auto-updated build strings. 2023-11-15 01:00:24 +01:00
daniel
23f0ac8a90 add demo data pandora_enterprise#12457 2023-11-14 17:25:53 +01:00
Daniel Cebrian
b241200be6 #12251 check if enterprise is installed in open 2023-11-14 10:46:06 +01:00
Daniel Cebrian
636f76258e #12249 fixed black theme view 2023-11-14 10:12:48 +01:00
Rafael Ameijeiras
5316b32b71 Merge branch 'ent-12449-fallo-sql-al-editar-agentes' into 'develop'
fix error sql edit agents to conected metaconsole pandora_enterprise#12449

See merge request artica/pandorafms!6659
2023-11-14 08:49:43 +00:00
Daniel Cebrian
e38246521d #12251 added info in security in agent contact 2023-11-14 09:33:04 +01:00
daniel
613d1eb9cb fix error sql edit agents to conected metaconsole pandora_enterprise#12449 2023-11-14 09:16:47 +01:00
artica
92bd8019a3 Auto-updated build strings. 2023-11-14 01:00:11 +01:00
Daniel Cebrian
7a3b146e87 Merge branch 'develop' into ent-12252-vista-tactica-de-seguridad-vulnerabilidades 2023-11-13 15:30:18 +01:00
Daniel Cebrian
dc714a5b9f #12249 column secmon 2023-11-13 15:27:07 +01:00
Daniel Cebrian
9f3e09ac10 Merge branch 'develop' into ent-12249-vista-de-seguridad-por-agentes 2023-11-13 15:06:28 +01:00
Daniel Rodriguez
fd79a9d148 Merge branch 'ent-11126-vulnerability-scanner-interface-2' into 'develop'
#11126 Corrección mr

See merge request artica/pandorafms!6655
2023-11-13 14:02:52 +00:00
Daniel Cebrian
2923de8872 #11126-2 fixed mr 2023-11-13 14:57:11 +01:00
Daniel Rodriguez
d528b4f1f4 Merge branch 'ent-11126-vulnerability-scanner-interface' into 'develop'
Ent 11126 Vulnerability Scanner - Interface

See merge request artica/pandorafms!6531
2023-11-13 13:41:58 +00:00