Commit Graph

24501 Commits

Author SHA1 Message Date
Daniel Barbero Martin 6edc6e1014 Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-28 08:51:22 +02:00
artica 6765cc136f Auto-updated build strings. 2022-06-28 01:01:20 +02:00
Daniel Barbero Martin 941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Maya 2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
	pandora_console/include/functions_events.php
2022-06-27 16:07:19 +02:00
Daniel Barbero Martin b82ea58efd new icons widgets dashboards pandora_enterprise#8621 2022-06-27 16:00:36 +02:00
Daniel Barbero Martin 3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin f1ac9cefd8 new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:47:33 +02:00
Daniel Barbero Martin a5e845e98f new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:45:21 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
2022-06-27 08:38:50 +02:00
artica beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica 036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
Junichi Satoh 8123392c50 Updated Japanese console translations. 2022-06-24 13:53:57 +09:00
artica a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin bf28b44339 mr 2022-06-23 14:35:38 +02:00
Daniel Rodriguez 7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop'
Change collapsed filename

See merge request artica/pandorafms!4977
2022-06-23 12:29:26 +00:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
José González 237de0ee97 Resized alert action list and refactor 2022-06-23 12:21:00 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop'
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
2022-06-23 10:07:24 +00:00
Daniel Barbero Martin 6a614847a2 refactor events meta pandora_enterprise#9086 2022-06-23 11:49:04 +02:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop'
Added control for WMI binary

See merge request artica/pandorafms!4884
2022-06-23 08:27:11 +00:00
Daniel Rodriguez d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop'
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
2022-06-23 07:53:11 +00:00
artica 7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02:00
Daniel Barbero Martin b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
artica a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
José González 82480fa503 Updated logo 2022-06-22 16:46:24 +02:00
Daniel Rodriguez 428de71b85 Merge branch 'ent-9192-cambio-imagen-warp-update-online' into 'develop'
new images update manager online pandora_enterprise#9192

See merge request artica/pandorafms!4976
2022-06-22 14:44:20 +00:00
José González f241202168 Update delete_files.txt 2022-06-22 14:34:23 +00:00
José González 5e09b99504 Change collapsed filename 2022-06-22 16:00:04 +02:00
Daniel Barbero Martin e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02:00
Daniel Rodriguez 7e206716d7 Merge branch 'ent-9181-problema-al-borrar-agentes-cuando-hay-modulos-delete-pending' into 'develop'
Ent 9181 problema al borrar agentes cuando hay modulos delete pending

See merge request artica/pandorafms!4973
2022-06-22 12:29:19 +00:00
José González 38ecfd5b62 Added message for control return code in WMI 2022-06-22 14:25:08 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 962f223670 new images update manager online pandora_enterprise#9192 2022-06-22 12:21:51 +02:00
José González 5f05b79e66 Fix issue with header 2022-06-22 12:06:34 +02:00
Ramon Novoa 59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Rodriguez 7798e0cd63 Merge branch 'ent-9179-actualizar-traducciones' into 'develop'
Ent 9179 actualizar traducciones

See merge request artica/pandorafms!4969
2022-06-22 09:07:30 +00:00
Daniel Rodriguez f35a802c44 Merge branch 'ent-7926-giss-12134-token-para-cambiar-comportamiento-de-evaluacion-de-servicios' into 'develop'
#7926 Added asynchronous mode

See merge request artica/pandorafms!4972
2022-06-22 09:06:40 +00:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin f39d502108 refactor events meta pandora_enterprise#9086 2022-06-22 10:11:24 +02:00
edu.corral 19a26d6835 ent 9181 delete agent with delete pending modules 2022-06-22 10:01:35 +02:00
Daniel Barbero Martin 4ca78ec00c refactor events meta pandora_enterprise#9086 2022-06-22 09:44:00 +02:00
Daniel Barbero Martin 9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
artica a17232fb86 Auto-updated build strings. 2022-06-22 01:00:51 +02:00
Daniel Maya 44fdf1c321 #7926 Added asynchronous mode 2022-06-21 16:31:56 +02:00
Daniel Rodriguez 2ab8918463 Merge branch 'ent-9034-Alert-SNMP-como-agent-name-vista-tactica' into 'develop'
Clean unnecesary message

