Commit Graph

20506 Commits

Author SHA1 Message Date
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
marcos 5978e46141 add toolkit on sql query report item editor 2020-11-23 13:29:35 +01:00
Daniel Rodriguez 36d63a4869 Merge branch 'ent-6436-la-columna-nombre-es-muy-pequena-discovery-task-list' into 'develop'
Minor fixes discovery tasklist usability

See merge request artica/pandorafms!3506
2020-11-23 10:44:27 +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
Daniel Barbero Martin 1ad1671612 fix remove acl widget agent/module 2020-11-23 09:29:11 +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 e8d628a049 Merge branch 'ent-6175-10434-problemas-con-la-creacion-y-asignacion-de-componentes-locales-en-el-campo-unit' into 'develop'
Ent 6175 10434 problemas con la creacion y asignacion de componentes locales en el campo unit

See merge request artica/pandorafms!3452
2020-11-20 13:23:12 +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
Daniel Rodriguez 436a88e2f4 Merge branch 'ent-6758-update-manager-offline-meta-doesnt-work' into 'develop'
Fxed update manager offline missing include

See merge request artica/pandorafms!3634
2020-11-20 10:24:00 +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 Rodriguez e955bc7b96 Merge branch 'ent-6253-10593-Cambiar-option-ANY-de-las-bulk-operatiosn-por-ALL' into 'develop'
fixed errors in massive operations

See merge request artica/pandorafms!3451
2020-11-19 14:55:53 +01:00
daniel 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Luis Calvo 64ed945a90 Fxed update manager offline missing include 2020-11-19 14:23:12 +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
Daniel Barbero Martin b7d4144904 fix remove debug 2020-11-18 17:37:33 +01:00
alejandro-campos 7e2fc669f7 fixed status filter when applying changes to a module of any agent 2020-11-18 16:48:49 +01:00
Jose Gonzalez 1412591813 Fix 2020-11-18 12:37:39 +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
marcos 96387a874f remove console log 2020-11-18 10:38:49 +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
Jose Gonzalez e0404d565a Fix vulnerability 2020-11-17 14:49:26 +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
Luis Calvo 2ee187ae53 Fixed acl on discovery tasklist 2020-11-16 18:30:23 +01:00
Daniel Maya 4023327091 Added search by secondary group name 2020-11-16 12:30:58 +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 d172aad1d2 Fix error with category 2020-11-10 16:51:28 +01:00
Jose Gonzalez 702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Daniel Maya ac762469b6 Added trim in search 2020-11-10 13:54:15 +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
Jose Gonzalez f501d19539 Solved issue with main view 2020-11-10 10:58:06 +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
Daniel Rodriguez 01b315de3f Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop'
added check for element

See merge request artica/pandorafms!3577
2020-11-04 16:40:36 +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
Luis Calvo 31a8eefd2f Fixed bug allowing updating group with duplicated name 2020-11-04 16:22:44 +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
Daniel Rodriguez 41b603d5a0 Merge branch 'ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles' into 'develop'
Able to create users without profile assignment

See merge request artica/pandorafms!3555
2020-11-03 16:00:06 +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
fbsanchez 8202839888 warn while updating user admin > standar 2020-11-03 10:14:17 +01:00
fbsanchez 5ddb3f4421 title for dialog (user form) 2020-11-03 10:11:18 +01:00
fbsanchez 8b01565948 Avoid confirm dialog while profiles are assigned to user 2020-11-03 10:08:23 +01:00
fbsanchez 95ed4c9665 Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles 2020-11-03 10:02:45 +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 d171d84595 Merge branch 'ent-6678-Bug-en-select-de-nodos-de-TODOS-los-items-en-metaconsola' into 'develop'
Fix combo server in reports builder

See merge request artica/pandorafms!3589
2020-10-30 14:43:38 +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
Daniel Rodriguez 4e67371967 Merge branch 'ent-6615-Authentication-bypass' into 'develop'
fixed authentication bypass

