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

15513 Commits

Author SHA1 Message Date
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
Calvo c6921efdce Unify search criteria case insensitive 2021-10-22 14:43:14 +02:00
alejandro.campos@artica.es 40aec564af prevent global admins to log in remotely 2021-10-22 14:38:20 +02:00
Calvo f1f984614f Unify search criteria case insensitive 2021-10-22 12:02:31 +02:00
Daniel Rodriguez 6e12e5363e Merge branch 'ent-8055-tareas-programadas-almacenadas-en-disco-rotas-fix-mr-48' into 'develop' 
Fix mr 48 breaking tasks

See merge request artica/pandorafms!4478
 2021-10-22 09:58:57 +00:00
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
Calvo a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
artica 80c7f106ad Auto-updated build strings. 2021-10-21 01:00:55 +02:00
artica 6ccf3a9ee9 Updated version and build strings. 2021-10-20 15:31:02 +02:00
alejandro.campos@artica.es 77aba53c7e fix data representation 2021-10-20 15:26:16 +02:00
Daniel Maya 30d1e3ec23 #7916 Fixed group name 2021-10-20 13:09:47 +02:00
alejandro.campos@artica.es 14076efc69 minor fix 2021-10-20 12:48:42 +02:00
artica b70ca89af2 Auto-updated build strings. 2021-10-20 01:01:06 +02:00
fbsanchez 98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +02:00
alejandro.campos@artica.es e7d730ba0d fix bug with ldap login in metaconsole 2021-10-19 19:19:55 +02:00
Jose Gonzalez 9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
alejandro.campos@artica.es 7931668021 add capability to upload files in ticket creation and update on Integria integration system 2021-10-19 15:34:17 +02:00
alejandro.campos@artica.es 0b033dae74 add capability to upload files in ticket creation and update on Integria integration system 2021-10-19 15:32:22 +02:00
Jose Gonzalez 05e352e9cf Fixed issue with class 2021-10-19 11:11:58 +02:00
artica 65b0d839f9 Auto-updated build strings. 2021-10-19 01:00:50 +02:00
Jose Gonzalez dc3e690502 Fixed issue with OK label 2021-10-18 17:24:41 +02:00
Calvo 7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
Daniel Rodriguez 704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
 2021-10-18 11:36:19 +00:00
Daniel Rodriguez aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop' 
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
 2021-10-18 08:33:17 +00:00
Calvo bd46cb7abc Fix metaconsole services tree view agent module data popup 2021-10-18 10:26:47 +02:00
artica c043c3d023 Auto-updated build strings. 2021-10-18 01:00:18 +02:00
artica 6da17b11aa Auto-updated build strings. 2021-10-17 01:00:18 +02:00
artica 0e9f37a090 Auto-updated build strings. 2021-10-16 01:00:22 +02:00
Daniel Rodriguez 691b23c442 Merge branch 'ent-7722-cambio-en-el-comportamiento-de-modulos-al-editar-un-servicio' into 'develop' 
Recreate service modules

See merge request artica/pandorafms!4456
 2021-10-15 09:52:03 +00:00
Daniel Maya 9976783266 #8041 Fixed module graph height 2021-10-15 11:43:43 +02:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
artica af9711ec3d Auto-updated build strings. 2021-10-15 01:00:20 +02:00
Daniel Rodriguez 92740cd86b Merge branch 'ent-8096-arreglos-black-theme' into 'develop' 
fixed visual black theme error

See merge request artica/pandorafms!4457
 2021-10-14 09:59:16 +00:00