See merge request artica/pandorafms!4970
2022-06-21 14:18:16 +00:00
edu.corral 28d25acbcb ent-9179 translations 2022-06-21 15:19:33 +02:00
José González b2b64ae014 Merge remote-tracking branch 'origin' into ent-9034-Alert-SNMP-como-agent-name-vista-tactica 2022-06-21 14:47:28 +02:00
José González 4480455258 Clean unnecesary message 2022-06-21 14:45:17 +02:00
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
2022-06-21 14:43:47 +02:00
Daniel Barbero Martin 9bb072a48a refactor events meta pandora_enterprise#9086 2022-06-21 14:10:08 +02:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Barbero Martin f93e141aac refactor events meta pandora_enterprise#9086 2022-06-21 11:22:56 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 9421cd46f5 Merge branch 'ent-8857-llamada-set-new_agent-api-meta' into 'develop'
Api create agent meta support

See merge request artica/pandorafms!4860
2022-06-21 08:39:22 +00:00
Daniel Rodriguez 529ce88d00 Merge branch 'ent-9131-Falla-carga-de-eventos-v762-ante-eventos-especificos' into 'develop'
Fix possible custom_data with null strings

See merge request artica/pandorafms!4952
2022-06-21 08:31:53 +00:00
José González 036505fa68 Fix DB issue 2022-06-21 09:38:13 +02:00
José González 346ac640e4 Merge 2022-06-21 09:32:57 +02:00
artica a5d13f5e16 Auto-updated build strings. 2022-06-21 01:00:18 +02:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop'
Console changes for 8590

See merge request artica/pandorafms!4947
2022-06-20 15:11:42 +00:00
Daniel Rodriguez 8fb54be1bb Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop'
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
2022-06-20 15:07:01 +00:00
Luis 71326bf8bb Update pandoradb_migrate_6.0_to_759.mysql.sql 2022-06-20 14:57:45 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez fa8ed3398f Merge branch 'ent-8061-vista-netflow-con-black-theme' into 'develop'
Fix black theme issues

See merge request artica/pandorafms!4873
2022-06-20 09:38:25 +00:00
Daniel Rodriguez f4761e5c0f Merge branch 'ent-9067-no-estan-funcionando-los-enlaces-sistema-de-notificacion' into 'develop'
Ent 9067 no estan funcionando los enlaces sistema de notificacion

See merge request artica/pandorafms!4964
2022-06-20 09:09:16 +00:00
Calvo 5a6fc5630e Add transaltion to discovery message 2022-06-20 10:37:25 +02:00
Daniel Rodriguez a7c61d9ee8 Merge branch 'ent-9139-Widget-Top-N-sale-mal-Continuacion' into 'develop'
Fix

See merge request artica/pandorafms!4956
2022-06-20 08:36:56 +00:00
Ramon Novoa 9b5b4deb67 Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-20 10:25:22 +02:00
Daniel Barbero Martin ca298422bd Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-20 07:58:40 +02:00
artica c4fadcd461 Auto-updated build strings. 2022-06-20 01:00:14 +02:00
artica d2e140e85b Auto-updated build strings. 2022-06-19 01:00:14 +02:00
artica 7574e99e80 Auto-updated build strings. 2022-06-18 01:00:19 +02:00
Calvo 291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González 6f903023a7 Fix 2022-06-17 12:42:24 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Calvo 5ce0ebb72a Fix agent view satellite name visual 2022-06-17 10:09:37 +02:00
José González 7f2182d52a Merge branch 'develop' into 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion'
# Conflicts:
#   pandora_console/install.php
2022-06-17 07:37:01 +00:00
José González 93b9e6142e DB Changes #8912 2022-06-17 09:00:35 +02:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Maya 6d1f03a633 #9158 Fixed digital clock 2022-06-17 08:17:55 +02:00
artica ddee99b016 Auto-updated build strings. 2022-06-17 01:00:19 +02:00
José González 6d70353254 Fix mistake 2022-06-16 16:09:05 +00:00
edu.corral a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
José González 4c2ad2822f Fix visual issue 2022-06-16 16:04:22 +02:00
Daniel Maya ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop'
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
2022-06-16 12:17:27 +00:00
Daniel Barbero Martin 6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00
Daniel Rodriguez d400d5b7dc Merge branch 'ent-8860-mejora-wizard-snmp' into 'develop'
Applied fix for snmp