See merge request artica/pandorafms!3576
2020-10-30 14:40:27 +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 Barbero Martin f1080757a0 Fix combo server in reports builder 2020-10-30 13:30:59 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez 2063849dd0 Merge branch 'ent-6569-Exportado/importado-de-informes' into 'develop'
fix exportation/exportation

See merge request artica/pandorafms!3563
2020-10-30 13:29:04 +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
Daniel Rodriguez 9a5291da5a Merge branch 'ent-6578-Bugs-eventos-sonoros-3' into 'develop'
fixed sound events

See merge request artica/pandorafms!3566
2020-10-30 12:16:54 +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
fbsanchez 20fa959a0c Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles
Conflicts:
	pandora_console/godmode/users/configure_user.php
2020-10-29 17:26:05 +01:00
Daniel Maya 785e187f5c Fixed special characters 2020-10-29 17:22:02 +01:00
Marcos Alconada f8511de008 fixed error 6495 2020-10-29 16:39:00 +01:00
Daniel Rodriguez 12b36e7f5a Merge branch 'ent-6554-status-vacio-al-exportar-eventos-a-csv' into 'develop'
fixed error with value status field

See merge request artica/pandorafms!3548
2020-10-29 15:15:52 +01:00
Marcos Alconada b972bc627a Update event_edit_filter.php 2020-10-29 15:04:53 +01:00
marcos 765d37d4e9 formato funcion 2020-10-29 15:06:01 +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 Rodriguez 4f3e09c6c3 Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop'
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0

See merge request artica/pandorafms!3541
2020-10-29 13:43:10 +01:00
Daniel Rodriguez d5a57156dc Merge branch 'ent-6487-visual-console-favourites-page-constantly-reloads' into 'develop'
Fix continous reload page cased by automatic form submit

See merge request artica/pandorafms!3561
2020-10-29 13:22:10 +01:00
fbsanchez 98a04bfcf8 omg... what a file 2020-10-29 12:55:44 +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 5ae4330121 Merge branch 'ent-6555-No-hay-mensaje-de-aviso-al-eliminar-perfil-del-usuario-en-metaconsola-da-error' into 'develop'
Ent 6555 no hay mensaje de aviso al eliminar perfil del usuario en metaconsola da error

See merge request artica/pandorafms!3551
2020-10-29 12:21:57 +01:00
Daniel Rodriguez 97148271bf Merge branch 'ent-6533-module-groups-error-sql-en-paginacion' into 'develop'
Ent 6533 module groups error sql en paginacion

See merge request artica/pandorafms!3536
2020-10-29 12:21:22 +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
fbsanchez 6112b3e932 minor fix 2020-10-29 10:55:07 +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
Daniel Rodriguez 5d4723ba15 Merge branch 'ent-6470-error-componentes-remotos' into 'develop'
Ent 6470 error componentes remotos

Closes pandora_enterprise#6470

See merge request artica/pandorafms!3558
2020-10-29 09:48:25 +01:00
artica 860024a11a Auto-updated build strings. 2020-10-29 01:00:21 +01:00
Jose Gonzalez e300f2244d Adding delete_agent control for meta 2020-10-28 17:56:42 +01:00
Daniel Rodriguez 7a776cd270 Merge branch 'ent-6469-entities-componentes-remotos' into 'develop'
Ent 6469 entities componentes remotos

Closes pandora_enterprise#6469

See merge request artica/pandorafms!3569
2020-10-28 17:15:59 +01:00
Daniel Barbero Martin 170ee5b9a5 fixed csv charts 2020-10-28 15:36:38 +01:00
Daniel Rodriguez 318094d758 Merge branch 'ent-6478-Bug-en-la-vista-HTML-y-PDF-de-los-items-AVG-MAX-MIN-Value-de-informes-y-templates' into 'develop'
fixed report avg-min-max

See merge request artica/pandorafms!3540
2020-10-28 15:19:32 +01:00
Daniel Rodriguez 57a4db6f68 Merge branch 'ent-6476-Bug-en-descarga-CSV-en-item-SLA-y-fallos-visuales' into 'develop'
fixed error report SLA CSV and Visuals

