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

31199 Commits

Author SHA1 Message Date
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 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
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
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 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 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +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 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
Jimmy Olano 9c413b355d Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop' 
remove tmetaconsole_history token pandora_enterprise#9579

pandora_enterprise#9579

See merge request artica/pandorafms!5161
 2022-10-14 08:33:26 +00:00
Jimmy Olano fadd5d3a2e Merge branch 'ent-9541-14226-Añadir-comentarios-a-eventos-rapidamente-por-API-rompe-la-visualizacion-del-comentario' into 'develop' 
fixed limitation of group_concat

Ref pandora_enterprise#9541

See merge request artica/pandorafms!5130
 2022-10-14 08:29:58 +00:00
Daniel Rodriguez af56829a85 Merge branch 'ent-9252-efecto-colateral-del-9009-faltan-por-crear-tres-ficheros-graficas-para-los-mapas' into 'develop' 
Ent 9252 efecto colateral del 9009 faltan por crear tres ficheros graficas para los mapas

See merge request artica/pandorafms!5144
 2022-10-14 08:21:55 +00: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 Rodriguez 0103021d36 Merge branch 'ent-9422-ventana-sin-botones-en-configuracion-2fa' into 'develop' 
Ent 9422 ventana sin botones en configuracion 2fa

See merge request artica/pandorafms!5119
 2022-10-14 08:11:56 +00:00
Daniel Rodriguez c5f6e43886 Merge branch 'ent-9424-reloj-de-consola-visual-se-superpone-a-fecha' into 'develop' 
fixed size digital clock pandora_enterprise#9424

See merge request artica/pandorafms!5112
 2022-10-14 08:10:58 +00:00
Jimmy Olano 3c74b0b47e Merge branch 'ent-9527-derivado-del-trabajo-q-a-765-api-pfms-1-0-en-llamada-new_user-permite-crear-usuario-nulo' into 'develop' 
Ent 9527 derivado del trabajo q a 765 api pfms 1 0 en llamada new user permite crear usuario nulo

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

See merge request artica/pandorafms!5126
 2022-10-14 08:05:37 +00:00
Daniel Maya 3e9e04642d resolved conflict 2022-10-14 09:10:25 +02:00
artica f871654e60 Auto-updated build strings. 2022-10-14 01:00:23 +02:00
Jimmy Olano 0fb44c923a Merge branch 'ent-9303-derivado-del-trabajo-q-a-764-icono-show-extended-info-en-system-audit-log-no-funciona' into 'develop' 
Ent 9303 derivado del trabajo q a 764 icono show extended info en system audit log no funciona

#9303

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

See merge request artica/pandorafms!5139
 2022-10-13 16:27:51 +00:00
Jimmy Olano 4c8f7745b6 Merge branch 'ent-9396-derivado-del-trabajo-q-a-764-fe-de-errata-en-la-ayuda-de-la-cli-pfms-agent_update_custom_fields' into 'develop' 
Ent 9396 derivado del trabajo q a 764 fe de errata en la ayuda de la cli pfms agent update custom fields

#9396

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

See merge request artica/pandorafms!5125
 2022-10-13 16:23:25 +00:00
Diego Muñoz-Reja f45b185250 Merge branch 'ent-9431-14085-anadir-modulo-webserver-a-cluster-activo-pasivo' into 'develop' 
Ent 9431 14085 anadir modulo webserver a cluster activo pasivo

See merge request artica/pandorafms!5129
 2022-10-13 16:22:27 +00:00
Jimmy Olano d4bf526979 Merge branch 'ent-9522-14213-llamada-api-add_event_comment-en-metaconsola-no-funciona' into 'develop' 
fixed api function add comment for metaconsole pandora_enterprise#9522

pandora_enterprise#9522

See merge request artica/pandorafms!5121
 2022-10-13 16:15:45 +00:00
Jimmy Olano 1a28c91992 Merge branch 'ent-9519-un-widget-tipo-agent-module-view-en-un-dashboard-falla-al-agregar-mas-modulos-del-mismo-agente' into 'develop' 
fixed agent/module widget pandora_enterprise#9519

pandora_enterprise#9519

See merge request artica/pandorafms!5118
 2022-10-13 15:26:14 +00: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
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
artica b98b0f3ab3 Auto-updated build strings. 2022-10-13 01:00:17 +02:00
artica ccd578690b Auto-updated build strings. 2022-10-12 01:00:22 +02:00
Diego Muñoz-Reja 6d076adb9f Merge branch 'ent-8597-13156-anadir-opciones-en-busqueda-de-eventos' into 'develop' 
filter events multiselector nodes pandora_enterprise#8597

See merge request artica/pandorafms!5152
 2022-10-11 15:15:07 +00:00
Diego Muñoz-Reja 8154ef5533 Merge branch 'ent-9391-Cambios-en-el-inventario-remoto' into 'develop' 
added change to allow inventory modules to load script from a path

See merge request artica/pandorafms!5151
 2022-10-11 15:14:45 +00:00
Diego Muñoz-Reja 326365e54b Merge branch 'ent-9324-meta-wizard-no-borra-agentes' into 'develop' 
fixed wizard meta delete agent pandora_enterprise#9324

See merge request artica/pandorafms!5131
 2022-10-11 14:50:50 +00:00
Diego Muñoz-Reja 4666e1abf0 Merge branch 'ent-9511-llamada-API-module_data-modifica-el-intervalo' into 'develop' 
Fix interval definition

See merge request artica/pandorafms!5122
 2022-10-11 14:37:54 +00:00
Jimmy Olano c14074d4ae Merge branch 'ent-9578-14208-evento-no-validado-ack-sale-como-1970' into 'develop' 
ack_utimestamp integer pandora_enterprise#9578

pandora_enterprise#9578

See merge request artica/pandorafms!5165
 2022-10-11 12:03:29 +00:00
Jimmy Olano 132c720901 Merge branch 'ent-9297-derivado-del-trabajo-q-a-764-falso-positivo-de-violacion-de-acl-png' into 'develop' 
Ent 9297 derivado del trabajo q a 764 falso positivo de violacion de acl png

ref: pandora_enterprise#9297

See merge request artica/pandorafms!5142
 2022-10-11 10:25:58 +00:00
Jimmy Olano c7cfd2319d Merge branch 'ent-9626-en-consola-web-y-en-nodo-se-muestran-como-favoritas-todas-las-consolas-visuales' into 'develop' 
Fix vc faourite showing all consoles bug

Ref: pandora_enterprise#9626

See merge request artica/pandorafms!5184
 2022-10-11 09:49:01 +00:00
edu.corral 2262754eaf ent 9098 insert_gis_data 2022-10-11 11:46:02 +02:00
artica e5bdceee78 Auto-updated build strings. 2022-10-11 01:00:22 +02:00