Daniel Maya a300ca5786 #8098 Fixed pagination 2021-10-14 11:33:06 +02:00
artica 20448faa35 Auto-updated build strings. 2021-10-14 01:00:21 +02:00
fbsanchez 96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
Jose Gonzalez 3f28a98744 Added feature for read comments in grouped events 2021-10-13 14:58:31 +02:00
artica 9d813b729e Auto-updated build strings. 2021-10-13 01:00:13 +02:00
artica 4fd071cf60 Auto-updated build strings. 2021-10-12 01:00:19 +02:00
artica a8937abb65 Auto-updated build strings. 2021-10-11 01:00:15 +02:00
artica 2b419b826d Auto-updated build strings. 2021-10-10 01:00:16 +02:00
artica 9867024d2e Auto-updated build strings. 2021-10-09 01:00:19 +02:00
fbsanchez 8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
fbsanchez 81e696a045 fix in not null matching rule 2021-10-08 15:30:32 +02:00
fbsanchez 1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
Jose Gonzalez eaaab1e250 Added visual tab Custom data in events 2021-10-08 14:59:18 +02:00
Jose Gonzalez aafa979b4a Fixed name 2021-10-08 12:37:09 +02:00
alejandro.campos@artica.es 088193438f fix wrong event id in grouped events 2021-10-08 11:59:29 +02:00
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +02:00
alejandro.campos@artica.es 21c1bacc0e added search capacity to multiple select 2021-10-07 17:12:00 +02:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Marcos Alconada 4378c3d6f5 Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme' 
# Conflicts:
#   pandora_console/include/styles/pandora_black.css
 2021-10-07 13:42:14 +00:00
Daniel Rodriguez f25035db58 Merge branch 'ent-8086-iconos-de-tree-view-metaconsola-rotos' into 'develop' 
Some ui_get_full_url improvements

See merge request artica/pandorafms!4449
 2021-10-07 13:36:30 +00:00
Daniel Rodriguez e1a55e78ac Merge branch 'ent-8094-iconos-de-politicas-en-blanco-black-theme' into 'develop' 
set bg transparent on images black theme

See merge request artica/pandorafms!4454
 2021-10-07 13:34:57 +00:00
Jose Gonzalez 2c22e53e9d Fixed Diagnostics 2021-10-07 14:20:59 +02:00
marcos 34350c92a0 fixed visual black theme error 2021-10-07 13:43:46 +02:00
fbsanchez d4ceaa4643 Recreate service modules 2021-10-07 13:21:04 +02:00
marcos afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
fbsanchez 2050c137ec errata fix 2021-10-07 12:25:41 +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
marcos 52f87757d6 set bg transparent on images black theme 2021-10-07 10:30:05 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
artica c7face04e1 Auto-updated build strings. 2021-10-07 01:00:20 +02:00
fbsanchez 6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
Daniel Maya eab82aa6d1 #8049 Fixed get visual console with selected node 2021-10-06 16:49:21 +02:00
fbsanchez 35eb1d0790 Some ui_get_full_url improvements 2021-10-06 15:13:21 +02:00
fbsanchez 8764413597 Some ui_get_full_url improvements 2021-10-06 15:07:46 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3f86528c80 Merge branch 'ent-7910-pandora-db-con-db-encriptada' into 'develop' 
Fix issue with encrypted password

Closes pandora_enterprise#7910

See merge request artica/pandorafms!4433
 2021-10-06 12:42:12 +00:00
Daniel Rodriguez ce656997a5 Merge branch 'ent-8078-Los-tokens-de-selector-general-del-wizard-SNMP-no-funcionan' into 'develop' 
fix block selector in snmp wizards

See merge request artica/pandorafms!4443
 2021-10-06 12:28:40 +00:00
Jose Gonzalez a70d48514e Fix Barivion name in license and readme 2021-10-06 13:33:25 +02:00
Daniel Rodriguez 69216e1bcf Merge branch 'ent-8056-12473-Funcion-get-magic-quotes-gpc-hace-fallar-snmp-browser-para-PHP-7-4-o-superior' into 'develop' 
removed deprecated get_magic_quotes_gpc function and dependent code

See merge request artica/pandorafms!4439
 2021-10-06 10:30:58 +00:00
Calvo 50dbeb03ce Fix entities on modules with large name treeview 2021-10-06 10:41:55 +02:00
Daniel Rodriguez 35c877ad79 Merge branch 'ent-8024-source-ip-advanced-filter' into 'develop' 
Ent 8024 source ip advanced filter

See merge request artica/pandorafms!4430
 2021-10-06 08:34:56 +00:00