See merge request artica/pandorafms!3546
2020-10-28 15:18:51 +01:00
Daniel Rodriguez 8a47210dd5 Merge branch 'ent-6531-Bug-en-item-Simple-graph-de-informes-metaconsola' into 'develop'
fixed error report selector modules in metaconsole

See merge request artica/pandorafms!3544
2020-10-28 15:18:22 +01:00
Daniel Rodriguez 4a89a91899 Merge branch 'ent-6481-no-funciona-autovalidacion-eventos-meta' into 'develop'
Fixed api create_event autovalidation on meta

See merge request artica/pandorafms!3552
2020-10-28 13:09:01 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
Marcos Alconada 94cfd51501 Ent 6512 error en acls de alertas 2020-10-28 11:41:30 +01:00
Daniel Rodriguez 0a24fedb5a Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop'
Use service description instead of name in tree view

See merge request artica/pandorafms!3570
2020-10-28 11:19:49 +01:00
Daniel Rodriguez fa9f4bca95 Merge branch 'ent-6580-bug-en-la-edicion-de-grupos-asignando-como-padre-a-si-mismo' into 'develop'
exclude branch from select_for_Groups given group_id

See merge request artica/pandorafms!3550
2020-10-28 11:19:05 +01:00
artica 288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
Daniel Rodriguez b3e6ef58bd Merge branch 'ent-6641-Recon-task-no-admite-SNMP' into 'develop'
Snmp and WMI in recon task move open

See merge request artica/pandorafms!3579
2020-10-27 17:37:12 +01:00
fbsanchez f744261821 minor fix 2020-10-27 16:03:35 +01:00
Daniel Rodriguez 8ea3a5a578 Merge branch 'ent-6604-Perdida-de-conexion-con-el-servidor-en-consolas-visuales-con-link-publico-y-autorefresco' into 'develop'
fixed connection check in public link of visual consoles

See merge request artica/pandorafms!3573
2020-10-27 15:58:13 +01:00
Daniel Rodriguez e2abe65035 Merge branch 'ent-6413-check-secciones-wizards-no-funcionan' into 'develop'
Solved issue

