Commit Graph

20016 Commits

Author SHA1 Message Date
Jose Gonzalez de49530fd1 Avoid XSS in User management 2020-09-09 11:58:09 +02:00
Jose Gonzalez b9b94e1382 Avoid XSS in Private Enterprise Numbers 2020-09-09 11:44:26 +02:00
Jose Gonzalez 6a192433cb Avoid XSS in Net Scan scripts 2020-09-09 11:27:08 +02:00
alejandro-campos 77496bd5a2 added warning message 2020-09-09 09:35:21 +02:00
artica cbed2ef758 Auto-updated build strings. 2020-09-09 01:00:18 +02:00
artica 0ee9ed5dfa Updated version and build strings. 2020-09-08 15:00:36 +02:00
Luis Calvo 4a93f6c3a6 Fixed metaconsole SNMP interface graphs 2020-09-08 11:48:27 +02:00
artica 958c485f9d Auto-updated build strings. 2020-09-08 01:00:23 +02:00
Jose Gonzalez 18a993145e Fixed type array warning messages 2020-09-07 14:38:43 +02:00
Jose Gonzalez aecbab5c36 Fix variable type for array_flip instruction 2020-09-07 14:13:53 +02:00
Jose Gonzalez 42a615166e Fixed object definitions 2020-09-07 13:54:18 +02:00
Jose Gonzalez e3e7f3b313 Fixed error message "Invalid argument supplied for foreach()" and "in_array() expects parameter 2 to be array" 2020-09-07 12:58:09 +02:00
fbsanchez 9d3a209fc8 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-07 09:26:47 +02:00
artica 5093d94db3 Auto-updated build strings. 2020-09-07 01:00:14 +02:00
artica d86b11deb4 Auto-updated build strings. 2020-09-06 01:00:15 +02:00
artica 6433fadddd Auto-updated build strings. 2020-09-05 01:00:23 +02:00
alejandro-campos c4e192f7f7 fix agents selector check 2020-09-04 13:54:07 +02:00
marcos 6f02ee8206 fixed error with refresh in events filter 2020-09-04 12:38:46 +02:00
artica 44033aff20 Auto-updated build strings. 2020-09-04 01:00:18 +02:00
Marcos Alconada b02d44ced5 fixed error with snmp interfaces 2020-09-03 11:17:04 +02:00
artica 4c8e468437 Auto-updated build strings. 2020-09-03 01:00:17 +02:00
Luis Calvo 3d947ef77b Fixed credential store error message on required inputs 2020-09-02 11:20:31 +02:00
artica ba681816c1 Auto-updated build strings. 2020-09-02 01:00:16 +02:00
Luis Calvo 8314a25830 Fixed custom login background on Edge and IE 2020-09-01 17:52:36 +02:00
alejandro-campos d4b44d33a0 fix snmp version update 2020-09-01 17:39:25 +02:00
Alejandro Fraguas 7d3bc0b67f Merge branch 'ent-6211-Revisar-actualizacion-online-open' into 'develop'
fixed open online update

See merge request artica/pandorafms!3420
2020-09-01 15:55:33 +02:00
manuel.montes f8e36620e8 Added icon 2020-09-01 15:01:15 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes 05fadd167d Changed names 2020-09-01 12:30:55 +02:00
manuel.montes 51ed420d77 Fixed visual bug 2020-09-01 12:18:10 +02:00
alejandro-campos 0345d36d08 fixed open online update 2020-09-01 08:12:57 +02:00
artica 21c879c74f Auto-updated build strings. 2020-09-01 01:00:18 +02:00
Alejandro Fraguas b1402c1ad7 Merge branch 'ent-6248-10587-Error-SQL-graficas-interface-information-SNMP' into 'develop'
fix bug in combined graphs

See merge request artica/pandorafms!3410
2020-08-31 14:20:38 +02:00
Alejandro Fraguas d2df6fa00a Merge branch 'ent-6264-10617-No-se-crean-las-graficas-Interface-Information-SNMP' into 'develop'
Fixed module types check

