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

1484 Commits

Author SHA1 Message Date
Daniel Barbero Martin 264c6d515e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 17:47:44 +02:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
Daniel Barbero Martin fe87e827a9 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-29 08:17:35 +02:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Daniel Barbero Martin d92adfc008 WIP command center 2021-03-25 16:50:24 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
daniel b258f409b9 Mode ghost for disabled modules and agents 2021-03-22 14:10:14 +00:00
Daniel Barbero Martin 2b8b27a863 fixed visual error dashboards 2021-03-15 15:42:22 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 868694ba24 Merge branch 'ent-6968-Ordenar-servicios-por-descripcion-tree-view' into 'develop' 
Fixed sorting by description

Closes pandora_enterprise#6968

See merge request artica/pandorafms!3825
 2021-03-09 16:33:12 +00:00
Jose Gonzalez 34b7c1003b Fixed error with sorting 2021-03-08 11:20:50 +01:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop' 
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
 2021-03-05 12:49:13 +00:00
Jose Gonzalez 0860b6e647 Fix ordenation with subservices 2021-03-05 13:07:53 +01:00
Jose Gonzalez df30df4637 Merge remote-tracking branch 'origin' into ent-6968-Ordenar-servicios-por-descripcion-tree-view 2021-03-05 12:37:29 +01:00
Daniel Rodriguez d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop' 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
 2021-03-04 10:43:29 +00:00
Jose Gonzalez 6ee5b9c3e9 Fix issues 2021-03-04 11:33:21 +01:00
Daniel Rodriguez 94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop' 
Fix styles file export_data

See merge request artica/pandorafms!3691
 2021-03-04 10:29:52 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
daniel 6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop' 
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
 2021-03-01 12:14:54 +00:00
Daniel Rodriguez 72ecb53412 Merge branch 'ent-6602-AXA-Recursividad-de-grupos-no-funciona-en-operaciones-masivas' into 'develop' 
fix recursivity check

See merge request artica/pandorafms!3711
 2021-03-01 10:57:45 +00:00
Daniel Rodriguez b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop' 
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
 2021-03-01 10:05:59 +00:00
Jose Gonzalez 7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
Jose Gonzalez ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
Luis Calvo 514b3fca09 Fixed module library download links 2021-02-15 12:55:35 +01:00
Jose Gonzalez e727f7c276 Added modals and fixed some bugs 2021-02-12 11:28:13 +01:00
fbsanchez 20dc58a140 Improved event widget, added custom filters 2021-02-10 18:41:53 +01:00
fbsanchez b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
fbsanchez ecf0f3d161 Force error catching while SNMP browsing 2021-02-09 10:25:42 +01:00
fbsanchez e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
Jose Gonzalez d9d82e1803 Fixed sorting by description 2021-02-08 10:22:38 +01:00
fbsanchez d2b166c295 fixes MC graphs in network link + vc links between mc and nodes 2021-02-03 12:53:05 +01:00
fbsanchez 906ac7f13f fixes VC in MC 2021-02-02 18:40:55 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +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
fbsanchez bf453ab0ef Effective command preview (action) 2021-01-21 17:09:36 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
José González 3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser' 
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
 2021-01-07 14:14:33 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop' 
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
 2020-12-23 17:19:46 +01:00
Daniel Rodriguez fc49958c96 Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop' 
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador

See merge request artica/pandorafms!3608
 2020-12-23 16:55:56 +01:00
Daniel Rodriguez 4f2d6bf136 Merge branch 'ent-6799-Edicion-Dashboards-fallo-al-cambiar-ancho-widgets' into 'develop' 
Fix gridstack js version 1.2

See merge request artica/pandorafms!3687
 2020-12-23 11:47:07 +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
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
daniel b230e17cc2 fix report groups status metaconsole 2020-12-17 17:04:52 +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
alejandro-campos 092011916b fix recursivity check 2020-12-10 16:07:40 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop' 
discovery.cloud.gcp

See merge request artica/pandorafms!3479
 2020-12-09 13:54:25 +01:00
Daniel Maya 244c4d56d6 Fixed unit 2020-12-04 12:32:38 +01:00
Daniel Rodriguez 9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop' 
Added QueryResult ui type

See merge request artica/pandorafms!3517
 2020-12-03 14:43:44 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Daniel Barbero Martin 3592368a3c Fix gridstack js version 1.2 2020-12-02 14:26:20 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez 9bf70add51 Fixed snmp server selection 2020-11-26 10:35:48 +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
