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

25039 Commits

Author SHA1 Message Date
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
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
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
Jimmy Olano 164ccb0631 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-17 13:25:21 +02: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
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
Daniel Barbero ace6bcc854 Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 2022-10-14 09:36:02 +02: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 Barbero a21048c4c5 Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-14 08:11:51 +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
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
Daniel Barbero 19cfc84a39 add mode maintenance VC pandora_enterprise#4822 2022-10-13 17:45:44 +02: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 Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +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
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 Barbero 9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02: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
Daniel Maya 5e062b2a51 #9591 added dialog 2022-10-11 17:22:53 +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
alejandro.campos@artica.es 5501e1f3d5 fix typo in code 2022-10-11 15:24:34 +02: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
alejandro.campos@artica.es ac7f8419a6 fix several problems in history db settings 2022-10-11 13:39:47 +02:00
alejandro.campos@artica.es b218cd0d15 fix several problems in history db settings 2022-10-11 13:32:29 +02:00
alejandro.campos@artica.es 07232d82d1 fix several problems in history db settings 2022-10-11 13:26:25 +02: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 a078fb790a ent 9117 service tree mouseover 2022-10-11 09:46:53 +02:00
artica e5bdceee78 Auto-updated build strings. 2022-10-11 01:00:22 +02:00
Daniel Barbero 58221a7c12 fixed minor error array servers pandora_enterprise#8597 2022-10-10 17:08:20 +02:00
Daniel Barbero d90005d0f5 Merge remote-tracking branch 'origin/develop' into ent-8597-13156-anadir-opciones-en-busqueda-de-eventos 2022-10-10 16:37:45 +02:00
edu.corral 40c9ed762c ent 9117 mouseover service tree 2022-10-10 16:16:00 +02:00
Daniel Barbero ab59537d42 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 13:29:40 +02:00
Daniel Maya bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Daniel Barbero d068a9e9cc fixed group by extra_id pandora_enterprise#9425 2022-10-10 13:18:57 +02:00
Calvo 9f5a619155 Fix vc faourite showing all consoles bug 2022-10-10 12:45:25 +02:00
Daniel Barbero 38dea9e01b Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra 2022-10-10 11:27:28 +02:00
Daniel Barbero ce823dca38 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 11:20:03 +02:00
alejandro.campos@artica.es a3eaaf1f5e workaround to avoid visual issue in PDFs 2022-10-10 09:49:11 +02:00
Daniel Barbero 836cef7830 Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-10 09:00:35 +02:00
artica 7a2f8fdef0 Auto-updated build strings. 2022-10-10 01:00:16 +02:00
artica 771fa9e099 Auto-updated build strings. 2022-10-09 01:00:17 +02:00
artica 92aa05ddb4 Auto-updated build strings. 2022-10-08 01:00:20 +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 7f220eae19 #4043 Added wizard WMI 2022-10-07 10:06:35 +02:00
artica 4e665b180f Auto-updated build strings. 2022-10-07 01:00:20 +02:00
Calvo 7eb1aa5549 Added id to form on html print form grid 2022-10-06 19:58:28 +02:00
Daniel Barbero 014441a2da new widget grouped meter graphs pandora_enterprise#8620 2022-10-06 17:13:45 +02:00
Daniel Barbero 54b44cc7fc new widget grouped meter graphs pandora_enterprise#8620 2022-10-06 09:41:31 +02:00
Daniel Barbero 7a3d892bd4 Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-06 08:17:45 +02:00
artica fa3f224325 Auto-updated build strings. 2022-10-06 01:00:20 +02:00
Daniel Barbero 461f4f13cb new widget grouped meter graphs pandora_enterprise#8620 2022-10-05 17:06:55 +02:00
Daniel Maya e743c57a71 #4043 added SNMP 2022-10-05 15:47:49 +02:00
artica 29e49f9ae0 Auto-updated build strings. 2022-10-05 01:00:20 +02:00
alejandro.campos@artica.es 2ea3c3038c fixed vulnerabilities 2022-10-04 18:13:50 +02:00
alejandro.campos@artica.es 05cbc2fb0e fixed vulnerability 2022-10-04 18:00:47 +02:00
José González b5dcc5936e Fix issue 2022-10-04 16:59:25 +02:00
José González 381dea9b54 Added excluded password utility 2022-10-04 16:54:34 +02:00
José González dc38e2e50a Added exclude words for passwords control 2022-10-04 15:12:12 +02:00
Daniel Maya eefb872c47 #9604 Fixed delete_host and ignore_host 2 2022-10-04 13:16:39 +02:00
Daniel Maya 66e083a964 #9604 Fixed delete_host and ignore_host 2022-10-04 10:58:30 +02:00
Daniel Maya 2d747caede #4043 mr 58 2022-10-04 09:58:07 +02:00
Daniel Maya 767ca3732b #4043 Added WMI 2022-10-04 09:57:31 +02:00
Daniel Barbero a727ee72cc Merge remote-tracking branch 'origin/develop' into ent-9536-autoincremento-de-indices-en-la-sync-de-meta-nodo 2022-10-04 08:10:54 +02:00
artica a313678dca Auto-updated build strings. 2022-10-04 01:00:17 +02:00
Daniel Barbero 95bf5e88b8 force insert with primary key pandora_enterprise#9536 2022-10-03 15:33:01 +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 a674bdceb0 #9595 Fixed order 2022-10-03 10:16:00 +02:00
Daniel Maya 4e68ae62ef #5584 Added edit users 2 2022-10-03 09:07:35 +02:00
artica 42434b16a9 Auto-updated build strings. 2022-10-03 01:00:16 +02:00
artica 9ca27ab588 Auto-updated build strings. 2022-10-02 01:00:16 +02:00
artica b1e499f336 Auto-updated build strings. 2022-10-01 01:00:17 +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 Barbero ead788cfd5 ack_utimestamp integer pandora_enterprise#9578 2022-09-30 12:30:01 +02:00
artica 07de764545 Updated version and build strings. 2022-09-30 12:00:00 +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
sergio 429cefcf2b #9300 label change 2022-09-30 09:59:53 +02:00
Daniel Barbero 23f9636540 translate pandora_enterprise#9572 2022-09-30 09:32:50 +02:00
Daniel Maya 2d31c7b116 #9334 fixed regex 2022-09-30 09:16:31 +02:00
Daniel Barbero 4609e141ee remove tmetaconsole_history token pandora_enterprise#9579 2022-09-30 08:56:19 +02:00
artica af7cbc5901 Auto-updated build strings. 2022-09-30 01:00:20 +02:00
José González 6cdb1b0441 Fix mistake with User IP and User name 2022-09-29 17:46:39 +02:00
Daniel Maya ee83cbf155 #9334 Fixed satellite host 2 2022-09-29 16:17:41 +02:00
Daniel Barbero 81ed331688 translates pandora_enterprise#9572 2022-09-29 15:19:11 +02: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
Diego Muñoz-Reja 5de7d9e413 Merge branch 'ent-9583-fallos-en-vista-repositorio-de-agentes' into 'develop' 
Fix datatable var scope