See merge request artica/pandorafms!3417
2020-08-31 13:19:45 +02:00
daniel fe8e7b7d0c Add new filter search actions 2020-08-31 12:48:00 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
alejandro-campos 24d1522bd0 Fixed module types check 2020-08-31 12:12:52 +02:00
artica a4e0bfe38e Auto-updated build strings. 2020-08-31 01:00:15 +02:00
artica cd5c4ac63a Auto-updated build strings. 2020-08-30 01:00:18 +02:00
artica 2c81502c11 Auto-updated build strings. 2020-08-29 01:00:25 +02:00
manuel.montes f7fe604914 Fixed entities in resource exporting 2020-08-28 14:43:20 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
artica 20a1436711 Auto-updated build strings. 2020-08-28 01:00:19 +02:00
artica 881a8e6a01 Auto-updated build strings. 2020-08-27 01:00:18 +02:00
alejandro-campos a92c3c7ca3 fix bug in combined graphs 2020-08-26 11:47:54 +02:00
Jose Gonzalez 5565d839c3 Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp 2020-08-26 09:00:35 +02:00
artica 24eeebd6be Auto-updated build strings. 2020-08-26 01:00:18 +02:00
Jose Gonzalez 516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez 1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
artica 223774875c Auto-updated build strings. 2020-08-25 01:00:17 +02:00
Luis 0d27296b79 Fixed acl enterprise acl gextensions 2020-08-24 10:16:25 +02:00
artica 022167fa9c Auto-updated build strings. 2020-08-24 01:00:14 +02:00
artica 07c7d917c8 Auto-updated build strings. 2020-08-23 01:00:14 +02:00
artica b5752f1b2d Auto-updated build strings. 2020-08-22 01:00:41 +02:00
marcos 195f09a7cf fixed error on delete agent api 2020-08-21 09:40:24 +02:00
artica f0a91cce56 Auto-updated build strings. 2020-08-21 01:00:18 +02:00
Daniel Rodriguez 0512149ee4 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop'
Ent 6102 edicion nombre sincronizacion alertas metaconsola

See merge request artica/pandorafms!3364
2020-08-20 14:43:17 +02:00
artica 06f17b5d0b Auto-updated build strings. 2020-08-20 01:00:18 +02:00
Daniel Rodriguez 37c8cb74ce Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop'
Implemented log source status info box in agent view

See merge request artica/pandorafms!3379
2020-08-19 10:36:00 +02:00
alejandro-campos 29026ef3be changed tooltip 2020-08-19 09:10:17 +02:00
artica 2231fcab72 Auto-updated build strings. 2020-08-19 01:00:14 +02:00
artica c1c2fb3b57 Auto-updated build strings. 2020-08-18 01:00:16 +02:00
Daniel Rodriguez 55986ede39 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop'
fix parameter macros in event responses

See merge request artica/pandorafms!3405
2020-08-17 09:38:47 +02:00
artica b4b3fc5866 Auto-updated build strings. 2020-08-17 01:00:14 +02:00
artica fbb0699bf7 Auto-updated build strings. 2020-08-16 01:00:14 +02:00
artica c4dd6d2395 Auto-updated build strings. 2020-08-15 01:00:20 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
Daniel Rodriguez 42c6989d5e Merge branch 'ent-5685-Historico-de-eventos-en-Metaconsola-no-tiene-paginacion-correcta' into 'develop'
fix event pagination when events history is activated

See merge request artica/pandorafms!3401
2020-08-14 11:47:19 +02:00
Daniel Rodriguez 4ada69a804 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop'
Ent 6201 10495 macro en event response no funciona