See merge request artica/pandorafms!4868
2022-06-16 11:46:53 +00:00
Daniel Rodriguez ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop'
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
2022-06-16 11:35:40 +00:00
edu.corral 4ee4590690 ent-9067 notifications fixed 2022-06-16 13:02:49 +02:00
alejandro.campos@artica.es 705ebb8168 fixed vc elements edition 2022-06-16 12:19:59 +02:00
José González 32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
José González bad0335502 Changed styles 2022-06-16 11:14:29 +02:00
José González ea60e4be71 Added database changes 2022-06-16 11:14:00 +02:00
Daniel Rodriguez 52cfd6b70a Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop'
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales

See merge request artica/pandorafms!4852
2022-06-16 09:03:28 +00:00
Daniel Rodriguez fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop'
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
2022-06-16 08:43:12 +00:00
Daniel Rodriguez f34ec5dcc9 Merge branch 'ent-9022-Bug-histórico-de-actualizaciones' into 'develop'
Ent 9022 bug histórico de actualizaciones

See merge request artica/pandorafms!4917
2022-06-16 08:42:39 +00:00
Daniel Rodriguez 6a72479771 Merge branch 'ent-9141-dependencias-que-faltan-para-instaladores' into 'develop'
Adding dependencies to pandorafms rpm packages

See merge request artica/pandorafms!4961
2022-06-16 07:16:49 +00:00
Daniel Barbero Martin acef7e6f63 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
	pandora_console/operation/events/events.php
2022-06-16 09:09:49 +02:00
Daniel Maya bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +02:00
Daniel Rodriguez 74e2dcad26 Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop'
Set new brand and color for header

See merge request artica/pandorafms!4944
2022-06-16 06:43:21 +00:00
Daniel Rodriguez d57394c0b9 Merge branch 'ent-8856-no-funciona-crear-componentes-en-metaconsola-api-2' into 'develop'
Ent 8856 no funciona crear componentes en metaconsola api 2

See merge request artica/pandorafms!4955
2022-06-16 06:42:38 +00:00
Daniel Rodriguez ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop'
Improve event names

See merge request artica/pandorafms!4951
2022-06-16 06:41:07 +00:00
artica 592d09d34a Auto-updated build strings. 2022-06-16 01:00:17 +02:00
Daniel Barbero Martin d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +02:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
Daniel Rodriguez a8c649c18a Merge branch 'ent-8630-Mensaje-de-erroneo-al-registrar-nodo-enlazado-a-una-meta' into 'develop'
prevent registration dialog from showing up in update manager of metaconsole nodes

See merge request artica/pandorafms!4832
2022-06-15 12:22:11 +00:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Maya 9a7e0e3228 #8899 Fixed history_db_enabled 2022-06-15 09:37:29 +02:00
Daniel Barbero Martin 080c10aad7 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-15 08:50:00 +02:00
artica 3ee1ba0bbc Auto-updated build strings. 2022-06-15 01:00:16 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Rafael Ameijeiras 26038b6aaa Adding dependencies to pandorafms rpm packages 2022-06-14 16:55:25 +02:00
Rafael Ameijeiras 30fd072cb9 Adding dependencies to pandorafms rpm packages 2022-06-14 16:51:03 +02:00
Daniel Rodriguez 709b49a371 Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop'
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql

See merge request artica/pandorafms!4954
2022-06-14 12:10:22 +00:00
Daniel Rodriguez c00f1ed1b6 Merge branch 'ent-8838-Longitud-id-user-tusuario' into 'develop'
changed id_user field length from tusuario

