Commit Graph

13583 Commits

Author SHA1 Message Date
Daniel Rodriguez f861744229 Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop'
SQL query do not need to be cleaned

Closes pandora_enterprise#6422

See merge request artica/pandorafms!3496
2020-11-30 17:26:15 +01:00
Daniel Rodriguez ec91ea7387 Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop'
Report macros now apply on showing report

See merge request artica/pandorafms!3460
2020-11-30 17:25:22 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez 64509df179 Merge branch 'ent-6536-servicios-item-tipo-agente-desconocido-en-mapa-de-servicio' into 'develop'
Ent 6536 servicios item tipo agente desconocido en mapa de servicio

See merge request artica/pandorafms!3574
2020-11-30 14:29:43 +01:00
Daniel Rodriguez 3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop'
F2 feature

See merge request artica/pandorafms!3493
2020-11-30 14:28:03 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
artica 863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica 9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica 66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b9c2db9825 fix check install meta 2020-11-27 13:21:14 +01:00
artica 935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
fbsanchez 7e61465955 Avoid erase ALL sessions from tsessions_php (pandora_db) 2020-11-26 18:27:11 +01:00
Daniel Rodriguez a5883da41c Merge branch 'ent-6396-10757-api-get-module_data-no-obtiene-los-rangos-indicados-no-db-historico' into 'develop'
uncompressing data before serving it api_get_module_data -absurd format kept-

See merge request artica/pandorafms!3575
2020-11-26 18:14:55 +01:00
marcos 1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
Daniel Rodriguez 69d9d04c20 Merge branch 'ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo' into 'develop'
Allow define time start greater than time end in weekly planed downtimes

See merge request artica/pandorafms!3511
2020-11-26 17:30:09 +01:00
Daniel Rodriguez d926251cf1 Merge branch 'ent-6226-links-eventos-servicios-metaconsola' into 'develop'
Solve issue

Closes pandora_enterprise#6226

See merge request artica/pandorafms!3612
2020-11-26 17:29:39 +01:00
Jose Gonzalez fe7ad1471a Fix 2020-11-26 16:46:27 +01:00
fbsanchez df03b77b60 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 12:57:37 +01:00
fbsanchez 7fc32d3269 minor fix 2020-11-26 12:57:30 +01:00
Daniel Rodriguez 3dc551f1e5 Merge branch 'ent-6724-10965-No-se-puede-crear-agente-con-IP-duplicada-mediante-llamada-de-API-set-new-agent' into 'develop'
fixed agent creation with unique ip condition

See merge request artica/pandorafms!3604
2020-11-26 11:47:57 +01:00
fbsanchez 79b3f2d762 Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 2020-11-26 11:28:39 +01:00
fbsanchez 1121440943 Clean only recovered servers 2020-11-26 11:28:31 +01:00
Daniel Maya 1cf3381797 Fixed update alert actions 2020-11-26 10:33:32 +01:00
artica f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
Marcos Alconada 1840378a5d add server name on agents list policies 2020-11-25 19:30:27 +01:00
Daniel Barbero Martin 9c99058f30 fix custom graph 2020-11-25 17:29:09 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +01:00
Daniel Barbero Martin 0a5890ddd3 fix dialog tree view meta 2020-11-25 15:52:31 +01:00
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Fix

See merge request artica/pandorafms!3652
2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00
Jose Gonzalez da3bb9b808 Fix 2020-11-25 14:29:11 +01:00
Jose Gonzalez 5f9db9a896 Fix 2020-11-25 14:27:42 +01:00
Daniel Rodriguez b1fd90ae58 Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Ent 6542 agents alerts view fallos visuales

Closes pandora_enterprise#6542

See merge request artica/pandorafms!3594
2020-11-25 13:35:17 +01:00
fbsanchez d18fffb0cb Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2020-11-25 12:07:53 +01:00
Jose Gonzalez 60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez 7984d9fcab Fix visual issue 2020-11-25 11:44:12 +01:00
Jose Gonzalez 912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
Daniel Barbero Martin 2e950af548 fix dashboard VC 2020-11-25 11:33:36 +01:00
marcos 06475d21ce Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 11:08:09 +01:00
Daniel Rodriguez 80b60d101c Merge branch 'ent-6157-Fallos-en-servicios-dinamicos' into 'develop'
Added new js file

