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

6582 Commits

Author SHA1 Message Date
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop' 
implemented trap history

See merge request artica/pandorafms!5116
 2022-10-31 11:17:29 +00:00
Alejandro Campos 0889bcf142 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-31 10:46:44 +00:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop' 
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
 2022-10-28 15:18:15 +00:00
Jimmy Olano af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop' 
Ent 4043 proyectos banco de credenciales contrasenas para modulos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/4043

See merge request artica/pandorafms!5172
 2022-10-28 14:00:46 +00:00
edu.corral d76d46c1ab ent 9466 tip icon fix 2022-10-27 13:00:39 +02:00
Alejandro Campos 9322e5b720 Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-27 09:50:24 +00:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola' 
# Conflicts:
#   pandora_console/general/register.php
 2022-10-27 09:47:49 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
edu.corral c32da23dd0 ent 9501 user duplicated profiles 2022-10-26 10:46:20 +02:00
Daniel Rodriguez b4bf85064c Merge branch 'ent-9687-14398-ejecucion-de-codigo-en-barra-de-busqueda-de-modulos' into 'develop' 
Fix vulnerabilies

See merge request artica/pandorafms!5209
 2022-10-25 15:20:20 +00:00
alejandro.campos@artica.es 6dbc71713a add enable modules massive option 2022-10-25 15:52:30 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop' 
Added exclude words for passwords control

See merge request artica/pandorafms!5174
 2022-10-25 09:07:08 +00:00
jose.gonzalez@pandorafms.com 6b1906d178 Added control for user creation 2022-10-25 09:37:49 +02:00
edu.corral 66a5c8f7eb ent 7914 status scaling based on time 2022-10-24 18:04:04 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop' 
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
 2022-10-24 15:19:21 +00:00
Calvo 183d1ae120 Fix vulnerabilies 2022-10-24 16:44:10 +02:00
Daniel Maya 06967ad5d9 #5584 added in metaconsole 2022-10-24 12:03:18 +02:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop' 
Added ldap timeout

See merge request artica/pandorafms!5134
 2022-10-21 10:28:04 +00:00
Daniel Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +02:00
Daniel Rodriguez ee0d9d92b6 Merge branch 'ent-9665-usuario-con-perfil-pandora-administrator-no-debe-poder-crear-comandos-de-alertas' into 'develop' 
Ent 9665 usuario con perfil pandora administrator no debe poder crear comandos de alertas

See merge request artica/pandorafms!5200
 2022-10-20 13:42:15 +00:00
Daniel Maya 89bd5ec22c #9665 Fixed button 2 2022-10-20 10:42:27 +02:00
Daniel Maya bfc1289ba6 #9105 Added collections satellite 2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja c8e8ea61f3 Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop' 
filter recursive groups in events pandora_enterprise#2133

See merge request artica/pandorafms!5155
 2022-10-19 11:46:38 +00:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop' 
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
 2022-10-19 11:00:04 +00:00
Calvo 11df57cd14 Fix planned downtime agent recursion bugs 2022-10-18 19:55:45 +02:00
Diego Muñoz-Reja dfb5776f68 Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop' 
Added default definition for SNMP Interface Wizard

See merge request artica/pandorafms!5168
 2022-10-18 09:25:17 +00:00
Daniel Maya fcb1cd24b5 #9665 Fixed button 2022-10-18 11:02:06 +02:00
Calvo 3f8e0f765a Fix adding agnents planned downtime 2022-10-18 09:52:08 +02:00
Daniel Barbero 47a2e01a33 Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-18 07:59:26 +02:00
Jimmy Olano ff4cff6f7a Merge branch 'ent-9208-Codigo-depuracion-expuesto-a-clientes' into 'develop' 
Fix javascript injection in agent names

pandora_enterprise#9208

See merge request artica/pandorafms!5193
 2022-10-17 17:28:39 +00:00
alejandro.campos@artica.es 08ab924160 fix performance issue 2022-10-17 18:08:48 +02:00
Daniel Rodriguez 38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop' 
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
 2022-10-17 11:27:16 +00:00
Calvo 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Rodriguez a36666f1fd Merge branch 'ent-9506-cambios-en-vista-de-usuarios-perfiles' into 'develop' 
Ent 9506 cambios en vista de usuarios perfiles

See merge request artica/pandorafms!5124
 2022-10-14 10:31:41 +00:00
Daniel Rodriguez af9084a4ef Merge branch 'ent-9322-token-unique-ip-da-problemas-a-la-hora-de-modificar-un-agente' into 'develop' 
Fix agent edtion unique ip issues