See merge request artica/pandorafms!4876
2022-06-14 09:33:09 +00:00
alejandro.campos@artica.es ec7a2f89bd revert migrate file 2022-06-14 10:17:43 +02:00
alejandro.campos@artica.es 4d3d684eeb revert migrate file 2022-06-14 10:15:15 +02:00
alejandro.campos@artica.es ac246aefb1 revert migrate file 2022-06-14 10:06:28 +02:00
alejandro.campos@artica.es c09d1334d6 revert migrate file 2022-06-14 10:05:05 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
artica c7b8c55284 Auto-updated build strings. 2022-06-14 01:00:42 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
	pandora_console/include/javascript/pandora.js
2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
José González dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
José González 8e4cffbc0a Several style refactory 2022-06-13 12:34:16 +02:00
José González b5de60fb69 Update manager to Warp manager 2022-06-13 12:33:03 +02:00
alejandro.campos@artica.es 5539ca51c5 minor change 2022-06-13 12:32:04 +02:00
José González 2568c877a2 Clear unnecessary CSS file 2022-06-13 12:31:33 +02:00
Daniel Rodriguez 871e1cc0c0 Merge branch 'ent-9066-Mala-traducción-al-castellano-Menú-colapsado' into 'develop'
Fixed languages files

See merge request artica/pandorafms!4943
2022-06-13 09:42:45 +00:00
Daniel Rodriguez 38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop'
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
2022-06-13 09:22:54 +00:00
Daniel Rodriguez 3506fd0067 Merge branch 'ent-9030-cambiar-altura-lista-vista-filtro-eventos' into 'develop'
Change selector size

See merge request artica/pandorafms!4920
2022-06-13 09:22:22 +00:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
artica 85f31c5ab4 Auto-updated build strings. 2022-06-13 01:00:16 +02:00
artica 62bcc9e267 Auto-updated build strings. 2022-06-12 01:00:15 +02:00
artica 46897aff83 Auto-updated build strings. 2022-06-11 01:00:50 +02:00
José González b068b35d78 Visual improvements 2022-06-10 12:58:13 +02:00
José González 3ec50f10b4 Update warp strings 2022-06-10 12:57:45 +02:00
José González 05bcbfaf79 Minor fixes 2022-06-10 12:57:25 +02:00
José González 022d28981d Update styles 2022-06-10 12:57:04 +02:00
José González 0784b25ea0 Update Warp strings 2022-06-10 12:56:45 +02:00
José González bb17645c88 Fix 2022-06-10 10:40:28 +02:00
José González eed2030bba WIP: Backup upload 2022-06-10 10:17:53 +02:00
José González 815a737a69 Change strings for Update Manager references to WARP update 2022-06-10 10:17:23 +02:00
artica 32c62e9f93 Auto-updated build strings. 2022-06-10 01:00:21 +02:00
edu.corral ae657ee018 8856 meta api functions 2022-06-09 17:22:00 +02:00
Daniel Maya 519fd13299 #9134 Added dsiabled in mr 2022-06-09 15:22:14 +02:00
Daniel Maya a5517a9c02 #9134 Added disabled 2022-06-09 15:12:05 +02:00
Daniel Maya 2cfb4e53c2 #9033 Fixed group events 2022-06-09 14:59:43 +02:00
Daniel Rodriguez 50442faf26 Merge branch 'ent-9108-No-funciona-widget-Odometro-en-version-Open' into 'develop'
Ent 9108 no funciona widget odometro en version open

See merge request artica/pandorafms!4938
2022-06-09 12:50:39 +00:00
José González 73a124b299 Fix possible custom_data with null strings 2022-06-09 14:00:53 +02:00
Ramon Novoa 48b20b255b Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-09 12:05:24 +02:00
José González bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00
Daniel Rodriguez 6a8abc035f Merge branch 'ent-9076-Texto-Update-Manager' into 'develop'
fixed wrong encoding

