tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,740 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

447 Commits

Author SHA1 Message Date
fbsanchez 25b15182e3 DBH auto-updater 2021-01-27 15:48:00 +01:00
fbsanchez d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
fbsanchez bbab6d9fe1 WIP update process 2021-01-27 14:06:22 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez 192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +01:00
Daniel Rodriguez e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop' 
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
 2021-01-25 10:07:53 +01:00
alejandro-campos 983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
fbsanchez 012ad2fb55 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-01-21 10:47:49 +01:00
fbsanchez 16029f7faf Significant fixes 2021-01-20 20:08:34 +01:00
fbsanchez 6ea19ac5fa External changes from #6158 2021-01-19 18:00:28 +01:00
alejandro-campos 535486a429 Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-18 11:48:51 +01:00
Alejandro Campos 5b9d7bcb81 Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' 
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/agent_module.php
 2021-01-15 14:52:26 +01:00
alejandro-campos 05c39db0cc changes in dashboard permissions 2021-01-15 13:57:25 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
Daniel Rodriguez fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
fbsanchez 96a8dbd0c8 added name method alias of nombre to Group class 2021-01-07 18:25:59 +01:00
fbsanchez 32d09a2353 added name method alias of nombre to Group class 2021-01-07 18:24:51 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Daniel Rodriguez 4b0fb7e762 Merge branch 'ent-6404-Bug-en-widget-Consolas-visuales-en-dashboard' into 'develop' 
fix dashboard VC

See merge request artica/pandorafms!3650
 2020-12-22 16:05:21 +01:00
Daniel Rodriguez efb4dabd18 Merge branch 'ent-6632-Bug-dashboard-favorito-cuando-no-lo-es' into 'develop' 
fixed query

See merge request artica/pandorafms!3602
 2020-12-21 12:02:47 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
fbsanchez 6461f029ee Added macros to event response 2020-12-10 17:53:49 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +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
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin 2e950af548 fix dashboard VC 2020-11-25 11:33:36 +01:00
fbsanchez e9fb346ecd Definition matching Entity 2020-11-24 18:10:39 +01:00
Daniel Barbero Martin 1ad1671612 fix remove acl widget agent/module 2020-11-23 09:29:11 +01:00
fbsanchez 4e73d8045a Minor fixes 2020-11-17 11:07:59 +01:00
fbsanchez 916537ea11 Net Interfaces methods in Agent/Module updates in NetworkLink 2020-11-13 16:07:59 +01:00
alejandro-campos c6cf4ab9ee fixed query 2020-11-11 16:25:58 +01:00
fbsanchez d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +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 def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 25295f7b0b fixes 2020-10-20 18:06:05 +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
fbsanchez a4b2e38ffc Fix unhandled extra-options in group selector inclusions 2020-10-08 16:41:26 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez 95f58776c8 fixes group selection 2020-09-30 17:47:44 +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
fbsanchez 12314d33c3 fixed direct html responses with sl2 2020-09-28 16:02:54 +02:00
fbsanchez 29ac13815a preload env required files (css,js) 2020-09-28 15:56:17 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
Daniel Rodriguez b18bbbf237 Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop' 
mc search nodes

See merge request artica/pandorafms!3463
 2020-09-18 14:37:10 +02:00
Daniel Rodriguez 02d364b66c Merge branch 'ent-6176-10390-Problema-de-permisos-en-los-dashboard' into 'develop' 
added acl checks on dashboard update

See merge request artica/pandorafms!3461
 2020-09-17 16:33:15 +02:00
fbsanchez 79bedb4982 Merge remote-tracking branch 'origin/develop' into ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador 2020-09-17 11:51:29 +02:00
fbsanchez 9d40f900ba WIP mc search nodes 2020-09-16 15:54:43 +02:00
alejandro-campos 05a0a3a366 fixed bug 2020-09-16 10:09:23 +02:00
alejandro-campos 5bb50acfb1 added acl checks on dashboard update 2020-09-16 10:00:05 +02:00
fbsanchez da7f286b22 fixed pagination (final page) 2020-09-11 15:09:52 +02:00
fbsanchez 017333c46a fixed pagination (final page) 2020-09-11 15:03:40 +02:00
fbsanchez a72002dc0e fixed pagination (final page) 2020-09-11 14:56:32 +02:00
fbsanchez 426286b8b5 fixed pagination (started by 1 instead 0, select2 requirement) 2020-09-11 14:53:29 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +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
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 fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
fbsanchez c8d86a4bdb minor fix 2020-07-15 13:46:51 +02:00
fbsanchez dc5767705f minor fixes 2020-07-13 13:56:41 +02:00
fbsanchez 23641e45bb Entity with enterprise capabilites 2020-07-10 13:38:42 +02:00
Daniel Barbero Martin af87e8c621 fixed errors in dashboard widget groups status 2020-07-10 08:30:57 +02:00
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
fbsanchez af7981ed05 Service tree view 2020-07-02 14:53:33 +02:00
fbsanchez ffba7b8285 wip services improvements 2020-06-30 18:59:47 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 1d621bd3d5 WIP services 2020-06-30 16:57:08 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
fbsanchez a8671078f1 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/install.php
 2020-06-25 11:25:43 +02:00
fbsanchez 45a161426b Services review 2020-06-24 18:01:34 +02:00
daniel a59cdec545 Fixed error dashboard draw multiple widget services 2020-06-09 10:37:29 +02:00
Daniel Rodriguez 6cf96a0fad Merge branch 'fix-widget-title-corruption' into 'develop' 
Widget title corruption in dashboard with multi-byte characters.

See merge request artica/pandorafms!3190
 2020-06-02 09:55:05 +02:00
fbsanchez e66f33fd37 WIP Cluster references updated 2020-05-22 12:14:01 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
fbsanchez 585f0f011e WIP cluster rebuild 2020-05-14 17:49:02 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +02:00
Junichi Satoh 06ae3a61e8 Fixed widget title corruption in dashboard with multi-byte characters. 2020-04-30 15:39:32 +09:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Daniel Maya 9f9cc9beda Fixed injection sql in chart_generator 2020-01-23 10:40:55 +01:00
fbsanchez 5f32bfdb64 Datatype fix - ws engine 2019-12-13 11:58:12 +01:00
fbsanchez bb093482a7 Fix: ws session extraction 2019-12-11 13:04:45 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez a0c610d988 WS fixed audit origin address 2019-10-24 12:18:49 +02:00
fbsanchez d34aa0917b WS tick interval, WS manager able to limit connections per session 2019-10-24 10:35:16 +02:00
fbsanchez 47e6f4adb5 Fix and control API sessions 2019-10-21 21:09:03 +02:00
fbsanchez 6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez bb2faca479 ma 2019-10-21 12:18:42 +02:00
fbsanchez 1cf77cc8f1 WSProxy ACL check 2019-10-18 18:55:29 +02:00
fbsanchez e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +02:00