See merge request artica/pandorafms!5154
 2022-09-29 12:00:26 +00:00
Daniel Rodriguez c784e03883 Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' into 'develop' 
Ready

See merge request artica/pandorafms!5084
 2022-09-29 11:25:40 +00:00
Daniel Barbero 8438045cf6 filter recursive groups in events pandora_enterprise#2133 2022-09-29 12:54:46 +02:00
Calvo e2f4f4df34 Fix datatable var scope 2022-09-29 12:31:33 +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
Daniel Barbero 3dea1f3146 filter events multiselector nodes pandora_enterprise#8597 2022-09-29 09:17:37 +02:00
artica 2855e6ac48 Auto-updated build strings. 2022-09-29 01:00:21 +02:00
José González a4be805ba4 Fix 2022-09-29 00:24:31 +02:00
José González f8efbc5fce Fixed issue with module name 2022-09-28 16:29:18 +02:00
Diego Muñoz-Reja 9aa1d4d82f Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop' 
removed mr

See merge request artica/pandorafms!5150
 2022-09-28 14:02:06 +00:00
alejandro.campos@artica.es 4dd0075b72 removed mr 2022-09-28 15:53:44 +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
Daniel Maya 6babb50608 #9334 Fixed satellite host 2022-09-28 15:00:46 +02:00
Daniel Barbero 8d8140faa4 add new macros response events pandora_enterprise#9423 2022-09-28 09:30:30 +02:00
Daniel Barbero 755432b381 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-28 08:52:43 +02:00
Jimmy Olano 3ec710a62f Merge branch 'ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados' into 'develop' 
fixed widget dashboards no exist item pandora_enterprise#9229