Daniel Rodriguez 8b889b6c5b Merge branch 'ent-7990-error-servicios-metaconsola-detras-de-un-reverse-proxy' into 'develop' 
Please check carefully this change

See merge request artica/pandorafms!4442
 2021-10-06 08:32:46 +00:00
Daniel Rodriguez b56026ef59 Merge branch 'ent-8051-Giss-informe-de-grafica-de-prediccion-no-funciona-en-metaconsola' into 'develop' 
fixed projection report in metaconsole

See merge request artica/pandorafms!4440
 2021-10-06 08:31:30 +00:00
artica 1ebc2ed082 Auto-updated build strings. 2021-10-06 01:00:22 +02:00
Calvo 1fca24d8dc Fix ldap auth php function passwords with special chars 2021-10-05 18:00:16 +02:00
fbsanchez e335bb6885 some fixes, please hard test 2021-10-05 17:03:06 +02:00
alejandro.campos@artica.es 4016d97c39 fix block selector in snmp wizards 2021-10-05 16:51:13 +02:00
fbsanchez ec8d5b4fe4 Please check carefully this change 2021-10-05 15:09:30 +02:00
Daniel Rodriguez 3ab921acbb Merge branch 'ent-7950-errores-en-log-viewer' into 'develop' 
Ent 7950 errores en log viewer

See merge request artica/pandorafms!4383
 2021-10-05 09:29:24 +00:00
Daniel Rodriguez 4cff768f4b Merge branch 'ent-7760-bug-visual-con-el-times-in-al-añadir-una-accion-a-una-alerta-de-correlacion' into 'develop' 
fixed visual error with time in action on ca

See merge request artica/pandorafms!4294
 2021-10-05 09:27:30 +00:00
Daniel Rodriguez 961522218e Merge branch 'ent-7694-imagen-pequena-en-sap-view' into 'develop' 
fixed size sap logo

See merge request artica/pandorafms!4289
 2021-10-05 09:25:35 +00:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop' 
fallo critico del swich regordete

See merge request artica/pandorafms!4288
 2021-10-05 09:24:51 +00:00
Daniel Rodriguez 6cbf83b2e2 Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4285
 2021-10-05 09:23:14 +00:00
Daniel Rodriguez 4b5719c1da Merge branch 'ent-7781-black-theme-botones-blancos-en-filtro-de-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4283
 2021-10-05 09:22:35 +00:00
Daniel Rodriguez 086761b7b6 Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop' 
fixed visual error with modules agents

See merge request artica/pandorafms!4390
 2021-10-05 09:22:05 +00: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
Daniel Rodriguez d0e738e8fb Merge branch 'ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola' into 'develop' 
Ent 7937 mensaje this node is configured with centralized mode de nodo sale en metaconsola

See merge request artica/pandorafms!4409
 2021-10-05 09:18:41 +00:00
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
alejandro.campos@artica.es ccac91e83c fixed projection report in metaconsole 2021-10-05 10:47:50 +02:00
artica d1b9dc4ef8 Auto-updated build strings. 2021-10-05 01:00:20 +02:00
fbsanchez e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
alejandro.campos@artica.es c08806374e removed deprecated get_magic_quotes_gpc function and dependent code 2021-10-04 17:37:06 +02:00
marcos aa43caee23 resolved mrege conflicts 2021-10-04 14:22:11 +02:00
marcos 4f2be6f280 add title on odometer 2021-10-04 13:32:48 +02: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
artica 0e02cb314c Auto-updated build strings. 2021-10-04 01:00:16 +02:00
artica 7b369d4fed Auto-updated build strings. 2021-10-03 01:00:15 +02:00
artica fd51190b07 Auto-updated build strings. 2021-10-02 01:00:19 +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
Daniel Rodriguez e5e91e2868 Merge branch 'ent-7168-Integrar-vista-de-warnings-en-Availability-reports' into 'develop' 
modified availability report

See merge request artica/pandorafms!4361
 2021-10-01 12:45:53 +00:00