See merge request artica/pandorafms!4950
2022-06-09 07:39:31 +00:00
Daniel Rodriguez 60dad90807 Merge branch 'ent-9060-Bulk-operations-modifican-todos-modulos-incluso-con-acceso-restringido' into 'develop'
Fix issue with bulk operations over modules with not allowed groups

See merge request artica/pandorafms!4922
2022-06-09 07:36:20 +00:00
Daniel Rodriguez 336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop'
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
2022-06-09 07:34:40 +00:00
Daniel Rodriguez ad9a864b1c Merge branch 'ent-9116-13158-Nuevos-fallos-componentes-locales-con-politicas-con-macro' into 'develop'
fixed macro default value not loading

See merge request artica/pandorafms!4941
2022-06-09 07:32:18 +00:00
artica 9d28c67a1c Auto-updated build strings. 2022-06-09 01:00:21 +02:00
alejandro.campos@artica.es c48eae6da0 fixed wrong encoding 2022-06-08 18:25:32 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Maya 3e15ed2726 #8302 Added show_empty_groups 2022-06-08 15:17:03 +02:00
José González bad2438867 Update massive_edit_modules.php 2022-06-08 12:38:03 +00:00
Daniel Maya e43426ddc8 #8252 Fixed title 2022-06-08 13:29:43 +02:00
Daniel Maya 90d4cfa0db #8252 Move up and down fields 2022-06-08 13:24:27 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02:00
alejandro.campos@artica.es 6f0782782e Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario 2022-06-08 11:54:35 +02:00
alejandro.campos@artica.es 12b0f5cda1 database changes 2022-06-08 11:49:48 +02:00
Daniel Rodriguez a40efcfee5 Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop'
Ent 9037 controles pegados en agente detail view

See merge request artica/pandorafms!4936
2022-06-08 09:11:54 +00:00
Daniel Rodriguez 1eea27e1f3 Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop'
Ent 9040 mejoras en la vista de agents alerts

See merge request artica/pandorafms!4933
2022-06-08 09:11:19 +00:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop'
fixed permissions in selectors

See merge request artica/pandorafms!4931
2022-06-08 09:10:51 +00:00
Daniel Maya 6a8140b36c #9125 Fixed chart type 2022-06-08 10:59:46 +02:00
Daniel Maya 4dd3b63052 #9101 Fixed write permissions 2022-06-08 09:43:36 +02:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
	pandora_console/include/functions_reporting.php
2022-06-08 08:15:49 +02:00
artica 8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
José González ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00
José González 4f21402992 Fixed languages files 2022-06-07 16:31:55 +02:00
Daniel Maya c9b94273be #8769 removed metaconsole_assigned_server 2022-06-07 15:21:07 +02:00
Daniel Rodriguez fc18c1a168 Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop'
Hide inventory view if agent dont have inventory modules

See merge request artica/pandorafms!4916
2022-06-07 11:52:37 +00:00
Daniel Rodriguez 6f5e1c3f94 Merge branch 'ent-8708-Version-mobile-visualiza-alertas-de-agentes-deshabilitados' into 'develop'
Ent 8708 version mobile visualiza alertas de agentes deshabilitados

See merge request artica/pandorafms!4859
2022-06-07 11:41:40 +00:00
José González e86d8b761d Refactor and improve code and added dialog for show error 2022-06-07 13:40:35 +02:00
José González 9d071982f5 Improve code 2022-06-07 13:39:58 +02:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop'
Service tree view with local scope parents

See merge request artica/pandorafms!4826
2022-06-07 10:47:26 +00:00
Daniel Rodriguez b962afe56d Merge branch 'ent-9078-Gráfica-de-estados-de-módulos' into 'develop'
Ent 9078 gráfica de estados de módulos

See merge request artica/pandorafms!4924
2022-06-07 10:46:18 +00:00
alejandro.campos@artica.es 7aa40617f8 fixed macro default value not loading 2022-06-07 11:20:51 +02:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop'
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
2022-06-07 09:12:51 +00:00
Daniel Rodriguez 08d8da9c83 Merge branch 'ent-8999-Cambiar-comportamiento-bulk-operations-meta' into 'develop'
Ent 8999 cambiar comportamiento bulk operations meta

