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

1710 Commits

Author SHA1 Message Date
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
Jose Gonzalez 7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Daniel Maya c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +01:00
Daniel Rodriguez 198959f6cb Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' 
Unify search criteria case insensitive

See merge request artica/pandorafms!4496
 2021-11-29 11:08:00 +00:00
fbsanchez 9c17625c77 ncm2 2021-11-26 18:11:34 +01:00
Calvo 5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
fbsanchez ce00d59f00 ncm2 2021-11-23 20:31:04 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Barbero Martin c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
fbsanchez 8346a233be NCM2 2021-11-18 19:49:57 +01:00
fbsanchez 75f4e86f9e Code highlight 2021-11-16 14:05:02 +01:00
Daniel Rodriguez d094987eda Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop' 
Fix recursion and filter on modules massive operations

See merge request artica/pandorafms!4477
 2021-11-15 11:29:33 +00:00
Daniel Rodriguez 9b55ade1bb Merge branch 'ent-7997-fallo-visualizacion-vista-de-arbol-de-servicios' into 'develop' 
Fix services tree empty leaf visual bug

See merge request artica/pandorafms!4410
 2021-11-15 10:24:57 +00:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin 89680907fd wip special days 2021-10-29 13:45:18 +02:00
Daniel Barbero Martin c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop' 
NCM

See merge request artica/pandorafms!4434
 2021-10-26 08:21:01 +00:00
alejandro.campos@artica.es aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
Calvo f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
fbsanchez 98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +02:00
Calvo 7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
Daniel Rodriguez 2118f44a7a Merge branch 'ent-7964-nug-visual-en-tree-view' into 'develop' 
Added title attr to module names in treeview

See merge request artica/pandorafms!4412
 2021-10-07 08:42:01 +00:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
Calvo 50dbeb03ce Fix entities on modules with large name treeview 2021-10-06 10:41:55 +02:00
Daniel Rodriguez fb7e443138 Merge branch 'ent-7938-bug-visual-en-item-odometro-cv' into 'develop' 
Ent 7938 bug visual en item odometro cv

See merge request artica/pandorafms!4386
 2021-10-05 09:20:47 +00:00
Daniel Rodriguez a794f30141 Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop' 
Fixed issue with node actions

Closes pandora_enterprise#8060

See merge request artica/pandorafms!4438
 2021-10-05 09:19:26 +00:00
marcos 7418719861 resolved merge conflict 2021-10-04 12:27:57 +02:00
marcos 30bf0ee163 Merge remote-tracking branch 'origin/master' into ent-7938-bug-visual-en-item-odometro-cv 2021-10-04 11:56:08 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
Jose Gonzalez 5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
Daniel Rodriguez 8d07ccb9cc Merge branch 'ent-7309-Expand-tree-snmp-browser' into 'develop' 
fixed expand all tree tool in snmp browser

See merge request artica/pandorafms!4262
 2021-09-30 12:12:57 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez 04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop' 
implemented supernet treeview

See merge request artica/pandorafms!4431
 2021-09-29 10:10:26 +00:00
Daniel Rodriguez 08fe77ddaa Merge branch 'ent-7766-query-extra-fields-componentes-remotos-wmi' into 'develop' 
WMI remote componente add text _field_wmi_n_

See merge request artica/pandorafms!4286
 2021-09-28 12:57:50 +00:00
alejandro.campos@artica.es 87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Calvo 46136a66ca Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo 2021-09-27 10:40:50 +02:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop' 
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
 2021-09-24 09:09:28 +00:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Maya 30ab96003c #6296 Fixed info popup and status images 2021-09-21 13:22:37 +02:00
Calvo 774e163ff0 Added title attr to module names in treeview 2021-09-15 17:41:51 +02:00
Calvo 0551b71d91 Fix services tree empty leaf visual bug 2021-09-15 10:35:02 +02:00
Daniel Rodriguez 2e7dadb04e Merge branch 'ent-7591-mensaje-error-timeout-snmp-en-browser' into 'develop' 
Fix format on snmp browser error messages

See merge request artica/pandorafms!4276
 2021-09-08 14:37:14 +00:00
marcos 9552b9716e reduce title of longer module name odometer VC 2021-09-06 12:28:57 +02:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop' 
add not option in monitor detail filter

See merge request artica/pandorafms!4112
 2021-09-01 08:54:49 +00:00
Daniel Rodriguez f94ad30df4 Merge branch 'ent-7506-ediciones-acciones-modo-advanced-no-amplia' into 'develop' 
fixed error with manual resize advanced action alerts

See merge request artica/pandorafms!4381
 2021-09-01 08:52:53 +00:00
Daniel Rodriguez f53969731a Merge branch 'ent-7638-11735-vista-de-eventos-en-dashboard-menus-descolocados' into 'develop' 
fixed error with wrong event list dialog in dashboard