Daniel Rodriguez 31bc3c2747 Merge branch 'ent-8062-Graficas-combinadas-en-CV-de-Meta-no-muestra-datos' into 'develop' 
Ent 8062 graficas combinadas en cv de meta no muestra datos

See merge request artica/pandorafms!4435
 2021-10-01 12:32:20 +00:00
Jose Gonzalez 5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
Daniel Maya eb4277f4bd #7273 Fixed background and value 2021-10-01 13:13:33 +02:00
alejandro.campos@artica.es 675e64d8ca fix in threshold calculation 2021-10-01 09:06:41 +02:00
artica 1d74155723 Auto-updated build strings. 2021-10-01 01:00:22 +02:00
alejandro.campos@artica.es af4a29d093 minor fix 2021-09-30 17:43:55 +02:00
Daniel Maya 12d47cd1aa #8024 fixed router ip 2021-09-30 16:09:08 +02:00
alejandro.campos@artica.es 277fcd51ca minor changes 2021-09-30 16:02:14 +02:00
Daniel Rodriguez d791f050b2 Merge branch 'ent-7963-NetFlow-Live-View-fallos-al-mostrar-datos' into 'develop' 
Ent 7963 net flow live view fallos al mostrar datos

See merge request artica/pandorafms!4429
 2021-09-30 12:14:43 +00: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
fbsanchez e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/mr/50.sql
 2021-09-30 12:24:19 +02:00
fbsanchez 9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
artica 036da5ea3a Auto-updated build strings. 2021-09-30 01:00:18 +02:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Maya 1f32c62de9 #7963 Fixed netflow view 3 2021-09-29 16:47:24 +02:00
Daniel Maya 574098e4ee #8062 Fixed custom graph in metaconsole 2021-09-29 16:20:18 +02:00
Jose Gonzalez 0a0d055252 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-29 14:21:23 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
alejandro.campos@artica.es fc6fb36293 Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-29 13:29:20 +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 Maya fb449910c9 #7963 Fixed netflow view 2 2021-09-29 10:57:57 +02:00
Daniel Rodriguez 56c197e4a5 Merge branch 'ent-7867-Error-al-listar-las-interfaces-en-Interface-View' into 'develop' 
Ent 7867 error al listar las interfaces en interface view

See merge request artica/pandorafms!4379
 2021-09-29 08:33:10 +00:00
artica 06c42a051d Auto-updated build strings. 2021-09-29 01:00:20 +02:00
Jose Gonzalez d68328c777 Fix issue with encrypted password 2021-09-28 16:39:22 +02: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
Daniel Rodriguez ddd550ce42 Merge branch 'ent-8022-12445-duplicacion-de-politicas-con-mergeador-de-metaconsola' into 'develop' 
Entity dynamic method calling improved

See merge request artica/pandorafms!4415
 2021-09-28 12:56:00 +00:00
alejandro.campos@artica.es 87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Daniel Maya d237fab6a6 #8024 fixed router ip 2021-09-28 13:42:30 +02:00
Daniel Rodriguez 9beda8eada Merge branch 'ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo' into 'develop' 
Added checkbox for group recursion in network maps

See merge request artica/pandorafms!4297
 2021-09-28 10:18:19 +00:00
Jose Gonzalez 1a884a9df6 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-09-28 11:33:48 +02:00
Daniel Maya af4e49e156 #7963 Fixed netflow view 2021-09-28 09:42:05 +02:00
artica 201fea9378 Auto-updated build strings. 2021-09-28 01:00:21 +02:00
Daniel Rodriguez 894cd0974f Merge branch 'ent-3407-Informes-en-IPAM' into 'develop' 
Ent 3407 informes en ipam

See merge request artica/pandorafms!4424
 2021-09-27 12:06:00 +00:00
Daniel Rodriguez c57c901e55 Merge branch 'ent-7068-funcionamiento-de-alertas-en-politicas' into 'develop' 
Added unlinked icon to alerts in unlinked module

See merge request artica/pandorafms!4426
 2021-09-27 10:09:30 +00:00