Closes pandora_enterprise#6157

See merge request artica/pandorafms!3635
2020-11-25 10:35:47 +01:00
marcos 51322b48d7 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 09:31:14 +01:00
artica b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
Daniel Barbero Martin fba3bbbc93 fix dashboard widget groups status add secondary groups 2020-11-24 16:56:41 +01:00
alejandro-campos e2bdb4858a included not init modules in total count 2020-11-24 16:13:28 +01:00
Jose Gonzalez 0cc1da21b0 Fix errors 2020-11-24 15:53:25 +01:00
Jose Gonzalez ed1b8f9713 Fix some bugs and added surround input feature 2020-11-24 15:51:02 +01:00
Daniel Barbero Martin af6bab49e9 fix visual view pure CV 2020-11-24 12:04:25 +01:00
Daniel Barbero Martin 2428558a39 fix bugs vc serialez module string donuts and bars charts 2020-11-24 10:59:42 +01:00
marcos b42cb5a30f Merge remote-tracking branch 'origin/develop' into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-11-24 08:59:44 +01:00
artica 1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
alejandro-campos f5648d734d fixed snapshot in meta 2020-11-23 17:09:58 +01:00
Daniel Rodriguez f2383aa4a3 Merge branch 'ent-6590-comprobacion-ha-ralentiza-la-consola' into 'develop'
Avoid check ha nodes while navigating, scheduled

See merge request artica/pandorafms!3620
2020-11-23 16:55:56 +01:00
daniel da0a18b186 new options visual report inventory 2020-11-23 16:18:20 +01:00
Daniel Rodriguez 2718558b29 Merge branch 'ent-6398-Poner-ojito-mostrar-passwords' into 'develop'
Ent 6398 poner ojito mostrar passwords

Closes pandora_enterprise#6398

See merge request artica/pandorafms!3488
2020-11-23 16:17:35 +01:00
Daniel Rodriguez 9cd0bf7fbb Merge branch 'ent-6686-bug-en-tree-view-metaconsola' into 'develop'
Fixed agent details in MC

See merge request artica/pandorafms!3619
2020-11-23 16:14:20 +01:00
Daniel Barbero Martin 564b389603 fix inserts demo VC 2020-11-23 13:49:59 +01:00
Luis 6931e15dd2 Fixed url with blakspace on pagination 2020-11-23 10:40:28 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales
Merge with last updates
2020-11-23 10:08:16 +01:00
artica 7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00
artica b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica 87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
Daniel Rodriguez 16ada0c567 Merge branch 'ent-6411-modulos-con-caracteres-extraños-se-duplican' into 'develop'
Ent 6411 modulos con caracteres extraños se duplican

See merge request artica/pandorafms!3586
2020-11-20 13:24:22 +01:00
Daniel Rodriguez beaf311eed Merge branch 'ent-6738-modules-ifInErrors-ifOutErrors-snmp-interface-wizard' into 'develop'
Solve OIDs issues and malfunction of some modules

Closes pandora_enterprise#6738

See merge request artica/pandorafms!3633
2020-11-20 13:20:58 +01:00
Daniel Barbero Martin 68ac02db70 fix api function show graph 2020-11-20 13:01:47 +01:00
Jose Gonzalez 063bf967f4 Added new js file 2020-11-20 10:24:15 +01:00
artica f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
2020-11-19 15:21:58 +01:00
daniel 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Jose Gonzalez 8706ec060c Solve OIDs issues and malfunction of some modules 2020-11-19 13:31:32 +01:00
artica e9259da802 Auto-updated build strings. 2020-11-19 01:00:19 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
artica ce814ba580 Auto-updated build strings. 2020-11-18 01:00:20 +01:00
Daniel Rodriguez 38c9dafa1b Merge branch 'ent-6061-vmware-view' into 'develop'
Discovery task instead Recon task in some places