See merge request artica/pandorafms!3403
2020-08-14 11:47:11 +02:00
Marcos Alconada 77142a0c1a fixed vulnerability 2020-08-14 11:42:49 +02:00
artica 177341e6af Auto-updated build strings. 2020-08-14 01:00:18 +02:00
alejandro-campos 8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
alejandro-campos 6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
artica e510d517f2 Auto-updated build strings. 2020-08-13 01:00:18 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00
artica 1c20cbd197 Auto-updated build strings. 2020-08-12 01:00:18 +02:00
Daniel Rodriguez ee61425bbf Merge branch 'ent-6170-xss-en-incidents' into 'develop'
fixed vilnerability with filename incidents

See merge request artica/pandorafms!3399
2020-08-11 12:40:22 +02:00
Alejandro Fraguas c33e4bcd32 Merge branch 'ent-6196-error-htaccess' into 'develop'
change htacces to be compatible with php-fpm

See merge request artica/pandorafms!3390
2020-08-11 10:14:45 +02:00
Daniel Rodriguez 5deb7e6297 Merge branch 'ent-6167-fallo-wizard-procesos' into 'develop'
Fixed wizard snmp process module process field

See merge request artica/pandorafms!3396
2020-08-11 09:59:43 +02:00
marcos 41249220df fixed vilnerability with filename incidents 2020-08-11 09:11:37 +02:00
Rafael Ameijeiras e6d81a76d2 Update .htaccess 2020-08-11 09:04:25 +02:00
artica 9b3909e5d0 Auto-updated build strings. 2020-08-11 01:00:18 +02:00
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +02:00
rafael 9cbf3d1306 Merge remote-tracking branch 'origin/develop' into ent-6196-error-htaccess 2020-08-10 14:55:28 +02:00
Jose Gonzalez 35644a367f Added ttag modifies 2020-08-10 14:53:07 +02:00
Daniel Rodriguez f43dc364de Merge branch 'ent-5821-bug-en-configuracion-de-notificaciones-de-la-console' into 'develop'
show hidden title on setup notifications

See merge request artica/pandorafms!3377
2020-08-10 09:46:54 +02:00
artica a60715a985 Auto-updated build strings. 2020-08-10 01:00:13 +02:00
artica 6902c61669 Auto-updated build strings. 2020-08-09 01:00:13 +02:00
artica 725b880d5e Auto-updated build strings. 2020-08-08 01:00:18 +02:00
Luis Calvo 18e6b26db8 Fixed wizard snmp process module process field 2020-08-07 16:46:35 +02:00
Jose Gonzalez 7300ccd185 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola 2020-08-07 13:29:25 +02:00
Jose Gonzalez c67d8bd005 Fixed little issues 2020-08-07 13:29:09 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
Luis f7f5798ee6 Fixed modules per agent enterprise message 2020-08-07 11:33:42 +02:00
Daniel Rodriguez 386ab5ef91 Merge branch 'ent-6075-SNMP-Browser-no-muestra-OIDs-con-version-v2' into 'develop'
fix snmp browser v2

See merge request artica/pandorafms!3354
2020-08-07 09:47:28 +02:00
Daniel Rodriguez f7854ab633 Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop'
Fixed snmp community special char

See merge request artica/pandorafms!3352
2020-08-07 09:46:57 +02:00
Daniel Rodriguez 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop'
fix empty check condition

See merge request artica/pandorafms!3359
2020-08-07 09:46:09 +02:00
Daniel Rodriguez a123eaa18c Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop'
Added link to credential store from module creation

See merge request artica/pandorafms!3363
2020-08-07 09:45:43 +02:00
Daniel Rodriguez ef73e7a73c Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop'
resolved error with duplucated modules

See merge request artica/pandorafms!3357
2020-08-07 09:42:08 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +02:00
Daniel Rodriguez c86ec629cd Merge branch 'ent-6054-Dashboard-group-status-mas-de-1-grupo' into 'develop'
fixed errors in dashboard widget groups status

See merge request artica/pandorafms!3369
2020-08-07 09:40:12 +02:00
Daniel Rodriguez d1730935d8 Merge branch 'ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente' into 'develop'
change message in non initialited modules

