Commit Graph

1699 Commits

Author SHA1 Message Date
Matias Didier 5ba4cb850a Merge branch 'ent-12994-mensaje-feo-de-error-cuando-no-puede-conectar-a-la-bbdd-de-historico' into 'develop'
Ent 12994 Mensaje feo de error cuando no puede conectar a la BBDD de histórico

See merge request artica/pandorafms!6996
2024-03-12 11:35:59 +00:00
Rafael Ameijeiras 499e74a964 Merge branch 'ent-12964-no-permitir-iniciar-sesion-de-superadmin-con-un-enlace-a-un-dashboard-publico' into 'develop'
Ent 12964 No permitir iniciar sesión  de superadmin con un enlace a un Dashboard público

See merge request artica/pandorafms!7000
2024-03-12 08:56:31 +00:00
Daniel Cebrian c8e04d3bdc #12964 fixed auto auth in public link dashboard 2024-03-11 09:42:38 +01:00
Daniel Maya 966177e8f2 #12984 Fixed importPrd 2024-03-07 17:20:38 +01:00
Daniel Maya e94f7e2c59 #12989 Fixed network csv 2 2024-03-07 16:20:17 +01:00
Daniel Cebrian 1125f64e89 #12994 fixed message error sql in history db 2024-03-07 13:28:34 +01:00
Daniel Maya a1bab17ee5 #12989 Fixed network csv 2024-03-07 11:08:35 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop'
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
2024-02-22 16:21:32 +00:00
Jonathan 260fcfe62b #12695 remove warnings 2024-02-22 10:07:47 +01:00
Jonathan 50187a8c15 #12695 wip remove warnings 2024-02-21 17:07:25 +01:00
Daniel Maya ef3bfb35f0 #12350 resolved conflict 2024-02-16 09:25:55 +01:00
Rafael Ameijeiras 62ce18e4dc Merge branch 'ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida' into 'develop'
Net scan improvements

See merge request artica/pandorafms!6908
2024-02-15 08:28:12 +00:00
Rafael Ameijeiras 6aab32bb42 Merge branch 'ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola' into 'develop'
not show servers in metaconsole pandora_enterprise#12178

See merge request artica/pandorafms!6793
2024-02-15 08:22:11 +00:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop'
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
2024-02-14 12:11:16 +00:00
Enrique Martin 4ab6b29bef Added references to netwflow filters reports 2024-02-14 10:41:29 +01:00
Enrique Martin 73c33c15fd FIxed demo data PRDs import 2024-02-14 00:48:10 +01:00
Enrique Martin e80c88214f Improved base64 check for fields 2024-02-13 21:24:50 +01:00
Enrique Martin a41eae8b5c Fixed several items import and export 2024-02-13 20:13:58 +01:00
Enrique Martin 3159c4a50a Fixed several report items import 2024-02-13 19:45:29 +01:00
Jonathan da2bef45f2 #12695 wip removing warnings 2024-02-13 17:06:48 +01:00
Daniel Cebrian a432ae4d2d #12879 fixed problem with validation acl in delete group 2024-02-13 15:58:54 +01:00
Enrique Martin 85315fab60 Fixed JSON values import and export for dashboards and autocreate eval 2024-02-13 15:22:37 +01:00
Enrique Martin 23bd170ff0 Fixed JSON values import and export for dashboards 2024-02-13 15:15:10 +01:00
Enrique Martin c7d61902fb Fixed JSON values import and export for dashboards 2024-02-13 15:00:46 +01:00
Enrique Martin 57b50e4c85 Fixed skip items creations 2024-02-13 10:43:44 +01:00
Enrique Martin 59020ea572 Fixed skip items creations 2024-02-13 10:36:55 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
Daniel Maya a43b2b1c59 #12687 Initialize result 2024-02-12 15:27:56 +01:00
daniel c6a662a070 fix reload server update to license pandora_enterprise#12178 2024-02-12 14:58:00 +01:00
daniel 45ffdb1cc5 fix visual errors not working servers pandora_enterprise#12178 2024-02-12 10:34:43 +01:00
Enrique Martin 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
Enrique Martin 2f24344025 Removed temporal comment 2024-02-09 15:16:48 +01:00
Enrique Martin 07ec59290b Added info messages to import output 2024-02-09 15:11:47 +01:00
Enrique Martin 63b2541e61 Fixed get values from references and viceversa 2024-02-09 13:55:53 +01:00
Rafael Ameijeiras 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
Enrique Martin a41d420245 Fixed inverse import key 2024-02-08 17:47:28 +01:00
Enrique Martin ac016c4c9d Fixed policies export order 2024-02-08 17:36:05 +01:00
Enrique Martin 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
Enrique Martin 53964da048 Fixed inverse join key select 2024-02-08 17:33:30 +01:00
Jonathan 6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Daniel Maya b68663b966 #12687 changes in sla_service 2024-02-08 17:01:49 +01:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
Enrique Martin 86c33119c8 Updated welcome windows styles 2024-02-08 11:32:45 +01:00
Enrique Martin 9901dea9a0 Fixed services import when agent not found 2024-02-07 21:24:41 +01:00
Enrique Martin afb6892ef0 Remove only not ref keys in items creation 2024-02-07 19:32:08 +01:00
Enrique Martin 5d000a03d1 Improved import and export. Supported Array and CSV fields. 2024-02-07 18:26:22 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Daniel Maya af334e21be #12687 Added import prd 2 2024-02-07 12:13:50 +01:00