See merge request artica/pandorafms!3507
2020-11-17 16:38:29 +01:00
Jose Gonzalez ea259f0aa7 Fixed issue 2020-11-17 16:36:30 +01:00
fbsanchez f9ab987825 Avoid check ha nodes while navigating, scheduled 2020-11-17 11:44:52 +01:00
artica 9bfdfa87f6 Auto-updated build strings. 2020-11-17 01:00:35 +01:00
fbsanchez 8bcbe0ab77 Fixed agent details in MC 2020-11-16 19:16:25 +01:00
artica 810db1eec4 Auto-updated build strings. 2020-11-16 01:00:30 +01:00
artica efa96ab947 Auto-updated build strings. 2020-11-15 01:00:31 +01:00
artica 26ab48073b Auto-updated build strings. 2020-11-14 01:00:30 +01:00
Jose Gonzalez 86d2290961 Solve issue 2020-11-13 14:53:31 +01:00
artica 6fcc1107ec Auto-updated build strings. 2020-11-13 01:00:33 +01:00
Daniel Maya 0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
artica 834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
alejandro-campos 2632256c10 fixed agent creation with unique ip condition 2020-11-11 17:45:21 +01:00
Luis Calvo 78df603c07 Fixed alert count bug on tactical view 2020-11-11 17:07:03 +01:00
alejandro-campos c6cf4ab9ee fixed query 2020-11-11 16:25:58 +01:00
artica 33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
Jose Gonzalez 702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Jose Gonzalez 665deaa5c8 WIP: Backup upload 2020-11-10 12:23:50 +01:00
Daniel Maya ea0e229951 Fixed license expired and license trial 2020-11-10 12:10:25 +01:00
artica 2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica 767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica 4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica 5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
Jose Gonzalez 8a6a11fee6 WIP: Backup upload 2020-11-06 12:38:35 +01:00
Jose Gonzalez 22ae632850 Added html_print_anchor function for link tags 2020-11-06 12:38:06 +01:00
artica 2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00
artica 6662b4f286 Auto-updated build strings. 2020-11-05 01:00:35 +01:00
Daniel Rodriguez b0ccfc89b1 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
SAML with pandora sessions

See merge request artica/pandorafms!3533
2020-11-04 18:42:42 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Jose Gonzalez b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
Daniel Rodriguez a786f5e132 Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
Added server component status - crash -

See merge request artica/pandorafms!3547
2020-11-04 16:39:28 +01:00
artica 081e46c9c2 Auto-updated build strings. 2020-11-04 01:00:47 +01:00
Jose Gonzalez 938860dff2 Added wrapper attributes 2020-11-03 17:15:01 +01:00
alejandro-campos 241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
Daniel Rodriguez 6a31a28679 Merge branch 'ent-6410-Wizard-SNMP-SNMP-Interfaces-y-WMI-no-autocompletan-Target-IP-con-IP-del-agente' into 'develop'
Ent 6410 wizard snmp snmp interfaces y wmi no autocompletan target ip con ip del agente

See merge request artica/pandorafms!3588
2020-11-03 10:26:24 +01:00
artica 58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica 4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica 3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
Daniel Rodriguez 4f1faf6a14 Merge branch 'ent-6677-error-sql-en-item-group-alert-report-metaconsola' into 'develop'
fix group alert report

See merge request artica/pandorafms!3587
2020-10-30 14:43:28 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
Luis 25de1b686a Fixed oid for getting x64 interfaces module. Fixed visual (module order) bug 2020-10-30 14:41:33 +01:00
fbsanchez 6267af774b Merge branch 'develop' into 'ent-6677-error-sql-en-item-group-alert-report-metaconsola'
Conflicts:
pandora_console/include/functions_alerts.php
2020-10-30 13:33:52 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez 79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop'
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
2020-10-30 13:28:35 +01:00
Daniel Maya bde52df2e8 Added datalist for target ip 2020-10-30 13:25:33 +01:00
daniel 4e2d5bdf2b fix counter groups child 2020-10-30 13:23:47 +01:00
Daniel Rodriguez 64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop'
fix charts

