Commit Graph

1446 Commits

Author SHA1 Message Date
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
alejandro-campos 26c16adbf9 fix accessing wrong index after deletion of node 2020-03-27 11:37:10 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
fbsanchez 6504fe49b5 intentation to spaces (2) and minor fix 2020-03-18 10:28:50 +01:00
fbsanchez b860c49383 target selections 2020-03-17 18:34:30 +01:00
fbsanchez f3da919abc WIP multiple changes 2020-03-16 23:52:20 +01:00
fbsanchez ce11d89953 Frontent changes 2020-03-13 14:03:50 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Barbero Martin a55e431b46 Fixed error cache build link VC 2020-02-20 13:25:56 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
2020-02-18 14:03:36 +01:00
alejandro-campos 526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
alejandro-campos 58364f90d5 visual changes in module creation 2020-02-07 14:01:59 +01:00
alejandro-campos bc96e0b32a visual changes in module creation 2020-02-07 13:59:50 +01:00
Luis 56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Daniel Barbero Martin e49ed85d03 fixed errors VC 2020-01-28 18:29:32 +01:00
Daniel Barbero Martin 570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
Daniel Barbero Martin 5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
Daniel Barbero Martin fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin 481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
Daniel Barbero Martin 3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Daniel Barbero f3dbf6391f Add confirm dialog remove item VC 2020-01-22 13:00:19 +01:00
Daniel Barbero 69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +01:00
Daniel Maya 32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Daniel Barbero Martin ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +01:00
Daniel Barbero Martin 578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2020-01-21 08:28:00 +01:00
Daniel Barbero Martin 98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin 3545e28581 Fixed errors VC 2020-01-20 16:01:53 +01:00
Alejandro Campos e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Rodriguez 738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
2020-01-20 09:54:20 +01:00
Daniel Barbero Martin 861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Tatiana Llorente 0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Daniel Barbero Martin d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +01:00
alejandro-campos d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00