See merge request artica/pandorafms!3554
2020-10-27 15:56:56 +01:00
Daniel Barbero Martin 2b2acefa31 Snmp and WMI in recon task move open 2020-10-27 15:02:05 +01:00
fbsanchez 8b4bcc77ab Update functions_events.php (io_safe_output over _event_date_) 2020-10-27 13:56:38 +01:00
alejandro-campos 7c882d3723 fixed connection check 2020-10-27 12:53:54 +01:00
alejandro-campos 315e522b2e added check for element 2020-10-27 12:01:38 +01:00
alejandro-campos 806377a884 fixed authentication bypass 2020-10-27 10:28:42 +01:00
Jose Gonzalez 8ba92a683a Fix some errors 2020-10-27 07:51:30 +01:00
Jose Gonzalez a9075f0068 Fix 2020-10-27 07:49:33 +01:00
artica 3b9558c7a0 Auto-updated build strings. 2020-10-27 01:00:21 +01:00
fbsanchez 6d781bc961 uncompressing data before serving it api_get_module_data -absurd format kept- 2020-10-26 18:12:36 +01:00
fbsanchez 1c14fa4bcb Added -force- option to Agent::lastStatus 2020-10-26 17:12:55 +01:00
fbsanchez 633116a793 Added -force- option to Agent::lastStatus 2020-10-26 17:12:27 +01:00
alejandro-campos 6ff11239e4 fixed connection check in public link of visual consoles 2020-10-26 14:44:05 +01:00
fbsanchez 5842235846 Orphan service modules + control require argument select from sql 2020-10-26 13:37:05 +01:00
Kike 3287223b4d Use service description instead of name in tree view 2020-10-26 12:05:37 +01:00
Jose Gonzalez be09fb8a29 Fixed code error 2020-10-26 10:36:43 +01:00
Jose Gonzalez 7ff518f4aa Solved issues with entities 2020-10-26 10:34:31 +01:00
fbsanchez 29174a87ef removed strict-user from monitor detail 2020-10-26 10:14:14 +01:00
artica 76324679ec Auto-updated build strings. 2020-10-26 01:00:14 +01:00
artica 89fc211e6f Auto-updated build strings. 2020-10-25 01:00:15 +02:00
artica bd95c0a4f0 Auto-updated build strings. 2020-10-24 01:00:16 +02:00
alejandro-campos 4ff0923589 fixed sound events 2020-10-23 13:53:38 +02:00
Jose Gonzalez 765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
Daniel Barbero Martin bebac548d3 fix exportation/exportation 2020-10-23 10:47:03 +02:00
alejandro-campos 3d561524be Merge branch 'develop' of https://brutus.artica.es:8081/artica/pandorafms into develop 2020-10-23 09:24:37 +02:00
alejandro-campos 5d812d5859 added new macros 2020-10-23 09:20:23 +02:00
artica 002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
Luis Calvo f3de0540fc Fix continous reload page cased by automatic form submit 2020-10-22 19:56:13 +02:00
fbsanchez 75bb4338b7 fixes in event macros (responses) 2020-10-22 18:10:46 +02:00
Jose Gonzalez a8c54dadee Fixed some errors 2020-10-22 17:03:31 +02:00
Jose Gonzalez ddc46c077f Solved issue 2020-10-22 17:01:10 +02:00
fbsanchez ef50b47269 avoid useless messages 2020-10-22 15:15:46 +02:00
fbsanchez f2143545b3 Able to create users without profile assignment 2020-10-22 13:35:42 +02:00
Jose Gonzalez f09e864569 Solved issue 2020-10-22 12:47:25 +02:00
Luis Calvo bfa8d703e7 Fixed api create_event autovalidation on meta 2020-10-22 11:35:07 +02:00
Daniel Maya 335e74c26b Fixed warning message in metaconsole 2020-10-22 09:53:59 +02:00
fbsanchez 3220217ec8 exclude branch from select_for_Groups given group_id 2020-10-21 18:31:10 +02:00
fbsanchez 5d69ca3126 recursion taken in mind in group report 2020-10-21 17:54:33 +02:00
fbsanchez ea87392bc1 minor fix 2020-10-21 17:03:46 +02:00
marcos 8b6b573bde fixed error with value status field 2020-10-21 16:18:07 +02:00
fbsanchez 6f498d6d5d server status images 2020-10-21 14:04:45 +02:00
fbsanchez bfa5b81ee8 Added server component status - crash - 2020-10-21 14:03:46 +02:00
fbsanchez 6b25ae6004 improved agent_module report (CSV) 2020-10-21 13:23:17 +02:00
Daniel Barbero Martin 82f4e1d987 fixed error report SLA CSV and Visuals 2020-10-21 12:14:40 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
artica 7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
Daniel Barbero Martin 73ff2cff9d fixed error report selector modules in metaconsole 2020-10-20 18:30:53 +02:00
fbsanchez 4babcbe647 Forced recursion while selecting All group - group_alert_report 2020-10-20 18:25:04 +02:00
fbsanchez 25295f7b0b fixes 2020-10-20 18:06:05 +02:00
fbsanchez 033dd531a8 Minor fix all group empty label 2020-10-20 17:47:35 +02:00
Daniel Maya 3c95d17482 Fixed new_agent 2020-10-20 16:15:42 +02:00
Daniel Barbero Martin 685acc6c20 fixed report avg-min-max 2020-10-20 16:00:19 +02:00
Daniel Barbero Martin 6c16587b40 fixed legend avg network interfaces 2020-10-20 12:58:25 +02:00
Daniel Maya 0f379a2888 Fixed pagination counter 2020-10-20 12:38:42 +02:00
artica fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
fbsanchez a961d04c6f Merge remote-tracking branch 'origin/develop' into ent-6472-graficas-con-phantomjs-y-saml 2020-10-19 19:40:40 +02:00
fbsanchez 8b4fd551d1 minor fixes 2020-10-19 19:17:07 +02:00
fbsanchez d7f3810bba improved message saml 2020-10-19 19:00:00 +02:00
fbsanchez 3562192d69 minor fix 2020-10-19 18:51:18 +02:00
fbsanchez 92211c71b7 trick to avoid simplesamlphp logout bug while using custom session handlers 2020-10-19 18:45:40 +02:00
fbsanchez 987e77271e another try 2020-10-19 17:42:50 +02:00
fbsanchez f6020e8791 Removed unwanted traces 2020-10-19 10:59:46 +02:00
artica c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica 880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
fbsanchez 7b73a36eb0 rc1 2020-10-16 16:41:42 +02:00
fbsanchez 30c7da054f fixes SAML 2020-10-16 15:24:21 +02:00
fbsanchez ca9b167741 SAML with pandora sessions 2020-10-16 14:00:38 +02:00
artica dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
Jose Gonzalez dc15125cd8 Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo
Update
2020-10-15 12:27:59 +02:00
Jose Gonzalez c28e2917ed Modified database files 2020-10-15 11:29:47 +02:00
artica 3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica 6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00
Daniel Rodriguez 609ec5de37 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
Include SAML in pandora standard session handler (php)