Jose Gonzalez 063bf967f4 Added new js file 2020-11-20 10:24:15 +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
fbsanchez d08aa0b32b Updates in parent relationship ** WARN: bad relation line move while other lines are attached 2020-11-12 18:25:16 +01:00
fbsanchez 14db9c63c6 Sticky lines (VC) 2020-11-12 16:57:14 +01:00
Daniel Maya 0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
fbsanchez b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00
fbsanchez 067a19f69b WIP sticky lines 2020-11-06 20:37:37 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
fbsanchez c59042c034 WIP 2020-11-03 18:01:24 +01:00
fbsanchez b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
fbsanchez 90f199c5ad WIP NetworkLink 2020-10-30 14:07:44 +01:00
daniel 4e2d5bdf2b fix counter groups child 2020-10-30 13:23:47 +01:00
fbsanchez 326d1dac49 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-10-30 10:38:30 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00
fbsanchez 8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +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
alejandro-campos 6ff11239e4 fixed connection check in public link of visual consoles 2020-10-26 14:44:05 +01:00
Kike 3287223b4d Use service description instead of name in tree view 2020-10-26 12:05:37 +01:00
Jose Gonzalez 3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +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
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +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
Jose Gonzalez 00b289a557 Adapt functions for work in Metaconsole 2020-09-29 12:21:52 +02:00
Jose Gonzalez 6a21a668bf Added control for reveal passwords 2020-09-29 09:44:20 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +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
Luis 3327abc328 Ent 5824 connection lost warn mejora 2020-07-31 14:24:02 +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
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
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
fbsanchez 3d493f14da massive services 2020-07-07 19:10:24 +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
Luis Calvo d3087de163 Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn 2020-07-06 10:49:24 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +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
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
Daniel Rodriguez 7f1bd68c26 Merge branch 'ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales' into 'develop' 
fixed ajax call params when using url characters

See merge request artica/pandorafms!3237
 2020-06-26 12:41:25 +02:00
Daniel Rodriguez 3c5a893c71 Merge branch 'ent-5830-SNMP-Browser-Network-components-OID-info-and-Create-agent-modules' into 'develop' 
Ent 5830 snmp browser network components oid info and create agent modules

See merge request artica/pandorafms!3249
 2020-06-24 12:46:49 +02:00
fbsanchez 166978f3aa Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal 2020-06-22 12:25:04 +02:00
Luis Calvo d346c76322 Connection error dialog working 2020-06-19 23:03:37 +02:00
Luis Calvo e56a787ba8 WIP: Connection lost warn 2020-06-18 20:41:14 +02:00
alejandro-campos 53b3cb8925 Merge branch 'develop' into ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales 2020-06-15 17:10:17 +02:00
daniel b9d5ab9c4a Fixed errors new tab base64 image 2020-06-08 11:24:46 +02:00
marcos 07593e4466 fixed code 2020-06-04 14:00:30 +02:00
marcos 67d5a28346 add confirm dialog on meta and node recursive 2020-06-04 13:50:36 +02:00
marcos 4904718c41 add confirm dialog when delete one item in events table 2020-06-04 11:08:51 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
fbsanchez bb9f878816 Integer comparison when available 2020-05-29 11:47:37 +02:00
fbsanchez d8613131bd Integer comparison when available 2020-05-29 11:22:47 +02:00
fbsanchez f7ca97f7ef Chrome particularity 2020-05-29 11:12:13 +02:00
alejandro-campos 8abd447af1 minor fix in snmp browser 2020-05-27 16:11:48 +02:00
fbsanchez e8a3cb698d Time selector adjustment 2020-05-26 11:26:49 +02:00
alejandro-campos b9877a9cf6 fixed ajax call params when using url characters 2020-05-26 11:05:53 +02:00
fbsanchez 7bc9a96524 Minor fixes 2020-05-25 18:18:38 +02:00
fbsanchez 523212afb8 WIP cluster view 2020-05-20 19:04:42 +02:00
Daniel Rodriguez 96947d32fc Merge branch 'ent-5807-Bugs-al-eliminar-widget-y-visual-con-nuevos-Dashboards' into 'develop' 
Fixed errors in dashboards

See merge request artica/pandorafms!3207
 2020-05-19 08:23:37 +02:00
fbsanchez 585f0f011e WIP cluster rebuild 2020-05-14 17:49:02 +02:00
Daniel Rodriguez 5cab51c99d Merge branch 'ent-5554-Creador-de-mapas-de-red-se-vuelve-inoperable-despues-de-borrar-un-nodo' into 'develop' 
fix accessing wrong index after deletion of node

See merge request artica/pandorafms!3122
 2020-05-12 12:59:12 +02:00
Tatiana Llorente fabace239d Ent 5675 textos del sistema de licencias 2020-05-12 12:54:20 +02:00
Daniel Barbero Martin 24f4f68b33 Fixed errors in dashboards 2020-05-11 14:50:13 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Rodriguez fbd9902dc7 Merge branch 'ent-5746-problema-libreria-de-modulos' into 'develop' 
add cache false on functions_module_library

See merge request artica/pandorafms!3197
 2020-05-08 15:36:44 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
marcos e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
marcos 72f9c051eb changed message confirmation dialog 2020-04-28 10:44:13 +02:00
marcos 8cd1c0b83f add body message on confirmation modal 2020-04-28 10:12:20 +02:00
marcos ccd58897ee Add confirmation window 2020-04-27 16:40:50 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2020-04-07 12:55:27 +02:00
marcos 3a688c6b3d update task list dialog 2020-04-06 12:29:37 +02:00
marcos ad4781eb3c fixed error with dialog task list 2020-04-03 12:48:52 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00