See merge request artica/pandorafms!3365
2020-08-07 09:37:35 +02:00
Daniel Rodriguez bfe504b3be Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop'
Fixed report sendmail success message

See merge request artica/pandorafms!3353
2020-08-07 09:37:10 +02:00
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
Luis 20addda9fe Fixed missing ckbox custom graphs 2020-08-07 09:35:27 +02:00
marcos 248c5936b6 fixed error with filter form 2020-08-07 09:19:46 +02:00
marcos bb2fb0c631 Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo 2020-08-07 08:47:11 +02:00
marcos e3a126c260 Merge remote-tracking branch 'origin/develop' into ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente 2020-08-07 08:45:21 +02:00
Marcos Alconada 50c089587d Update estado_monitores.php 2020-08-07 08:39:58 +02:00
artica a8d3c50467 Auto-updated build strings. 2020-08-07 01:00:17 +02:00
artica b812399ca3 Auto-updated build strings. 2020-08-06 01:00:16 +02:00
Alejandro Fraguas 2d25c19a5f Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop'
Fixed and added strfdate formats

See merge request artica/pandorafms!3383
2020-08-05 11:51:01 +02:00
artica bdec27d2a3 Auto-updated build strings. 2020-08-05 01:00:13 +02:00
artica b6d8cc1f2c Auto-updated build strings. 2020-08-04 01:00:14 +02:00
artica 6e6e194e73 Updated version and build strings. 2020-08-03 14:50:49 +02:00
vanessa gil 9fafb931e9 Updated translations. 2020-08-03 14:38:16 +02:00
artica add395279f Auto-updated build strings. 2020-08-03 01:00:14 +02:00
artica ed7928b8aa Auto-updated build strings. 2020-08-02 01:00:14 +02:00
artica ee69438620 Auto-updated build strings. 2020-08-01 01:00:18 +02:00
Luis 3327abc328 Ent 5824 connection lost warn mejora 2020-07-31 14:24:02 +02:00
artica e14c3f7dbd Auto-updated build strings. 2020-07-31 01:00:17 +02:00
rafael e181199581 change htacces to be compatible with php-fpm 2020-07-30 08:57:54 +02:00
artica 2ca821cc4d Auto-updated build strings. 2020-07-30 01:00:15 +02:00
artica 2b915d4546 Auto-updated build strings. 2020-07-29 01:00:16 +02:00
artica 4c3f0dfc59 Auto-updated build strings. 2020-07-28 01:00:18 +02:00
Daniel Rodriguez b5a62a9977 Merge branch 'ent-6141-cambios-sistema-de-licencias-trial' into 'develop'
Do not show the UM registration wizard for trial licenses.

See merge request artica/pandorafms!3385
2020-07-27 13:07:34 +02:00
Daniel Rodriguez fa834bff1b Merge branch 'ent-update-japanese-console-translation' into 'develop'
Updated Japanese console translations.

See merge request artica/pandorafms!3389
2020-07-27 12:28:12 +02:00
Daniel Rodriguez 6e3ff47f0f Merge branch 'ent-mysql80-support' into 'develop'
Added support for MySQL 8.0 in installer.

See merge request artica/pandorafms!3387
2020-07-27 12:27:10 +02:00
Daniel Rodriguez 1f2e0e2d80 Merge branch 'ent-4943-identificar-version-instalada-server-enterprise-e6-o-e7' into 'develop'
Increase the size of tserver.version.

See merge request artica/pandorafms!3368
2020-07-27 12:17:27 +02:00
Junichi Satoh d1146277dc Updated Japanese console translations. 2020-07-27 14:24:58 +09:00
Junichi Satoh 81ffa4783f Added support for MySQL 8.0 in installer. 2020-07-27 13:41:18 +09:00
artica f0724446a2 Auto-updated build strings. 2020-07-27 01:00:13 +02:00
artica b3e33f8104 Auto-updated build strings. 2020-07-26 01:00:14 +02:00
artica faccfb275d Auto-updated build strings. 2020-07-25 01:00:16 +02:00
Daniel Rodriguez 5577b42540 Merge branch 'ent-6161-no-abre-ventana-datos-modulo-string' into 'develop'
Fixed result div for string modules bug