pandora_enterprise#9229

See merge request artica/pandorafms!5035
 2022-09-28 00:55:09 +00:00
artica dde27c12b1 Auto-updated build strings. 2022-09-28 01:00:20 +02:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 9c7e70c7de changes to mr 2022-09-27 17:19:10 +02:00
Jimmy Olano 09e934395f Merge branch 'ent-9456-giss-errores-en-la-paginacion-vista-alertas-metaconsola' into 'develop' 
Fix alerts list pagination on meta

Ref: pandora_enterprise#9456

See merge request artica/pandorafms!5095
 2022-09-27 14:10:47 +00:00
Daniel Barbero 9e2c6edfeb new group by events for extraid pandora_enterprise#9425 2022-09-27 15:08:09 +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
Daniel Rodriguez 5047f8afb9 Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' 
Ent 8659 mostrar nombre completo del usuario para el owner de un evento

See merge request artica/pandorafms!5114
 2022-09-27 10:50:17 +00:00
José González 1ae6267acc Fix issue with agent_alias 2022-09-27 11:14:18 +02:00
Daniel Barbero 7bedb8ecf7 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-27 09:52:24 +02:00
Daniel Barbero fbce8b7533 fixed response events pandora_enterprise#9423 2022-09-27 09:51:37 +02:00
artica fa8386194c Auto-updated build strings. 2022-09-27 01:00:21 +02:00
Diego Muñoz-Reja 10d97c8cfa Merge branch 'ent-9420-eventos-agrupados-no-muestran-estado-del-ultimo-elemento' into 'develop' 
fixed group by order event_get_all pandora_enterprise#9420

See merge request artica/pandorafms!5106
 2022-09-26 15:16:15 +00:00
alejandro.campos@artica.es 7e85bea0f4 added change to allow inventory modules to load script from a path 2022-09-26 15:30:31 +02:00
Diego Muñoz-Reja 4fba7077ec Merge branch 'ent-9255-error-en-notificacion-consola-php-8-y-mysql-8' into 'develop' 
Ent 9255 error en notificacion consola php 8 y mysql 8

See merge request artica/pandorafms!5081
 2022-09-26 13:07:50 +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 c58cf09d62 #9252 Added images of spain, europe and world 2022-09-26 12:45:35 +02:00