Calvo 91cd12c715 fix networkmap node group recursion 2021-09-27 11:25:54 +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
artica b09febeee0 Auto-updated build strings. 2021-09-27 01:00:15 +02:00
artica 17ba73ad36 Auto-updated build strings. 2021-09-26 01:00:11 +02:00
artica 2cbe307a6f Auto-updated build strings. 2021-09-25 01:00:21 +02:00
alejandro.campos@artica.es 9e0729574e Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-24 11:40:25 +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
Daniel Rodriguez 4420ecec2c Merge branch 'ent-7514-pasar-networkmaps-a-open' into 'develop' 
Ent 7514 pasar networkmaps a open

Closes pandora_enterprise#7514

See merge request artica/pandorafms!4416
 2021-09-24 07:14:14 +00:00
Daniel Rodriguez 7bdb730abd Merge branch 'ent-8018-estilos-campos-seleccion-metaconsola' into 'develop' 
Fix select fields size

Closes pandora_enterprise#8018

See merge request artica/pandorafms!4418
 2021-09-24 07:12:52 +00:00
artica bc516889bf Auto-updated build strings. 2021-09-24 01:00:21 +02:00
Calvo 4a9f523468 Added unlinked icon to alerts in unlinked module 2021-09-23 19:02:31 +02:00
Jose Gonzalez de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
fbsanchez 12ddb4d792 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2021-09-23 16:23:38 +02:00
Daniel Rodriguez 9852c711eb Merge branch 'ent-7330-nombre-alias-de-agentes-largos-se-ven-mal-en-sql-vertical-graph' into 'develop' 
fixed agent name flot-x-axis in sql vertical graph

See merge request artica/pandorafms!4339
 2021-09-23 13:48:14 +00:00
Alejandro Campos ca46285a0e Merge branch 'develop' into 'ent-3407-Informes-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/50.sql
 2021-09-23 13:33:02 +00:00
Daniel Rodriguez 174f4cf5af Merge branch 'ent-8000bis-error-autenticacion-ldap' into 'develop' 
Fix LDAP authentication failure

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4425
 2021-09-23 12:32:27 +00:00
Daniel Rodriguez ad8382003b Merge branch 'ent-8014-entities-en-tags' into 'develop' 
Fix entities

Closes pandora_enterprise#8014

See merge request artica/pandorafms!4420
 2021-09-23 10:33:30 +00:00
Jose Gonzalez dee81f85ba Fix LDAP authentication failure 2021-09-23 11:22:15 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Maya 3f91fda888 Fixed module_details_window 2021-09-23 10:59:24 +02:00
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez 731c293b50 Merge branch 'ent-8000-error-autenticacion-ldap' into 'develop' 
Fix io_safe_output for ldap admin pass

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4414
 2021-09-22 13:56:48 +00:00
Daniel Rodriguez ce286f2654 Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop' 
Fix tag treeview level2

See merge request artica/pandorafms!4407
 2021-09-22 09:09:11 +00:00
Daniel Rodriguez c6e2fd6aa9 Merge branch 'ent-7993-bug-en-llamada-api-crear-alert-template-meta' into 'develop' 
API set create alert template metaconsole support

See merge request artica/pandorafms!4401
 2021-09-22 09:08:34 +00:00
Daniel Rodriguez 68b3255143 Merge branch 'ent-7583-traduccion-traduccion-del-apartado-de-la-consola-alerts-alert-correlation' into 'develop' 
Css content moved to js to allow translation

See merge request artica/pandorafms!4400
 2021-09-22 09:07:42 +00:00
Daniel Rodriguez 3338165dc3 Merge branch 'ent-7924-api-group-id-by-mname-falla-al-usar-url-encode-separator' into 'develop' 
Fix api group_id_by_name with url enconde separator

See merge request artica/pandorafms!4391
 2021-09-22 09:00:27 +00:00
Daniel Rodriguez c6da03316c Merge branch 'ent-7711-Fallo-al-mover-un-ítem-static-image-que-tuviera-vinculado-un-network-link' into 'develop' 
Ent 7711 fallo al mover un ítem static image que tuviera vinculado un network link