See merge request artica/pandorafms!3528
2020-10-14 14:06:50 +02:00
daniel 510a96af8f fixed sql grph 2020-10-14 11:17:05 +02:00
Jose Gonzalez 65851afe4d Database update 2020-10-14 10:59:55 +02:00
fbsanchez b97e8697f9 Include SAML in pandora standard session handler (php) 2020-10-14 10:31:46 +02:00
Daniel Rodriguez 5b1d29e4cb Merge branch 'ent-6467-No-funciona-el-select-de-nodos-en-los-items-de-graficas-sql' into 'develop'
fixed sql graph pie

See merge request artica/pandorafms!3523
2020-10-14 10:29:53 +02:00
artica 4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
daniel 148384f8fb phantomjs performance 2020-10-13 18:24:10 +02:00
marcos 53362f6424 update branch 2020-10-13 15:04:33 +02:00
fbsanchez db716d6b1e Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-10-13 13:54:51 +02:00
Daniel Barbero Martin 8c6c4d99a0 fixed sql graph pie 2020-10-13 09:32:28 +02:00
artica 2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00
artica 8146e5377e Auto-updated build strings. 2020-10-12 01:00:16 +02:00
artica 2c1ed80925 Auto-updated build strings. 2020-10-11 01:00:16 +02:00
artica d5b0966669 Auto-updated build strings. 2020-10-10 01:00:18 +02:00
Daniel Barbero Martin 8a72074a8a fixed sql graph pie 2020-10-09 12:05:57 +02:00
Daniel Rodriguez 5ad265cbc8 Merge branch 'ent-6456-error-critico-operaciones-masivas-grupo-0' into 'develop'
Fix unhandled extra-options in group selector inclusions

See merge request artica/pandorafms!3518
2020-10-09 10:23:18 +02:00
artica 70cea5cdff Auto-updated build strings. 2020-10-09 01:00:21 +02:00
Daniel Rodriguez b6ee1a9434 Merge branch 'ent-6432-No-funciona-el-envio-de-mails-by-default' into 'develop'
fixed email test

See merge request artica/pandorafms!3504
2020-10-08 20:01:33 +02:00
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
Daniel Rodriguez 76c3fe8e83 Merge branch 'ent-6346-9940-event-group-no-muestra-eventos-para-grupos-secundarios' into 'develop'
Fix secondary groups match while group filtering

See merge request artica/pandorafms!3502
2020-10-08 16:34:20 +02:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00
Marcos Alconada 54035e9615 fixed error with sql query pie graph 2020-10-08 11:54:10 +02:00
Daniel Rodriguez 3838070ef7 Merge branch 'ent-6439-Error-summary-Availability-custom-report' into 'develop'
fixed errors availability reports