Calvo 8174925a91 Delete favourite vc from menu when vc is deleted 2022-09-26 11:32:07 +02:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
Calvo 2a4176085f Fix alerts meta datatables 2022-09-26 09:22:19 +02:00
artica 4db9df6df5 Auto-updated build strings. 2022-09-26 01:00:17 +02:00
artica d7b4a8f248 Auto-updated build strings. 2022-09-25 01:00:16 +02:00
artica 0ce954af56 Auto-updated build strings. 2022-09-24 01:00:20 +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 Barbero 225646cd9d fixed response events pandora_enterprise#9423 2022-09-23 13:55:01 +02:00
Daniel Maya 795308367f #9254 load password with ajax 2022-09-23 13:24:46 +02:00
alejandro.campos@artica.es 520a820625 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' of brutus.artica.es:artica/pandorafms into ent-8217-Comando-Accion-de-alerta-para-enviar-informes 2022-09-23 13:00:40 +02:00
alejandro.campos@artica.es 23bb4d0750 minor fix 2022-09-23 13:00:28 +02:00
José González 09c6c5a0f9 Fix 2022-09-23 12:54:51 +02:00
edu.corral 6a93b4d554 ent 9303 audit log extended info 2022-09-23 11:35:17 +02:00
alejandro.campos@artica.es 8918682f67 minor change 2022-09-23 09:58:37 +02:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02: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
artica d14bcfe616 Auto-updated build strings. 2022-09-23 01:00:20 +02:00
Calvo eed28bc668 Fix user form reset if profile fails 2022-09-22 17:07:43 +02:00
Diego Muñoz-Reja 0488eec00d Merge branch 'ent-8775-separar-el-paso-a-historico-de-datos-y-string' into 'develop' 
Historic string data separated from normal data

See merge request artica/pandorafms!5093
 2022-09-22 14:47:23 +00:00
Daniel Rodriguez fdd6699de5 Merge branch 'ent-9453-limites-tmodule_group-alcanzados-por-cliente' into 'develop' 
fixed size field bbdd tmodule_group pandora_enterprise#9453

See merge request artica/pandorafms!5102
 2022-09-22 13:37:07 +00:00
Daniel Rodriguez ad2425c429 Merge branch 'ent-9269-update-manager-offline-en-la-763-da-errores-aunque-actualiza' into 'develop' 
Ent 9269 update manager offline en la 763 da errores aunque actualiza

See merge request artica/pandorafms!5088
 2022-09-22 13:34:16 +00:00
Calvo 9499da3176 API and LDAP remote user fix with login error fix 2022-09-22 12:34:40 +02:00
Daniel Maya 28b31d730d #9269 Fixed deny 2022-09-22 11:44:41 +02:00
Daniel Rodriguez c34328583f Merge branch 'ent-8978-derivado-del-trabajo-q-a-762-lts-servidores-pfms-sin-dig-ni-y-o-whois-instalado' into 'develop' 
Ent 8978 derivado del trabajo q a 762 lts servidores pfms sin dig ni y o whois instalado

See merge request artica/pandorafms!5082
 2022-09-22 08:21:41 +00: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
Daniel Barbero 3a43ee73bc fixed widget groups status pandora_enterprise#9229 2022-09-22 08:39:12 +02:00
artica b7bef2dd58 Auto-updated build strings. 2022-09-22 01:00:20 +02:00
Daniel Barbero f688f73c46 fixed historical database pandora_enterprise#8791 2022-09-21 16:35:36 +02:00
alejandro.campos@artica.es 2af04e7de0 change mr 2022-09-21 15:22:20 +02:00
Daniel Barbero 2343456113 Merge remote-tracking branch 'origin/develop' into ent-8791-base-de-datos-historica-para-metaconsola 2022-09-21 15:20:30 +02:00
Daniel Barbero 72040df7bb fixed wizard meta delete agent pandora_enterprise#9324 2022-09-21 13:37:51 +02:00
alejandro.campos@artica.es debf2e7a40 fixed limitation of group_concat 2022-09-21 13:32:36 +02:00
Daniel Maya 199d16f561 #9431 Fixed webserver module 2022-09-21 13:21:59 +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
Daniel Rodriguez d83ada6164 Merge branch 'ent-9262-13905-time-in-warning-status-informacion-incorrecta-en-informe' into 'develop' 
fixed error massive services operations pandora_enterprise#9262

See merge request artica/pandorafms!5099
 2022-09-21 08:08:39 +00:00
edu.corral a13c2a24a9 ent 9485 metaconsole alert filter 2022-09-21 09:46:31 +02:00