See merge request artica/pandorafms!4374
 2021-08-31 10:03:30 +00:00
marcos 3cb2b92774 fixed error with manual resize advanced action alerts 2021-08-31 11:47:36 +02:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
marcos 05de5f643f fixed error with wrong event list dialog in dashboard 2021-08-27 09:20:30 +02:00
José González 8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
José González b515bfe443 Fix merge 2021-08-19 09:39:13 +02:00
Daniel Maya d70752baa1 Added services view widget 2021-08-13 14:12:21 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez cb498a9fe9 Merge branch 'ent-7441-Tree-View-Widget-no-coge-los-no-inicializados' into 'develop' 
Ent 7441 tree view widget no coge los no inicializados

See merge request artica/pandorafms!4277
 2021-08-10 07:00:12 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
Daniel Maya 77f5ad2a6d Fixed odometer in dashboard 2021-08-05 11:57:31 +02:00
Daniel Maya f9c95e0145 oMerge branch 'develop' into ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica 2021-08-04 09:57:57 +02:00
José González 8968d6abb9 Fixed leafs for modules 2021-07-19 18:04:25 +02:00
José González 950ca956a3 Fixed issues with subgroups in Tree view 2021-07-19 11:17:36 +02:00
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
Calvo 7890c4269c Added checkbox for group recursion in network maps 2021-07-14 18:00:07 +02:00
José González 3263ef8b9a Fix issue with WUX Trans Stats 2021-07-13 17:26:03 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
Calvo 19e9613e3e WMI remote componente add text _field_wmi_n_ 2021-07-12 12:17:38 +02:00
Daniel Maya a73a8ff926 show not init agents in tree 2021-07-07 17:17:36 +02:00
Calvo 06d18985e0 Fix format on snmp browser error messages 2021-07-07 16:44:19 +02:00
fbsanchez 8365b47be7 MQ exceptions, warning message on mq issues 2021-07-05 20:56:40 +02:00
alejandro.campos@artica.es 38c8a498c1 fixed expand all tree tool in snmp browser 2021-07-02 14:57:39 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez 36f6ad4ee2 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 
Conflicts:
	pandora_console/include/styles/meta_dashboards.css
 2021-06-28 10:37:49 +02:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
Luis 14e69c5c07 Ent 7644 mapa servicio tree view muestra elementos deshabilitados 2021-06-25 09:37:09 +00:00
José González 2bc607c4aa Fixed issue with select2 fields 2021-06-23 16:14:37 +02:00
fbsanchez de03486134 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 09:48:01 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 19579c0801 Merge branch 'ent-7505-11819-Bug-en-widget-Tree-view' into 'develop' 
Ent 7505 11819 bug en widget tree view

See merge request artica/pandorafms!4125
 2021-06-21 13:58:57 +00:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
alejandro.campos@artica.es 98f0bc9fac fixed xss vulnerability 2021-06-11 08:54:00 +02:00
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
fbsanchez 4711ca4856 Avoid connection accumulation 2021-05-19 17:44:07 +02:00
fbsanchez 538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
Daniel Maya a869e0749c #7505 fixed fixed Hirearchy 2021-05-13 10:11:58 +02:00
Daniel Barbero Martin ad03bc41aa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-12 08:41:00 +02:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Daniel Barbero Martin f7f4591ab1 WIP command center 2021-05-07 11:19:47 +02:00
Daniel Barbero Martin 77693b6c6d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-07 08:33:56 +02:00
Daniel Rodriguez 6db71ec0fb Merge branch 'ent-7176-no-se-ven-los-valores-de-la-columna-de-intervlos-en-creacion-de-modulos-black-theme' into 'develop' 
set labels white color on module interval svg

See merge request artica/pandorafms!3993
 2021-05-06 12:23:47 +00:00
Daniel Barbero Martin e1847c76ee WIP command center 2021-04-29 15:59:12 +02:00
Daniel Barbero Martin 2cd40a80fe Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-28 08:13:10 +02:00
Daniel Barbero Martin bdf6c9f258 WIP command center 2021-04-26 17:20:00 +02:00
Daniel Barbero Martin 6548e9e210 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-22 18:29:47 +02:00
marcos 733087f704 fixed error with modal cluster view 2021-04-22 13:23:49 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
Daniel Barbero Martin 741ec6a144 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 17:41:56 +02:00
marcos 24099644be remove log 2021-04-15 11:22:24 +02:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
Daniel Barbero Martin 2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +02:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
Daniel Barbero Martin e5b2a27631 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 08:26:38 +02:00
Daniel Rodriguez 6adc987f72 Merge branch 'ent-7035-enlace-modulos-rotos-module-library' into 'develop' 
Fixed module library download links

See merge request artica/pandorafms!3834
 2021-04-06 16:56:37 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
marcos ac286a438c set labels white color on module interval svg 2021-04-05 11:41:36 +02:00
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