tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,357 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1373 Commits

Author SHA1 Message Date
Enrique Martin 169ea3c18b Added default ncm telnet templates 2024-05-28 19:43:58 +02:00
daniel 194ebd71c4 translates pandora_enterprise#13668 2024-05-22 14:11:11 +02:00
Rafael Ameijeiras 042accbc22 Merge branch 'ent-13312-cambios-en-licencia-y-update-manager-para-version-777' into 'develop' 
Ent 13312 cambios en licencia y update manager para version 777

See merge request artica/pandorafms!7302
 2024-05-20 08:04:35 +00:00
Daniel Rodriguez 7d8cd4bc20 Merge branch 'ent-13222-ciscorx-ncm-no-obtiene-la-configuracion-via-ssh' into 'develop' 
Ent-13222-ciscorx-ncm-no-obtiene-la-configuracion-via-ssh

See merge request artica/pandorafms!7366
 2024-05-17 12:40:34 +00:00
Jose Martin cad9f56ee1 Merge branch 'ent-12916-error-en-ejecucion-aws-rds-2' into 'develop' 
update version

See merge request artica/pandorafms!7087
 2024-05-17 09:21:58 +00:00
Alejandro Sánchez a92c35bb63 Merge branch 'develop' into 'ent-12916-error-en-ejecucion-aws-rds-2' 
# Conflicts:
#   pandora_console/extras/mr/68.sql
 2024-05-16 07:53:46 +00:00
Daniel Maya fd049264d4 Merge branch 'develop' into ent-13312-cambios-en-licencia-y-update-manager-para-version-777 2024-05-14 14:02:19 +02:00
Félix Suárez 20f63042a7 Remove line break in get frimeware 2024-05-09 15:28:07 -06:00
Félix Suárez 79df76d612 Fix Palo Alto frimeware script 2024-05-09 15:27:59 -06:00
Félix Suárez c7e1fc7622 Modify Cisco Base Scripts 2024-05-09 15:12:36 -06:00
Daniel Maya a4972ec3fe #13312 new free license 3 2024-05-08 17:54:13 +02:00
Félix Suárez 71bfc77059 Safe Input on OS Name 2024-05-08 09:04:03 -06:00
Jorge Rincon 9861b02c0e #13289 delete of the Create incident from event option 2024-05-06 11:22:34 +02:00
alejandro 73c7ddcedb Merge remote-tracking branch 'origin/develop' into ent-13624-plugin-vmware-remover-intervalos-de-tiempo-y-anadir-nueva-metrica-para-sensores 
Conflicts:
	pandora_console/extras/mr/69.sql
 2024-04-29 17:40:50 +02:00
Daniel Cebrian 4c485be711 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-26 12:41:08 +02:00
alejandro 970103c1ea update pandoradb_data con new proxmox execution 2024-04-25 15:44:52 +02:00
alejandro b057f59a1b update version vmware and hash 2024-04-23 16:28:56 +02:00
Rafael Ameijeiras 167e6e4b81 Merge branch 'ent-13117-16676-plugin-vmware' into 'develop' 
Update version

See merge request artica/pandorafms!7094
 2024-04-22 14:20:53 +00:00
Jonathan aea0eabf2f #13232 change script mikrotik 2024-04-12 12:32:14 +02:00
Daniel Cebrian 06947b0457 #13035 added sync jwt with nodes 2024-04-03 16:24:45 +02:00
Daniel Cebrian 1299e17ccc #13035 added new auth token method 2024-04-03 14:01:40 +02:00
alejandro 38e46ad057 Update version 2024-03-26 11:24:07 +01:00
Daniel Cebrian 5faa977bd8 #13084 fixed url tip 2024-03-26 10:34:15 +01:00
alejandro 20810f03c2 update version 2024-03-25 12:43:37 +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