See merge request artica/pandorafms!4904
2022-06-07 09:06:47 +00:00
José González 06d9e0d137 Improve security message 2022-06-07 10:51:37 +02:00
artica 851f1a19ce Auto-updated build strings. 2022-06-07 01:00:21 +02:00
José González 67ade2fccd Improved error message 2022-06-06 16:35:02 +02:00
Daniel Maya 44748a0f8b #9108 fixed modules_get_table_data 2022-06-06 16:34:16 +02:00
Daniel Rodriguez 5138756525 Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop'
Ent 8958 13577 error al quitar un comando de una acción

See merge request artica/pandorafms!4878
2022-06-06 12:16:15 +00:00
Daniel Rodriguez 618ff10fa2 Merge branch 'ent-8153-POST-Campos-extendidos-en-informe-de-eventos' into 'develop'
Ent 8153 post campos extendidos en informe de eventos

See merge request artica/pandorafms!4830
2022-06-06 10:52:51 +00:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
Daniel Rodriguez 416021bca6 Merge branch 'ent-8822-enlace-web-en-metaconsola-para-nuevas-sugerencias' into 'develop'
Changed link to Suggest new feature on new installation

See merge request artica/pandorafms!4874
2022-06-06 08:45:20 +00:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
artica 9712cf6c0f Auto-updated build strings. 2022-06-06 01:00:16 +02:00
artica 05b97a3dbc Auto-updated build strings. 2022-06-05 01:00:16 +02:00
artica 44925ef341 Auto-updated build strings. 2022-06-04 01:00:22 +02:00
edu.corral 9d7b047e72 9037 fixed agent view controls 2022-06-03 14:15:51 +02:00
José González 4aea15228e Fix minor issue 2022-06-03 14:11:57 +02:00
Daniel Rodriguez b2acb41c10 Merge branch 'ent-8632-colocar-recursion-bien-modificar-agente' into 'develop'
Fix recursion checkbox position

See merge request artica/pandorafms!4840
2022-06-03 11:45:15 +00:00
Alejandro Campos 91d949942a Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario'
# Conflicts:
#   pandora_console/extras/mr/55.sql
2022-06-03 10:26:35 +00:00
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +02:00
alejandro.campos@artica.es 0c9fdf8a18 changed field max length 2022-06-03 12:25:24 +02:00
alejandro.campos@artica.es d0386b17a4 fixed permissions 2022-06-03 11:41:06 +02:00
alejandro.campos@artica.es bf2ef75552 fixed permissions 2022-06-03 11:39:58 +02:00
Daniel Rodriguez 81e7f202c6 Merge branch 'ent-8890-Lista-de-tareas-RECON-con-muchos-targets-sale-horrible' into 'develop'
Ent 8890 lista de tareas recon con muchos targets sale horrible

See merge request artica/pandorafms!4864
2022-06-03 09:32:50 +00:00
Daniel Rodriguez 7f34ec585e Merge branch 'ent-8641-Estilos-rotos-vista-inicial-Manage-Database-HA' into 'develop'
Fix styles

See merge request artica/pandorafms!4801
2022-06-03 09:00:57 +00:00
Daniel Rodriguez 1f54d030c7 Merge branch 'ent-8928-Nuevo-widget-OS-Quick-Report' into 'develop'
Ent 8928 nuevo widget os quick report

See merge request artica/pandorafms!4877
2022-06-03 08:12:50 +00:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
Conflicts:
	pandora_console/operation/events/events.php
2022-06-03 09:28:18 +02:00
Daniel Barbero Martin 8dd9523b40 refactor events meta pandora_enterprise#9086 2022-06-03 09:20:51 +02:00
artica 21399593dd Auto-updated build strings. 2022-06-03 01:00:22 +02:00
Daniel Maya 3fb0392d80 #9040 changed table styles 2022-06-02 16:47:48 +02:00
Daniel Rodriguez 7ef4f00aea Merge branch 'ent-8970-bug-en-leyenda-al-generar-grafica-sql-en-plantillas-de-informe' into 'develop'
fixed visual error sql graph pandora_enterprise#8970