See merge request artica/pandorafms!3386
2020-07-24 09:43:35 +02:00
artica f2e6d84d04 Auto-updated build strings. 2020-07-24 01:00:16 +02:00
Luis Calvo 158cbc74e2 Fixed result div for string modules bug 2020-07-23 17:28:44 +02:00
Daniel Maya cbc8630dfc Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion 2020-07-23 16:52:24 +02:00
Ramon Novoa 8820d2756f Update the migration script. 2020-07-23 16:31:55 +02:00
Ramon Novoa d3114254ce Do not show the UM registration wizard for trial licenses.
Ref pandora_enterprise#6141
2020-07-23 15:54:01 +02:00
Daniel Maya 9f2e722787 Ent 6034 improvement of the um profile 2020-07-23 13:26:39 +02:00
artica 61f6a794b5 Auto-updated build strings. 2020-07-23 01:00:16 +02:00
Daniel Rodriguez b93f826f89 Merge branch 'ent-6100-Comando-de-alerta-Pandora-FMS-event' into 'develop'
Ent 6100 comando de alerta pandora fms event

See merge request artica/pandorafms!3356
2020-07-22 16:37:46 +02:00
Daniel Rodriguez bd3fdeed25 Merge branch 'ent-4158-Bug-al-crear-evento-con-id_server-que-no-existe-desde-la-API-en-meta' into 'develop'
Ent 4158 bug al crear evento con id server que no existe desde la api en meta

See merge request artica/pandorafms!3330
2020-07-22 16:29:28 +02:00
Daniel Rodriguez 7afc8902d3 Merge branch 'ent-6107-console-notifications-doesnt-clean-afeter-solved' into 'develop'
Server notifications clean when solved

See merge request artica/pandorafms!3360
2020-07-22 13:47:57 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
artica b6af8758cb Auto-updated build strings. 2020-07-22 01:00:17 +02:00
Daniel Rodriguez 413e113cad Merge branch 'ent-5814-Titulo-erroneo' into 'develop'
Fixed errors po and mo

See merge request artica/pandorafms!3371
2020-07-21 15:11:42 +02:00
daniel 2c535bb747 Fixed labels mode classic 2020-07-21 15:06:41 +02:00
Daniel Rodriguez 50cba7936a Revert "Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'"
This reverts merge request !3311
2020-07-21 14:03:17 +02:00
Daniel Rodriguez 3ad555048f Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'
fix vulnerability

See merge request artica/pandorafms!3311
2020-07-21 14:00:07 +02:00
Daniel Rodriguez dd08f3bfdd Merge branch 'ent-5964-AADCM-Refresh-time-en-CV-link-publico' into 'develop'
fix default refresh time in visual console public link

See merge request artica/pandorafms!3309
2020-07-21 10:48:57 +02:00
Daniel Rodriguez 7d69cbe65d Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop'
Solved issue with thresholds in prediction modules

Closes pandora_enterprise#5907

See merge request artica/pandorafms!3293
2020-07-21 10:48:06 +02:00
artica 001edf95dd Auto-updated build strings. 2020-07-21 01:00:16 +02:00
Daniel Rodriguez de271193cc Merge branch 'ent-5963-10190-Mala-representacion-de-graficas-en-pdf-group-report-agent-configuration-y-group-settings' into 'develop'
Ent 5963 10190 mala representacion de graficas en pdf group report agent configuration y group settings

See merge request artica/pandorafms!3296
2020-07-20 15:33:53 +02:00
Luis 2dc239afe9 Ent 5443 group report no funcion bien 2020-07-20 13:26:39 +02:00
Daniel Rodriguez 51f2db16cb Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop'
Changed query for get default actions in templates

Closes pandora_enterprise#5587