See merge request artica/pandorafms!3508
2020-10-08 10:14:37 +02:00
artica ed434135c2 Auto-updated build strings. 2020-10-08 01:00:17 +02:00
fbsanchez 2e0321fc6e Limit server down notifications once a day 2020-10-07 18:48:17 +02:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
fbsanchez 5a5fb6eeea Allow define time start greater than time end in weekly planed downtimes 2020-10-07 14:49:46 +02:00
fbsanchez 0deff70f8b Alert report (group) Group + secondary groups + recursion 2020-10-07 14:07:17 +02:00
Daniel Barbero Martin c4c987d6c1 fixed errors availability reports 2020-10-07 12:12:06 +02:00
fbsanchez 5ce1bd23e4 Discovery task instead Recon task in some places 2020-10-07 10:56:40 +02:00
fbsanchez 2ba412cb55 Minor fixes discovery tasklist usability 2020-10-07 10:29:43 +02:00
daniel 40864eee6b add new token to report 2020-10-07 09:34:43 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
alejandro-campos 929310d0e9 fixed bad module id reference 2020-10-06 17:33:34 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez 35b80f0778 Merge remote-tracking branch 'origin/develop' into ent-6346-9940-event-group-no-muestra-eventos-para-grupos-secundarios 2020-10-06 13:00:06 +02:00
Daniel Rodriguez b6cf44184d Merge branch 'ent-6394-api-delete-agent-no-funciona-meta' into 'develop'
add new acl on delete agent api/cli

See merge request artica/pandorafms!3499
2020-10-06 12:33:47 +02:00
alejandro-campos 2915a3bd35 fixed email test 2020-10-06 11:07:46 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
Daniel Rodriguez e403c781ea Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop'
Group selection improvement

See merge request artica/pandorafms!3450
2020-10-05 13:11:23 +02:00
fbsanchez cc3189196c Fix secondary groups match while group filtering 2020-10-05 12:45:26 +02:00
marcos e5fe9d5c29 feature 2FA_all_users 2020-10-05 12:29:51 +02:00
daniel 48831b5032 add new options char 2020-10-05 12:04:46 +02:00
fbsanchez 27c2fa0860 minor fix 2020-10-05 11:52:41 +02:00
fbsanchez e21fa82b48 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-10-05 10:58:21 +02:00
marcos a1048301e8 add new acl on delete agent api/cli 2020-10-05 09:02:11 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
fbsanchez 2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
fbsanchez ea3f147bad minor fixes group selector 2020-10-02 14:31:41 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
fbsanchez 07ed5ac9d8 minor fix AJAX group selector in MC 2020-10-02 14:00:04 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
ismael.moreno d7845fa430 SQL query do not need to be cleaned 2020-10-01 18:56:16 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez f44b614f54 Fix cache hit users_get_groups 2020-10-01 15:17:06 +02:00
fbsanchez 679d72e5c0 minor fix 2020-10-01 14:05:25 +02:00
fbsanchez 4f80eec179 recovered changes after merge request 2020-10-01 13:42:41 +02:00
fbsanchez d052c09f44 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-10-01 13:36:13 +02:00
artica 43b02efa4e Auto-updated build strings. 2020-10-01 01:00:20 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +02:00
marcos add9387876 fixed error on create empty network map 2020-09-30 14:42:51 +02:00
marcos f8666adf0f F2 feature 2020-09-30 14:20:57 +02:00
Daniel Rodriguez 311186a70a Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop'
fixed mobile console donut charts

See merge request artica/pandorafms!3470
2020-09-30 13:19:06 +02:00
Daniel Rodriguez ccbbd7909b Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop'
Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc

See merge request artica/pandorafms!3475
2020-09-30 10:25:32 +02:00
artica 1a2f14a35b Auto-updated build strings. 2020-09-30 01:00:21 +02:00
fbsanchez b7c2913071 Avoid create agent if no group is selected 2020-09-29 15:49:10 +02:00
fbsanchez d73c215b91 Avoid create agent if no group is selected 2020-09-29 15:48:20 +02:00
fbsanchez 5d63bc547e Group selection review 2020-09-29 14:22:58 +02:00
fbsanchez 5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
Daniel Rodriguez 4939d71420 Merge branch 'ent-6382-10451-Bug-en-chequeos-de-notificaciones-por-HA-+-ticket-guardia' into 'develop'
fixed bug when node is disabled

See merge request artica/pandorafms!3484
2020-09-29 12:43:59 +02:00