See merge request artica/pandorafms!4346
 2021-09-22 08:59:44 +00:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop' 
Fix widgets style bugs

See merge request artica/pandorafms!4272
 2021-09-22 08:58:51 +00:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
alejandro.campos@artica.es fc959f0bc6 created report for ipam networks 2021-09-21 15:59:14 +02:00
Daniel Rodriguez a252bbedac Merge branch 'ent-7371-comportamiento-extrano-editor-ace' into 'develop' 
Fixed monospaced

Closes pandora_enterprise#7371

See merge request artica/pandorafms!4273
 2021-09-21 13:18:43 +00:00
Daniel Rodriguez b02ecc7cae Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop' 
fixed error with percentiles in graphs

See merge request artica/pandorafms!4312
 2021-09-21 13:18:18 +00:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop' 
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
 2021-09-21 13:17:30 +00:00
Daniel Rodriguez 1ac070d35d Merge branch 'ent-7339-warning-module-templates' into 'develop' 
Improve pen list handling

Closes pandora_enterprise#7339

See merge request artica/pandorafms!4263
 2021-09-21 13:16:44 +00:00
Daniel Rodriguez 3e4fafadf8 Merge branch 'ent-8013-Consolas-Visuales-en-Metaconsola-rotas' into 'develop' 
Ent 8013 consolas visuales en metaconsola rotas

See merge request artica/pandorafms!4421
 2021-09-21 13:07:35 +00:00
Daniel Maya 30ab96003c #6296 Fixed info popup and status images 2021-09-21 13:22:37 +02:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
Daniel Maya aef3e8affd #8013 Fixed percentile 2021-09-20 17:51:56 +02:00
Jose Gonzalez 4f64b7b64b Fix entities 2021-09-20 13:55:46 +02:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
Calvo 698ddd47df Fix api get group by id bug with or withouth url encode separator 2021-09-17 13:51:47 +02:00
Calvo 796f083730 Fix api get group by id bug 2021-09-17 11:52:30 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Daniel Maya 29012dc968 resolved conflict 2021-09-17 09:25:01 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
fbsanchez 47633b4794 A better explanation 2021-09-16 21:57:23 +02:00
fbsanchez 187c6700b1 Simplified Entity 2021-09-16 21:54:12 +02:00
fbsanchez b33be80be3 Entity dynamic method calling improved 2021-09-16 21:16:49 +02:00
Jose Gonzalez a1869fcef0 Fix io_safe_output for ldap admin pass 2021-09-16 12:08:46 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +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
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
fbsanchez 8f7e49b0d1 CS fix in memory_limit detection (MC) 2021-09-14 18:59:15 +02:00
Calvo e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00
Daniel Rodriguez 4a8461c2d3 Merge branch 'ent-7885-12292-General-Report-no-ordena-como-debe' into 'develop' 
Ent 7885 12292 general report no ordena como debe

See merge request artica/pandorafms!4378
 2021-09-10 11:17:54 +00:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop' 
add update manager black background update manager

See merge request artica/pandorafms!4270
 2021-09-10 11:11:24 +00:00
Daniel Rodriguez 8ea02ab4c2 Merge branch 'ent-7991-bug-selector-css' into 'develop' 
Fix name for css

Closes pandora_enterprise#7991

See merge request artica/pandorafms!4397
 2021-09-10 11:08:24 +00:00
Jose Gonzalez a774d67f2a Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-10 12:50:23 +02:00
Junichi Satoh 1c3ec719d7 Updated Japanese console translations. 2021-09-10 17:57:44 +09:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +00:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
Daniel Rodriguez 1a66858020 Merge branch 'ent-7984-falla-chequeo-de-acls-en-la-api' into 'develop' 
Fixed API access

See merge request artica/pandorafms!4395
 2021-09-09 08:07:15 +00:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop' 
fixed icon button position

See merge request artica/pandorafms!4243
 2021-09-08 14:40:34 +00: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
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop' 
fixed error

See merge request artica/pandorafms!4244
 2021-09-08 13:35:45 +00:00
