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

31380 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 9520ce02e9 Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' of brutus.artica.es:artica/pandorafms into ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php 2022-10-19 16:46:31 +02:00
alejandro.campos@artica.es d707c29110 minor fix 2022-10-19 16:46:07 +02:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +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
artica 95c485db38 Auto-updated build strings. 2022-10-19 01:00:22 +02:00
Calvo 11df57cd14 Fix planned downtime agent recursion bugs 2022-10-18 19:55:45 +02:00
Diego Muñoz-Reja 524b1f5314 Merge branch 'ent-9667-500-en-develop-con-php-7-2' into 'develop' 
minor fix 500 pandora_enterprise#9667

See merge request artica/pandorafms!5201
 2022-10-18 15:02:32 +00:00
Daniel Barbero f219a9678f minor fix 500 pandora_enterprise#9667 2022-10-18 16:55:05 +02:00
Daniel Barbero 82a3fc1063 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2022-10-18 16:22:53 +02:00
Daniel Barbero e79394c235 synch cli with nodes pandora_enterprise#9500 2022-10-18 16:14:35 +02:00
Jimmy Olano 9d912c2a6d Merge branch 'ent-8956-derivado-del-trabajo-q-a-762-lts-cli-perl-al-crear-usuario-inserta-entidades-html-en' into 'develop' 
Ent 8956 derivado del trabajo q a 762 lts cli perl al crear usuario inserta entidades html en

#8956

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

See merge request artica/pandorafms!5163
 2022-10-18 13:35:09 +00:00
Diego Muñoz-Reja d86fd78b98 Merge branch 'ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard' into 'develop' 
new widget grouped meter graphs pandora_enterprise#8620

See merge request artica/pandorafms!5179
 2022-10-18 13:10:26 +00:00
Daniel Barbero 4b3376057c Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 13:41:25 +02:00
Daniel Barbero 1acb67ecad fixed multi selector pandora_enterprise#8620 2022-10-18 13:40:09 +02:00
Jimmy Olano 0612bb05db Merge branch 'ent-9098-13503-creacion-llamada-insert_gis_data-cli' into 'develop' 
Ent 9098 13503 creacion llamada insert gis data cli

#9098

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

See merge request artica/pandorafms!5132
 2022-10-18 11:26:51 +00:00
Daniel Barbero 40dc913aca Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-18 12:53:28 +02:00
Daniel Barbero 697abced4e synch cli with nodes pandora_enterprise#9500 2022-10-18 12:49:51 +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
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-18 07:23:29 +00:00
Daniel Barbero 15b07a9a09 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 08:01:32 +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
artica ed8b6678cd Auto-updated build strings. 2022-10-18 01:00:21 +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
Daniel Barbero c6783f9a10 synch cli with nodes pandora_enterprise#9500 2022-10-17 16:04:45 +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
Daniel Rodriguez 3ffc3c2b74 Merge branch 'ent-9434-14108-Añadir-y-eliminar-agentes-a-paradas-planificadas-CLI' into 'develop' 
fixed api methods for creating and deleting scheduled downtimes agents

See merge request artica/pandorafms!5115
 2022-10-17 11:26:38 +00:00
Diego Muñoz-Reja 4c74f1bee7 Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop' 
fixed response events pandora_enterprise#9423

See merge request artica/pandorafms!5141
 2022-10-17 10:49:01 +00:00
Calvo 391ff40c93 Fix var name misspell 2022-10-17 12:47:54 +02:00
Calvo 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Maya 357f9cc817 #9641 heatmap changes 3 2022-10-17 10:44:35 +02:00
Daniel Maya 0db0b50ebd #9641 heatmap changes 2 2022-10-17 10:32:28 +02:00
artica b79b7e5d57 Auto-updated build strings. 2022-10-17 01:00:17 +02:00
artica 92f0e4b709 Auto-updated build strings. 2022-10-16 01:00:17 +02:00
artica b31240a3cc Auto-updated build strings. 2022-10-15 01:00:23 +02:00
Daniel Maya f3bae30f55 #9641 heatmap changes 2022-10-14 13:53:05 +02:00
jose.gonzalez@pandorafms.com a10aa7a258 Added control for add the notifications by default to users 2022-10-14 13:29:26 +02:00
Daniel Rodriguez f7549f88cd Merge branch 'ent-9300-cambio-de-label-de-enable-sunburst-a-show-sunburst-by-default' into 'develop' 
Ent 9300 cambio de label de enable sunburst a show sunburst by default

See merge request artica/pandorafms!5157
 2022-10-14 11:19:00 +00: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 59c53b4668 Merge branch 'ent-9492-activar-password-policy-no-funciona' into 'develop' 
Fix issue

See merge request artica/pandorafms!5175
 2022-10-14 10:11:45 +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 Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/functions_modules.php
 2022-10-14 11:46:20 +02:00
Daniel Rodriguez 5a645498ea Merge branch 'ent-9493-14170-elementos-criticos-en-servicios-no-se-muestra-en-el-tree-view' into 'develop' 
fixed tree view services pandora_enterprise#9493

See merge request artica/pandorafms!5111
 2022-10-14 09:46:13 +00:00
Daniel Barbero 057a1466ab add mode maintenance VC pandora_enterprise#4822 2022-10-14 11:04:18 +02:00
Daniel Barbero 004f5c4763 Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/include/visual-console-client/vc.main.min.js
	pandora_console/include/visual-console-client/vc.main.min.js.map
 2022-10-14 11:03:11 +02:00
Daniel Barbero f2c5e496de add mode maintenance VC pandora_enterprise#4822 2022-10-14 10:58:18 +02:00
Daniel Maya c63c5e9e3f #5584 Added status 2022-10-14 10:56:45 +02:00