See merge request artica/pandorafms!3320
2020-07-20 07:54:08 +02:00
Daniel Rodriguez 249e4a737a Merge branch 'ent-5806-post-process-genera-lineas-repetidas' into 'develop'
Changed nothing option for avoid duplicates

Closes pandora_enterprise#5806

See merge request artica/pandorafms!3297
2020-07-20 07:52:48 +02:00
Daniel Rodriguez 8915492323 Merge branch 'ent-6004-error-visual-en-el-filtrado-de-componentes-en-metaconsola' into 'develop'
fixed visual error tag meta

See merge request artica/pandorafms!3318
2020-07-20 07:51:57 +02:00
Daniel Rodriguez 56c1de4b04 Merge branch 'ent-5970-Columna-status-de-items-agent-configuration-y-group-settings-no-aparece-en-PDFs' into 'develop'
fixed pdf status field

See merge request artica/pandorafms!3307
2020-07-20 07:51:29 +02:00
artica fc6852359d Auto-updated build strings. 2020-07-20 01:00:13 +02:00
artica 85609e1e82 Auto-updated build strings. 2020-07-19 01:00:17 +02:00
artica 7cc8b9a016 Auto-updated build strings. 2020-07-18 01:00:18 +02:00
alejandro.campos@artica.es 685acf2200 Changed status displayed in pdfs 2020-07-17 11:42:42 +02:00
alejandro.campos@artica.es c6ee74e6b7 Merge branch 'develop' into ent-5105-9235-Error-tactical-view-consola-movil 2020-07-17 10:54:12 +02:00
Daniel Rodriguez f2f8debab6 Merge branch 'ent-5969-fallo-visual-en-reports-vista-html' into 'develop'
fixed error

See merge request artica/pandorafms!3308
2020-07-17 10:34:28 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
Luis 2c713f45dd Added mib uploader to get file 2020-07-17 10:01:10 +02:00
artica 60e0d5ec34 Auto-updated build strings. 2020-07-17 01:00:16 +02:00
marcos e221175bf4 updated changes 2020-07-16 15:57:28 +02:00
Luis Calvo 4b1d586ef0 Fixed and added strfdate formats 2020-07-16 14:07:29 +02:00
Daniel Rodriguez d6fc3a6195 Merge branch 'ent-5967-botones-de-events-responses-no-son-iguales' into 'develop'
fixed visual style repsonse buttons

See merge request artica/pandorafms!3319
2020-07-16 12:16:57 +02:00
Daniel Rodriguez 100db2d4db Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop'
Fixed error link builder in VC

See merge request artica/pandorafms!3275
2020-07-16 12:11:51 +02:00
Daniel Rodriguez 4bf2a2fedd Merge branch 'ent-5909-el-formato-encajado-de-la-busqueda-no-tiene-sentido' into 'develop'
fixed error

See merge request artica/pandorafms!3266
2020-07-16 12:10:31 +02:00
marcos 10b2fe25ba fixed error 2020-07-16 10:57:27 +02:00
marcos c76238bdb0 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-16 09:57:14 +02:00
artica 8b85bba631 Auto-updated build strings. 2020-07-16 01:00:20 +02:00
marcos a6a97d264e changed event in progress method api refactored 2020-07-15 23:41:25 +02:00
marcos 9632b36551 changed event in progress method 2020-07-15 23:36:21 +02:00
fbsanchez c8d86a4bdb minor fix 2020-07-15 13:46:51 +02:00
fbsanchez dbf1265fd0 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-07-15 11:38:18 +02:00
Alejandro Campos 0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event'
# Conflicts:
#   pandora_console/extras/mr/40.sql
2020-07-15 09:30:35 +02:00
alejandro-campos 4edef7099b added check to display log sources info box when log collector activated 2020-07-15 09:25:39 +02:00
artica 593ed43f10 Auto-updated build strings. 2020-07-15 01:00:17 +02:00
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
2020-07-14 18:10:11 +02:00
alejandro-campos 909d7cba58 Implemented log source status info box in agent view 2020-07-14 17:12:38 +02:00
Daniel Rodriguez 76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop'
Ent 5769 borrado de eventos no pide confirmacion