Daniel Rodriguez 4372837f36 Merge branch 'ent-7961-bug-visual-en-las-graficas-de-log-viewer' into 'develop' 
Log viewer graph capture model visual  bug

See merge request artica/pandorafms!4393
 2021-09-08 13:23:22 +00:00
fbsanchez 52ba314612 Fixed API access 2021-09-08 14:28:48 +02:00
Daniel Rodriguez 6599f80dff Merge branch 'ent-7444-Metaconsole-Triggered-alerts-report' into 'develop' 
Fixed forget metaconsole alerts

Closes pandora_enterprise#7444

See merge request artica/pandorafms!4388
 2021-09-08 10:14:22 +00:00
Calvo 44663c914a Log viewer graph capture model visual bug 2021-09-08 10:44:57 +02:00
artica 7e5dc6a9c4 Auto-updated build strings. 2021-09-08 01:00:19 +02:00
artica ecd818bbb7 Auto-updated build strings. 2021-09-07 01:00:19 +02:00
Calvo 62775e0dae Fix api group_id_by_name with url enconde separator 2021-09-06 18:13:14 +02:00
marcos 1b4a137579 fixed visual error with modules agents 2021-09-06 17:16:49 +02:00
Jose Gonzalez bb743cb87f Fixed forget metaconsole alerts 2021-09-06 14:08:24 +02:00
Daniel Rodriguez 42d8bb6003 Merge branch 'ent-7801-Vulnerabilidad-File-Manager' into 'develop' 
Fix vulnerability

Closes pandora_enterprise#7801

See merge request artica/pandorafms!4385
 2021-09-06 11:23:26 +00:00
marcos 9552b9716e reduce title of longer module name odometer VC 2021-09-06 12:28:57 +02:00
artica 6bb994f4b7 Auto-updated build strings. 2021-09-06 01:00:37 +02:00
artica 42a999b207 Auto-updated build strings. 2021-09-05 01:00:13 +02:00
artica 22a0709953 Auto-updated build strings. 2021-09-04 01:00:22 +02:00
marcos 197ae303e2 reduce longer module name on odometers VC 2021-09-03 14:59:39 +02:00
marcos b3f4e68934 reduce longer module name on odometers VC 2021-09-03 14:57:09 +02:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
Daniel Rodriguez 3f5d37493e Merge branch 'ent-7955-500-en-link-al-agente-desde-widget-list-of-latest-events-dashboard-metaconsola' into 'develop' 
fixed error with node link events list dashboard

See merge request artica/pandorafms!4382
 2021-09-03 09:44:49 +00:00
artica 30c6a78b35 Auto-updated build strings. 2021-09-03 01:00:40 +02:00
marcos 8b048c8c19 fixed error with node link events list dashboard 2021-09-02 16:43:16 +02:00
Daniel Maya 5bf70f876c #7950 Fixed last_contact 2021-09-02 16:12:46 +02:00
Calvo 2ca6f52598 Revision ACL part 3 2021-09-02 15:43:20 +02:00
Jose Gonzalez ce2bdc1917 Fixed issues uploading files and fix vulnerability 2021-09-02 13:38:55 +02:00
Jose Gonzalez 0c96fd6f71 Merge remote-tracking branch 'origin' into ent-7804-modificar-comportamiento-file-manager 2021-09-02 12:43:05 +02:00
fbsanchez 6756c16c35 Added correlation server to server list 2021-09-02 12:21:31 +02:00
marcos 3547c09a16 add black theme on update manager online 2021-09-02 12:05:54 +02:00
artica 737943fee2 Auto-updated build strings. 2021-09-02 01:00:55 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Jose Gonzalez 423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
marcos f49d6d3088 fixed error with node link events list dashboard 2021-09-01 16:54:07 +02:00
Daniel Rodriguez b8e1391ffd Merge branch 'ent-7911-errores-file-manager' into 'develop' 
Fixed issues with files upload

Closes pandora_enterprise#7911

See merge request artica/pandorafms!4370
 2021-09-01 13:18:10 +00:00
