Commit Graph

19803 Commits

Author SHA1 Message Date
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