See merge request artica/pandorafms!4888
2022-06-02 14:16:29 +00:00
Daniel Rodriguez 616c2b776a Merge branch 'ent-8710-Cuadro-eliminar-alertas-masivas-pequeño' into 'develop'
Fix visual issue

See merge request artica/pandorafms!4844
2022-06-02 14:00:24 +00:00
Daniel Rodriguez a7791c06fc Merge branch 'ent-8751_espacios_no_mostrados_creando_agentes_en_API' into 'develop'
Fix x20; chars in alias when create agents with alias with spaces in API

See merge request artica/pandorafms!4804
2022-06-02 13:55:45 +00:00
Daniel Rodriguez 1aefe527c4 Merge branch 'ent-8723-13221-giss-optimizacion-en-el-despliegue-del-tree-view-de-servicios' into 'develop'
allow disable counters on mc environments

See merge request artica/pandorafms!4814
2022-06-02 09:08:08 +00:00
Daniel Rodriguez 8fcdb59ae8 Merge branch 'ent-7850-12225-Añadir-buscador-para-agentes-en-wizard-report' into 'develop'
implemented text search of select inputs

See merge request artica/pandorafms!4831
2022-06-02 08:31:58 +00:00
Daniel Rodriguez 8ea84fb247 Merge branch 'ent-8709-Limite-campo-update-manager-URL' into 'develop'
Cleaned limit

See merge request artica/pandorafms!4805
2022-06-02 07:38:56 +00:00
Daniel Rodriguez 98dd5b81ce Merge branch 'ent-8766-POST-Error-al-crear-eventos-con-comentarios-que-tienen-salto-de-línea' into 'develop'
Ent 8766 post error al crear eventos con comentarios que tienen salto de línea

See merge request artica/pandorafms!4796
2022-06-02 07:33:10 +00:00
Daniel Rodriguez 0a51c5f916 Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop'
Ent 8587 nueva representacion de servicios sunburst

See merge request artica/pandorafms!4819
2022-06-02 07:21:17 +00:00
Daniel Rodriguez 3945cfe07a Merge branch 'ent-8737-Filtro-eventos-se-pierde-al-poner-pantalla-completa' into 'develop'
Fix fb64 forgiven severity params

See merge request artica/pandorafms!4815
2022-06-02 07:09:40 +00:00
Daniel Rodriguez ff9d50f593 Merge branch 'ent-8788-Setup-Performance-e-Historical-database' into 'develop'
Ent 8788 setup performance e historical database

See merge request artica/pandorafms!4798
2022-06-02 07:05:38 +00:00
Daniel Barbero Martin 2cef931272 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-02 08:35:38 +02:00
artica e47b8ee657 Auto-updated build strings. 2022-06-02 01:00:20 +02:00
Daniel Barbero Martin d3e3ff3d9c refactor events meta pandora_enterprise#9086 2022-06-01 17:39:12 +02:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya 6c48717627 #9038 filter remake 2022-06-01 15:07:51 +02:00
alejandro.campos@artica.es 8b57e1dfb4 fixed permissions in selectors 2022-06-01 14:00:33 +02:00
artica aa6977e4db Auto-updated build strings. 2022-06-01 01:00:20 +02:00
Daniel Maya f4784f4922 #9031 Fixed css filter 2022-05-31 17:09:15 +02:00
Daniel Maya b756106f25 #9078 Fixed max critical 2 2022-05-31 10:34:13 +02:00
Daniel Maya 20e32eefe9 #9078 Fixed max critical 2022-05-31 10:32:57 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Barbero Martin c7088f9f19 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 2022-05-31 08:55:23 +02:00
artica a2e036d279 Auto-updated build strings. 2022-05-31 01:00:19 +02:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00