Daniel Rodriguez fedc46dc1d Merge branch 'ent-7953-mapas-con-estilos-mal' into 'develop' 
Fix map styles

See merge request artica/pandorafms!4380
 2021-09-01 09:11:01 +00:00
Calvo 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +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
artica 10dd28246c Auto-updated build strings. 2021-09-01 01:00:24 +02:00
Daniel Rodriguez a853c8a0c6 Merge branch 'ent-7786-agentes-asignados-a-politicas-en-metaconsola' into 'develop' 
Ent 7786 agentes asignados a politicas en metaconsola

See merge request artica/pandorafms!4280
 2021-08-31 13:47:00 +00:00
Jose Gonzalez 3570ee6e04 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-31 14:49:53 +02:00
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop' 
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
 2021-08-31 10:05:31 +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
fbsanchez 88e4a804f5 Fix map styles 2021-08-31 11:05:41 +02:00
artica 966a5df96a Auto-updated build strings. 2021-08-31 01:00:50 +02:00
José González 215c0e3cc1 Branding 2021-08-30 16:24:51 +02:00
Daniel Maya 1e845cb5e3 #7867 Fixed id_agent 2021-08-30 12:13:33 +02:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
Daniel Maya 1d8dd85bbc #7885 Fixed order 2021-08-30 10:49:07 +02:00
Daniel Rodriguez 3be0c18165 Merge branch 'ent-7889-vulnerabilidad-xss-en-elementos-de-servicios' into 'develop' 
Ent 7889 vulnerabilidad xss en elementos de servicios

See merge request artica/pandorafms!4360
 2021-08-30 08:45:13 +00:00
José González b2a5e15c11 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-30 10:40:06 +02:00
artica b4c52f92f7 Auto-updated build strings. 2021-08-30 01:00:38 +02:00
artica bffc6c52ce Auto-updated build strings. 2021-08-29 01:00:17 +02:00
artica dd538c48bb Auto-updated build strings. 2021-08-28 01:00:24 +02:00
José González f31d156a46 Merge remote-tracking branch 'origin' into ent-7662-rebranding-meta 2021-08-27 13:00:37 +02:00
Daniel Rodriguez a0ff35670b Merge branch 'ent-7747-bug-en-descarga-de-plugins' into 'develop' 
Plugins get file correct downlad link

See merge request artica/pandorafms!4247
 2021-08-27 10:49:36 +00:00
Daniel Rodriguez a89faed47c Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop' 
Fixed issue with last_data obtain

Closes pandora_enterprise#7823

See merge request artica/pandorafms!4338
 2021-08-27 10:46:39 +00:00
Daniel Maya c4e6c52fe2 #7915 fixed custom field filter 2021-08-27 11:24:23 +02:00
marcos 05de5f643f fixed error with wrong event list dialog in dashboard 2021-08-27 09:20:30 +02:00
artica 72e46df88b Auto-updated build strings. 2021-08-27 01:00:23 +02:00
marcos 2ed657c166 updates 2021-08-26 12:42:16 +02:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
Daniel Rodriguez f33ccf1db9 Merge branch 'ent-7613-wizard-configuracion-inicial' into 'develop' 
Fix select2 write search field on dialog

See merge request artica/pandorafms!4242
 2021-08-26 08:55:57 +00:00
artica a8fcec1f6a Auto-updated build strings. 2021-08-26 01:00:50 +02:00
Jose Gonzalez 18cdc49b88 bad intentions directory creation avoided and solved some issues 2021-08-25 17:13:07 +02:00
Daniel Rodriguez d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop' 
add node name on event details

See merge request artica/pandorafms!4274
 2021-08-25 13:01:02 +00:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop' 
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
 2021-08-25 12:57:40 +00:00
fbsanchez 8b941b4d30 Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-25 11:13:35 +02:00
José González 8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González 357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
artica f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
Jose Gonzalez 1bbcc47344 Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager 2021-08-24 16:17:33 +02:00
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
José González a930dc1d8a Merge branch 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' of https://brutus.artica.es:8081/artica/pandorafms into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-24 11:52:51 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00