See merge request artica/pandorafms!3271
2020-07-14 11:04:03 +02:00
Daniel Rodriguez 8b8fd7bf30 Merge branch 'ent-5764-consola-visual-pantalla-completa-autohide' into 'develop'
Restored autoHide for controls modal in visual console with full screen

Closes pandora_enterprise#5764

See merge request artica/pandorafms!3299
2020-07-14 11:03:33 +02:00
Daniel Rodriguez 52dc38fcb2 Merge branch 'ent-5672-Graficas-gauge-no-se-muestran-bien-en-PDF' into 'develop'
Fixed error in gauges

See merge request artica/pandorafms!3261
2020-07-14 11:01:21 +02:00
marcos 26e0703617 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-14 10:05:18 +02:00
artica f81e66084c Auto-updated build strings. 2020-07-14 01:00:16 +02:00
fbsanchez 45062874ce minor fix disabled textareas 2020-07-13 14:06:52 +02:00
fbsanchez a0028e47ad Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-07-13 13:56:54 +02:00
fbsanchez dc5767705f minor fixes 2020-07-13 13:56:41 +02:00
Alejandro Fraguas f79dd6db43 Merge branch 'ent-no-muestra-las-imagenes-en-el-modal-de-error-del-modulo-database-maintenance-en-metaconsola' into 'develop'
5722-fixed image not found

See merge request artica/pandorafms!3263
2020-07-13 13:22:41 +02:00
Daniel Rodriguez 1e31eae1a2 Merge branch 'ent-6130-Errores-en-Custom-graph-Informes-de-metaconsola' into 'develop'
Fixed errors custom graph metaconsole

See merge request artica/pandorafms!3376
2020-07-13 13:13:29 +02:00
marcos 2a62f3328a show hidden title on setup notifications 2020-07-13 13:00:47 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Barbero Martin 293cdc6c08 Fixed errors custom graph metaconsole 2020-07-13 11:48:11 +02:00
Daniel Rodriguez 492c7f90cf Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop'
fixed error

See merge request artica/pandorafms!3321
2020-07-13 11:13:24 +02:00
Daniel Rodriguez ad93a7c681 Merge branch 'ent-5445-Item-prediction-date-no-funciona-correctamente-en-meta' into 'develop'
fix prediction date item in meta

See merge request artica/pandorafms!3340
2020-07-13 11:12:53 +02:00
Daniel Rodriguez 47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop'
Change owner event responses

See merge request artica/pandorafms!3294
2020-07-13 11:12:02 +02:00
Alejandro Fraguas fbb251f358 Merge branch 'ent-5468-parsear-campos-exec-server-por-si-hay-espacios-sobre-todo-ip' into 'develop'
Ent 5468 parsear campos exec server por si hay espacios sobre todo ip

See merge request artica/pandorafms!3334
2020-07-13 10:54:42 +02:00
Alejandro Fraguas bd6904b99f Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop'
Fixed xss event comments vulnerabiluty and some acls on event ajax

See merge request artica/pandorafms!3335
2020-07-13 10:06:26 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
artica 313607efdf Auto-updated build strings. 2020-07-13 01:00:12 +02:00
artica e80252287c Auto-updated build strings. 2020-07-12 01:00:12 +02:00
artica 9d16783254 Auto-updated build strings. 2020-07-11 01:00:19 +02:00
fbsanchez 23641e45bb Entity with enterprise capabilites 2020-07-10 13:38:42 +02:00
Daniel Barbero Martin b87c2d986f Fixed errors po and mo 2020-07-10 12:36:57 +02:00
Daniel Rodriguez 9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop'
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
2020-07-10 10:16:34 +02:00
Daniel Rodriguez a83b10ff97 Merge branch 'ent-1957-Informe-agrupado-general' into 'develop'
Implemented all-in-row data for grouped general report