See merge request artica/pandorafms!3581
2020-10-30 13:23:03 +01:00
marcos 07e2d5f4aa Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' of https://brutus.artica.es:8081/artica/pandorafms into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-10-30 11:34:34 +01:00
Daniel Rodriguez a047ca8181 Merge branch 'ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan' into 'develop'
fixes in event macros (responses)

See merge request artica/pandorafms!3560
2020-10-30 11:32:09 +01:00
fbsanchez 2376ef408b Update functions_events.php resolve entities for group_name in event responses 2020-10-30 11:22:39 +01:00
Daniel Rodriguez fe90008d17 Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop'
Handled comments for validated comments

Closes pandora_enterprise#6587

See merge request artica/pandorafms!3564
2020-10-30 10:46:52 +01:00
artica 8c92e5420d Auto-updated build strings. 2020-10-30 01:00:21 +01:00
fbsanchez 45e8efa089 minor fix 2020-10-29 18:47:34 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
Daniel Rodriguez 6161ba078f Merge branch 'ent-6658-Aparece-timestap-en-vez-de-timestamp-en-csv-exportado-de-graficas-y-faltan-labels' into 'develop'
fixed csv charts

See merge request artica/pandorafms!3582
2020-10-29 18:19:35 +01:00
Daniel Rodriguez e0b0ab8b42 Merge branch 'ent-6579-Faltan-macros-de-agente-en-respuestas-de-eventos' into 'develop'
Ent 6579 faltan macros de agente en respuestas de eventos

See merge request artica/pandorafms!3562
2020-10-29 18:17:22 +01:00
fbsanchez c4d9c0851a safe output in _event_date_ (custom responses) 2020-10-29 18:08:02 +01:00
fbsanchez b92cfc6c10 Merge remote-tracking branch 'origin/develop' into ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan 2020-10-29 18:00:17 +01:00
fbsanchez 742cbcb5c5 fix group alert report 2020-10-29 17:54:40 +01:00
fbsanchez 26e809dc37 fix group alert report 2020-10-29 17:53:34 +01:00
Daniel Maya 785e187f5c Fixed special characters 2020-10-29 17:22:02 +01:00
marcos 6bcca915ba resuelto el error que vaciaba el module search 2020-10-29 14:57:54 +01:00
Daniel Rodriguez a7a2bdf831 Merge branch 'ent-6483-bug-en-la-recursion-de-grupos-del-item-group-report-de-informes' into 'develop'
Ent 6483 bug en la recursion de grupos del item group report de informes

See merge request artica/pandorafms!3549
2020-10-29 14:56:04 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
fbsanchez 2748f0ac29 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:41:24 +01:00
Daniel Rodriguez 8144d3bc95 Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop'
Forced recursion while selecting All group - group_alert_report

See merge request artica/pandorafms!3543
2020-10-29 12:40:43 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
groups_get_children and propagate update

See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
fbsanchez 79c927628d Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:24:39 +01:00
Daniel Rodriguez 4ed68fee56 Merge branch 'ent-6477-error-en-la-seleccion-de-grupos-de-dashboards' into 'develop'
Minor fix all group empty label

See merge request artica/pandorafms!3542
2020-10-29 12:20:35 +01:00
fbsanchez 24ba5f2615 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:13:21 +01:00
fbsanchez fe681ba9d7 minor style added 2020-10-29 12:13:15 +01:00
fbsanchez 3e1a89dab7 groups_get_cChildren 2020-10-29 11:21:56 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
Daniel Rodriguez a8cadc6d5c Merge branch 'ent-6496-Bug-en-leyenda-de-la-grafica-del-item-Network-interfaces-de-informes' into 'develop'
fixed legend avg network interfaces

See merge request artica/pandorafms!3537
2020-10-29 09:48:49 +01:00