Commit Graph

1350 Commits

Author SHA1 Message Date
Daniel Cebrian 5faa977bd8 #13084 fixed url tip 2024-03-26 10:34:15 +01:00
Daniel Cebrian 0ee3b16308 #13084 fixed link in tips 2024-03-25 11:56:44 +01:00
Jonathan 5848142fcb Merge branch 'develop' into ent-12997-eliminar-sistema-de-skins 2024-03-25 10:44:04 +01:00
alejandro c1fd4134fc update version 2024-03-20 11:53:55 +01:00
Jonathan 424f365ea4 #12997 remove skins section 2024-03-19 13:35:53 +01:00
Rafael Ameijeiras 38a3470565 Merge branch 'ent-12714-errores-de-traduccion-y-elementos-de-la-consola-sin-traducir-al-espanol-en-775' into 'develop'
Ent 12714 errores de traduccion y elementos de la consola sin traducir al espanol en 775

See merge request artica/pandorafms!7011
2024-03-12 14:36:50 +00:00
Daniel Maya 63fb36eb02 #12714 Update mr 2024-03-12 12:22:16 +01:00
Alejandro Sánchez a24f70ca14 Merge branch 'develop' into 'ent-12857-tickets-vmware-776'
# Conflicts:
#   pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini
2024-02-20 09:22:40 +00:00
alejandro 53d7b13f97 update version 2024-02-19 12:10:02 +01:00
alejandro.campos@artica.es 02ab6f289b fixed not registered widget 2024-02-14 18:27:05 +01:00
Alejandro Sánchez 680ad1b8db Merge branch 'develop' into 'ent-12857-tickets-vmware-776'
# Conflicts:
#   pandora_console/extras/mr/68.sql
2024-02-12 13:45:23 +00:00
Daniel Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +01:00
alejandro 32c8d23a93 update version and adding units in datastore modules 2024-02-07 13:05:57 +01:00
Matias Didier e47b8eb364 Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop'
Ent 12323 Campo para configurar rotado de netflow_interval

See merge request artica/pandorafms!6824
2024-01-23 12:51:28 +00:00
alejandro f34b9c2a7e mr changes 2024-01-18 14:01:15 +01:00
Rafael Ameijeiras f7d5c4d443 Merge branch 'ent-12573-no-se-muestra-el-numero-de-celdas-widgets-en-los-dashboards' into 'develop'
Ent 12573 No se muestra el número de celdas (widgets) en los Dashboards

See merge request artica/pandorafms!6762
2024-01-18 12:41:44 +00:00
Daniel Maya e2471f817d #12321 Added widget Gis map 2024-01-09 14:38:44 +01:00
Daniel Cebrian 110d7f4842 #12323 added netflow interval select 2024-01-02 12:57:02 +01:00
miguel angel rasteu d84300f2c7 #11494 Add widget in database 2023-12-20 13:21:43 +01:00
Daniel Rodriguez 348c48d974 Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola

See merge request artica/pandorafms!6757
2023-12-18 13:40:21 +00:00
daniel 3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
2023-12-14 11:21:51 +01:00
Jonathan 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
Daniel Cebrian 7b6c14974d #12573 fixed number of cells in list dashboard 2023-12-13 10:34:46 +01:00
Daniel Cebrian 464ad467aa #12631 created new token Ignore unknown for agent and modules 2023-12-12 15:30:10 +01:00
Enrique Martin a2f60a1d22 Updated MR changes 2023-12-12 12:12:24 +01:00
Daniel Cebrian cf203a1a45 Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-12-11 09:32:50 +01:00
Jonathan 78bb8e0bae #8365 ix merge conflict 2023-12-07 10:58:45 +01:00
Jorge Rincon 6edc90ec87 #12516 The modal is added to the online updates view.
lts_updates token is added to pandoradb_data.sql
2023-11-30 15:59:57 +01:00
Jonathan b99c9240de #8365 NCM Merge conflict 2023-11-30 08:32:15 +01:00
Jorge Rincon faffada931 Merge branch 'develop' into ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo 2023-11-28 15:10:02 +01:00
Jonathan 837f1ff73c Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 13:04:13 +01:00
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
alejandro bb7c618528 re merge mr changes 2023-11-28 10:59:04 +01:00
Matias Didier c532bfc4c7 Merge branch 'ent-11832-Cambiar-artica.es-por-pandorafms.com-en-fichero-pandoradb_data.sql' into 'develop'
Ent 11832 cambiar artica.es por pandorafms.com en fichero pandoradb data.sql

See merge request artica/pandorafms!6433
2023-11-28 08:23:46 +00:00
Jonathan def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
Daniel Cebrian 3f593976cd Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-11-22 12:55:24 +01: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
Enrique Martin d84937e6c9 Added snippet script to MR and pandoradb_data.sql 2023-11-17 12:24:07 +01:00
Enrique Martin 58aeb59b2c Updated MR 2023-11-17 10:22:52 +01:00
alejandro de7fc79d95 mr changes 2023-11-15 16:46:12 +01:00
alejandro 4579fe21d9 update version in mr 2023-11-15 14:24:42 +01:00
daniel 23f0ac8a90 add demo data pandora_enterprise#12457 2023-11-14 17:25:53 +01:00
Jorge Rincon db91fe3127 #12451 fixed default alert action for Telegram and Vonage. 2023-11-14 15:34:14 +01:00
Daniel Cebrian aafdf32793 #11126 refactored 2023-11-08 09:55:33 +01:00
Enrique Martin 8700d11461 Fixed agent data scripts on pandoradb_data.sql 2023-11-07 13:13:45 +01:00
Enrique Martin 86804398fe Fixed SQL issue 2023-11-06 16:50:54 +01:00
Enrique Martin 26ed76b821 Fixed SQL issue 2023-11-06 16:41:37 +01:00
Daniel Cebrian ba64bfb882 #11126 refactored 2023-11-06 15:49:19 +01:00
Enrique Martin c266640f39 Fixed syntax error in SQL 2023-11-06 15:07:43 +01:00