See merge request artica/pandorafms!5145
 2022-10-14 09:48:05 +00:00
Daniel Maya c63c5e9e3f #5584 Added status 2022-10-14 10:56:45 +02:00
Daniel Rodriguez 095732eab5 Merge branch 'ent-9467-no-se-pueden-cambiar-umbrales-warning-y-critical-en-ciertos-modulos' into 'develop' 
Ent 9467 no se pueden cambiar umbrales warning y critical en ciertos modulos

See merge request artica/pandorafms!5148
 2022-10-14 08:17:34 +00:00
Daniel Barbero 4dd311063e fixed errors view events sort and save filters pandora_enterprise#9425 2022-10-14 09:31:45 +02:00
Daniel Maya 3e9e04642d resolved conflict 2022-10-14 09:10:25 +02:00
Daniel Maya f3bc5427ba #9506 Fixed meta ajax 2022-10-13 13:22:36 +02:00
Daniel Maya fbc222155e Merge branch 'develop' into ent-9506-cambios-en-vista-de-usuarios-perfiles 2022-10-13 12:31:15 +02:00
jose.gonzalez@pandorafms.com fc37d9919c Fix javascript injection in agent names 2022-10-13 12:06:04 +02:00
alejandro.campos@artica.es 2c57873898 fix alert deletion from agent alerts 2022-10-13 12:03:15 +02:00
Daniel Rodriguez d833c7ba39 Merge branch 'ent-9485-14165-filtrado-alertas-metaconsola' into 'develop' 
Ent 9485 14165 filtrado alertas metaconsola

See merge request artica/pandorafms!5128
 2022-10-13 09:24:11 +00:00
Daniel Maya bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Calvo 1c157ba2e4 Fix reset user creation form on error 2022-10-07 13:15:44 +02:00
Daniel Maya 83ac81ab23 #9506 Fixed meta 2022-10-07 10:56:12 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
José González 9f800df034 Added default definition for SNMP Interface Wizard 2022-10-03 12:41:55 +02:00
Daniel Maya 1059694685 #5584 Fixed width 2022-10-03 11:23:28 +02:00
Daniel Maya 4e68ae62ef #5584 Added edit users 2 2022-10-03 09:07:35 +02:00
Calvo b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +02:00
Daniel Maya 87d4c03467 #5584 Added edit users 2022-09-30 14:12:18 +02:00
Daniel Rodriguez 74e291696a Merge branch 'ent-9334-mejorar-seccion-de-administrar-host-para-la-configuracion-remota-del-satellite' into 'develop' 
Ent 9334 mejorar seccion de administrar host para la configuracion remota del satellite

See merge request artica/pandorafms!5117
 2022-09-30 09:41:57 +00:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Daniel Rodriguez 1b8f9a613e Merge branch 'ent-9143-implementar-sistema-de-identificacion-de-satelite-para-descarga-del-key' into 'develop' 
Ent 9143 implementar sistema de identificacion de satelite para descarga del key

See merge request artica/pandorafms!5120
 2022-09-29 09:58:45 +00:00
Daniel Maya c650e7df6c #9143 Fixed empty license encryption key 2022-09-29 11:46:29 +02:00
alejandro.campos@artica.es 042362991d implemented option to skip inoperative interfaces on demand 2022-09-28 15:34:45 +02:00
edu.corral b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop' 
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
 2022-09-27 12:26:24 +00:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop' 
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
 2022-09-26 11:03:52 +00:00
Calvo bf5a5e16dc Fix agent edtion unique ip issues 2022-09-26 12:49:00 +02:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
Daniel Rodriguez 30edbc81ad Merge branch 'ent-8934-Macros-para-fechas-en-custom-SQL' into 'develop' 
Added new macros

See merge request artica/pandorafms!5103
 2022-09-23 13:03:48 +00:00
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-23 06:41:57 +00:00
Calvo eed28bc668 Fix user form reset if profile fails 2022-09-22 17:07:43 +02:00
Calvo 8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00
alejandro.campos@artica.es 76f7761373 fixes in double auth 2022-09-22 08:59:39 +02:00
Diego Muñoz-Reja 158af125e2 Merge branch 'ent-9169-13822-error-al-actualizar-informacion-de-un-agente-cuando-se-llega-al-maximo-de-agentes-de-un' into 'develop' 
Fix edit agent when group limit is reached

See merge request artica/pandorafms!5085
 2022-09-21 11:03:29 +00:00