See merge request artica/pandorafms!3351
2020-07-10 10:11:57 +02:00
Daniel Rodriguez 8b24faa129 Merge branch 'ent-2002-Remote-component-centralizado' into 'develop'
Blocked create and update of remote component group when meta has centralized management

Closes pandora_enterprise#2002

See merge request artica/pandorafms!3272
2020-07-10 10:11:25 +02:00
Daniel Rodriguez 0d68dde3db Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop'
fixed weight legend

See merge request artica/pandorafms!3339
2020-07-10 10:10:42 +02:00
Daniel Barbero Martin af87e8c621 fixed errors in dashboard widget groups status 2020-07-10 08:30:57 +02:00
José González f3d1a80252 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
# Conflicts:
#   pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
artica 941dfc2b62 Auto-updated build strings. 2020-07-10 01:00:16 +02:00
Ramon Novoa 19a8288f26 Increase the size of tserver.version.
Ref pandora_enterprise#4943
2020-07-09 17:47:11 +02:00
fbsanchez 5df418d226 MR changes 2020-07-09 16:56:51 +02:00
fbsanchez 231ba795dd MR update 2020-07-09 16:53:03 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
fbsanchez 865c2eb208 allowed service create propagate exceptions 2020-07-09 11:35:04 +02:00
artica a410ebffb4 Auto-updated build strings. 2020-07-09 01:00:14 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop'
MR change smart services

See merge request artica/pandorafms!3316
2020-07-08 18:01:16 +02:00
Daniel Rodriguez 8925821a2b Merge branch 'ent-6045-snmp-alert-field-10-se-borra' into 'develop'
Fixed minor bug field10 param

See merge request artica/pandorafms!3346
2020-07-08 11:04:47 +02:00
artica 3b091525f5 Auto-updated build strings. 2020-07-08 01:00:15 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
daniel 51104136a9 fixed errors in automatic combined graph 2020-07-07 16:07:13 +02:00
marcos e2ae568ed3 change message in non initialited modules 2020-07-07 15:48:31 +02:00
Daniel Rodriguez b18ace9ef6 Merge branch 'ent-5716-ventana-de-registrar-nodo-en-database-ha-queda-visible' into 'develop'
Minor style fix

See merge request artica/pandorafms!3262
2020-07-07 13:12:53 +02:00
fbsanchez 02299bffdb Merge branch 'ent-6012-servicios-dinamicos' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 11:57:12 +02:00
fbsanchez 98dc5f1796 minor fix range input 2020-07-07 11:54:55 +02:00
Jose Gonzalez a1bd93bac7 Add database changes 2020-07-07 11:08:44 +02:00
Jose Gonzalez 5e039adb26 Solve the issue for alerts, os names and tags 2020-07-07 11:05:19 +02:00
fbsanchez cb38f5569a Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-07 10:26:27 +02:00
Luis Calvo 37a97cd2ad Added link to credential store from module creation 2020-07-07 10:26:19 +02:00
fbsanchez 80015a8691 smart services API adjustments 2020-07-07 10:21:28 +02:00
fbsanchez 0b42d1b61f smart services API adjustments 2020-07-07 10:19:49 +02:00
artica 93ad38888b Auto-updated build strings. 2020-07-07 01:00:14 +02:00
fbsanchez cf26293a33 WIP massive services 2020-07-06 19:35:31 +02:00
Luis Calvo 71eaebc03b Server notifications clean when solved 2020-07-06 17:01:52 +02:00
alejandro-campos 0ef7ff1198 fix empty check condition 2020-07-06 14:35:22 +02:00
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
fbsanchez 53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez 2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
fbsanchez a0d489b90e Smart services 2020-07-06 11:10:43 +02:00
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
marcos 4ad7735dd7 resolved error with duplucated modules 2020-07-06 10:09:36 +02:00
alejandro-campos 49888fe48f Added change to MR 2020-07-06 09:56:15 +02:00