Daniel Maya 29c06a17f7 #9506 Fixed show profiles 2022-09-21 11:19:00 +02:00
Daniel Rodriguez c556c7f505 Merge branch 'ent-9149-13753-incidencia-validacion-password-mail' into 'develop' 
Ent 9149 13753 incidencia validacion password mail

See merge request artica/pandorafms!5108
 2022-09-21 08:10:09 +00:00
edu.corral a13c2a24a9 ent 9485 metaconsole alert filter 2022-09-21 09:46:31 +02:00
Daniel Maya d46174adb8 #9527 Fixed new user 2022-09-20 17:40:20 +02:00
Daniel Maya 9b79ea7912 #9506 Fixed um 2022-09-20 16:05:27 +02:00
Daniel Maya 197fa4c69a #9143 Added help tip 2022-09-20 15:16:56 +02:00
Daniel Maya 9e90c8da07 #9506 Changes in user profiles 2022-09-20 13:56:36 +02:00
Daniel Maya 737f27f782 #9143 Added license_encryption_key 2022-09-20 11:37:07 +02:00
Daniel Rodriguez 9877d59ea6 Merge branch 'ent-9159-Discovery-Host-devices-Meter-lista-de-host-por-nombre' into 'develop' 
changed help tip

See merge request artica/pandorafms!5083
 2022-09-19 13:05:22 +00:00
Daniel Maya cd199e233d #9334 Added improve in satellite hosts 2022-09-19 12:17:24 +02:00
alejandro.campos@artica.es 91194155b0 implemented trap history 2022-09-19 11:15:22 +02:00
edu.corral 881e0914f0 ent 9149 password mail validation 2022-09-14 16:20:13 +02:00
José González 695cc5bcdc Added tooltip 2022-09-13 16:35:43 +02:00
alejandro.campos@artica.es d1cc2458b6 implemented alert commands and actions to send report by email 2022-09-13 12:16:53 +02:00
José González 9164f1e681 IP Allow control 2022-09-12 12:41:09 +02:00
Daniel Maya d53ee55663 #9331 Fixed wizard wmi 2022-09-08 15:18:48 +02:00
Calvo ae4d320d78 Fix edit agent when group limit is reached 2022-09-07 11:15:07 +02:00
alejandro.campos@artica.es f5f5d609a7 changed help tip 2022-09-06 13:16:24 +02:00
Daniel Barbero da0998e7c7 Merge remote-tracking branch 'origin/develop' into ent-7749-mover-operaciones-masivas-sobre-servicios-a-wizard-de-servicios-en-nodo 
Conflicts:
	pandora_console/godmode/menu.php
 2022-09-06 07:52:19 +02:00
Diego Muñoz-Reja 4f31294d94 Merge branch 'ent-9183-giss-se-pierde-el-filtrado-en-el-menu-de-alertas-anadidas-por-agente-nodo' into 'develop' 
Ent 9183 giss se pierde el filtrado en el menu de alertas anadidas por agente nodo

See merge request artica/pandorafms!5079
 2022-09-02 12:40:03 +00:00
Diego Muñoz-Reja deb7fa54ec Merge branch 'ent-7774-13106-Deshabilitar-modulos-mediante-paradas-planificada' into 'develop' 
implemented disable modules scheduled downtime

See merge request artica/pandorafms!5075
 2022-09-02 12:18:15 +00:00
Ramon Novoa 9f30d66328 Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:06:50 +02:00
Ramon Novoa fa74a2f91f Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:05:45 +02:00
Diego Muñoz-Reja 75720da969 Merge branch 'ent-9194-Bug-modulos-deshabilitados' into 'develop' 
fixed bug when disabling modules and disabled modules count

See merge request artica/pandorafms!5074
 2022-09-02 11:04:28 +00:00
Diego Muñoz-Reja 5276236c41 Merge branch 'ent-5319-9412-mas-personalizacion-de-paradas-planificada' into 'develop' 
implemented cron based scheduled downtimes

See merge request artica/pandorafms!5061
 2022-09-02 10:32:26 +00:00
edu.corral 03504fe7c5 ent 9183 agent alerts filter 2022-09-02 11:26:24 +02:00
alejandro.campos@artica.es a479ab84f7 implemented disable modules scheduled downtime 2022-08-31 16:14:38 +02:00
Diego Muñoz-Reja 56f5001541 Merge branch 'ent-8745-Tiempo_no_inicializados_entorno' into 'develop' 
Added control for clean not initialized modules

See merge request artica/pandorafms!5073
 2022-08-30 13:02:55 +00:00
alejandro.campos@artica.es db88876748 fixed bug when disabling modules and disabled modules count 2022-08-30 14:58:19 +02:00