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

22948 Commits

Author SHA1 Message Date
Daniel Maya 3b49b28d9e #8146 Fixed max hours 2021-10-27 09:18:28 +02:00
artica 945392b615 Auto-updated build strings. 2021-10-27 01:00:56 +02:00
Daniel Maya 2de38a915b #7912 Hidden agents without modules 2021-10-26 15:36:12 +02:00
fbsanchez a5bf72cca0 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/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
alejandro.campos@artica.es 24e73ce420 fix count in module groups view 2021-10-26 12:57:01 +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
artica 24404d5078 Auto-updated build strings. 2021-10-26 01:01:06 +02:00
Daniel Rodriguez 3436d80d09 Merge branch 'ent-8132-Bug-in-supernet-tree-view-IPAM' into 'develop' 
fixed ipam supernet tree view when there is no data show

See merge request artica/pandorafms!4499
 2021-10-25 15:15:13 +00:00
fbsanchez 05a2db88a3 menu fix 2021-10-25 17:01:26 +02:00
Daniel Maya 030938c78e #8134 Fixed search module 2021-10-25 15:40:43 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +02: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
Daniel Maya 05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +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
artica 56ca01112d Auto-updated build strings. 2021-10-25 01:00:48 +02:00
artica ef41522899 Auto-updated build strings. 2021-10-24 01:00:45 +02:00
artica 134f6ea2a5 Auto-updated build strings. 2021-10-23 01:00:54 +02:00
alejandro.campos@artica.es 40aec564af prevent global admins to log in remotely 2021-10-22 14:38:20 +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
fbsanchez 925fa8b819 Errata fix 2021-10-22 10:54:41 +02:00
alejandro.campos@artica.es 07c7c7a387 prevent from deleting global admin users when removing all of their profiles 2021-10-22 09:48:00 +02:00
artica 1218932b05 Auto-updated build strings. 2021-10-22 01:00:20 +02:00
fbsanchez 796a7125e1 Errata fix 2021-10-21 14:33:44 +02:00
Calvo a03e46ecea Fix parameters in cron_task_generate_report_by_template 2021-10-21 12:25:39 +02:00
fbsanchez df863c6057 minor fix NCM test script 2021-10-21 12:20:12 +02:00
fbsanchez 303d6632e1 NCM 2021-10-21 11:28:14 +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
Daniel Maya 6520f95fcf #7947 Fixed integria IMS ticket in metaconsole 2021-10-20 17:06:24 +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
alejandro.campos@artica.es 3e1dcbb554 changed text 2021-10-20 13:30:24 +02:00
Daniel Maya 30d1e3ec23 #7916 Fixed group name 2021-10-20 13:09:47 +02:00
Jose Gonzalez 070c920e0e Fixed tip position and code style 2021-10-20 13:01:13 +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 b61e7c6c58 Fixed visual with browsers with more zoom 2021-10-19 17:04:39 +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
Daniel Maya c8a11543e8 #8111 Fixed X-Frame-Options 2021-10-18 16:36:10 +02:00
Calvo 9f71a9ba81 Fix mr 48 breaking tasks 2021-10-18 16:05:37 +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
alejandro.campos@artica.es 8db66c7e0e add sorting capability to integriaims ticket list 2021-10-18 11:45:48 +02: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
Daniel Rodriguez cd73f534f9 Merge branch 'ent-8104-bug-delete-files-update-manager' into 'develop' 
Fix delete files issue

See merge request artica/pandorafms!4472
 2021-10-18 08:18:31 +00:00
Daniel Rodriguez 0c777c2925 Merge branch 'ent-8090-Bug-al-crear-template-en-Consolas-Visuales' into 'develop' 
Ent 8090 bug al crear template en consolas visuales

See merge request artica/pandorafms!4469
 2021-10-18 06:49:36 +00: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
fbsanchez 6c0e2d23de updates 2021-10-15 13:39:23 +02:00
Jose Gonzalez 5b4043d9ea Fix delete files issue 2021-10-15 13:31:19 +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
fbsanchez 75949691f3 fix mr 2021-10-14 21:22:21 +02:00
fbsanchez 6a537e58f4 Fix 2021-10-14 21:09:14 +02:00
fbsanchez 79174d512d Added tncm_vendor and model to manage targetrs 2021-10-14 20:44:05 +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
Daniel Maya e986005cc0 #8090 Added auto_adjust in tlayout_template 2021-10-13 17:23:34 +02:00
Daniel Maya 4579d2b8c6 #8105 Fixed list of elements 2021-10-13 15:20:20 +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
fbsanchez d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
Jose Gonzalez 8bf19e348f Fix 2021-10-11 08:18:55 +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 ef42348807 compat mysql 5.1 exceeded key 2021-10-08 16:02:06 +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 fa35e6054c Fixes 2021-10-08 15:30:17 +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
Jose Gonzalez 4331438765 Removed some cheerful words in the project 2021-10-08 11:13:28 +02:00
Daniel Rodriguez 16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 
show only events filter in acl groups

See merge request artica/pandorafms!4451
 2021-10-08 08:09:19 +00: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 96638189f2 new integriaims logo 2021-10-07 16:46:49 +02:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
marcos d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
Daniel Maya c61c39f45f #8088 Fixed selected option with select2 2021-10-07 15:45:17 +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 f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +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 030b45af8e add new filter fot litghbulb_off 2021-10-07 12:50:10 +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 Maya 49ffdf822b #8040 Fixed module graph 2021-10-07 11:50:27 +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
Daniel Maya e9b6acc1a8 #8039 Fixed network link 2021-10-07 10:27:31 +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
marcos f42e57efbe show only events filter in acl groups 2021-10-06 17:11:45 +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
Daniel Maya 59c1a10056 #8053 Fixed refresh in public dashboard 2021-10-06 11:56:19 +02: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 a674aeeb91 Merge branch 'ent-8054-12471-Conteo-erroneo-de-agentes-para-licenciamiento' into 'develop' 
fixed count

See merge request artica/pandorafms!4441
 2021-10-06 08:34:13 +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 b8dc85a0dd wip 2021-10-05 16:42:24 +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
alejandro.campos@artica.es ec693a88a0 fixed count 2021-10-05 11:26:29 +02: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 3743fa6ca8 Merge branch 'ent-7922-selector-demasiado-grande-en-creacion-de-modulos' into 'develop' 
less module selector width

See merge request artica/pandorafms!4384
 2021-10-05 09:21:22 +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 ce53453e32 Merge branch 'ent-8002-bug-visual-vista-informes-open' into 'develop' 
Fiex open report list view

See merge request artica/pandorafms!4408
 2021-10-05 09:20:01 +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 b963e4b9df Fixed some things 2021-10-04 10:09:01 +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
Daniel Rodriguez 2c7799d022 Merge branch 'ent-8016-resources-resource-registration-public-resource-library-y-url-error' into 'develop' 
fixed minnor error with resource library url

See merge request artica/pandorafms!4428
 2021-10-01 12:29:49 +00:00
Jose Gonzalez 5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
fbsanchez be95b5ffd0 updates 2021-10-01 13:56:21 +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
fbsanchez d322d23203 WIP NCM 2021-09-30 19:10:45 +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
fbsanchez 18b1a1e14e Schema update to avoid using JSON columns until internal CICD is updated 2021-09-30 11:18:13 +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
fbsanchez d683e192b5 Moved changes for CorrelationServer schema to MR50 2021-09-29 13:43:08 +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
fbsanchez 15c2bdf17b WIP NCM 2021-09-28 18:53:22 +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
Luis 849ce30da5 Update pandora_networkmap.view.php 2021-09-28 08:50:00 +00: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
Calvo 90ac62c0cc Fix recursion on networkmap nodes 2021-09-27 16:14:07 +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
marcos b332e59687 fixed minnor error with resource library url 2021-09-27 13:48:07 +02:00
Jose Gonzalez 367faaf5ed Added improved logos 2021-09-27 13:15:20 +02: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
Daniel Rodriguez 4bd88e8afa Merge branch 'ent-7449-autorefresh-en-vistas-que-no-existen' into 'develop' 
Revomved autorefresh views than does not exists on meta

See merge request artica/pandorafms!4271
 2021-09-27 10:08:46 +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
Daniel Rodriguez a754b875c9 Merge branch 'ent-7976-GISS-Limite-de-licencia-en-metaconsola-para-UM' into 'develop' 
Ent 7976 giss limite de licencia en metaconsola para um

See merge request artica/pandorafms!4403
 2021-09-24 12:37:03 +00:00
alejandro.campos@artica.es 631edabdf9 added changes to mr 2021-09-24 11:42:40 +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 19e1948062 Merge branch 'ent-7992-error-500-al-loguearse-en-la-consola' into 'develop' 
Removed automatic assignation of PHP configuration variables

See merge request artica/pandorafms!4411
 2021-09-24 07:15:06 +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
Calvo 8eababe2f6 Autorefresh changes on centralized node and metaconsole 2021-09-22 17:29:14 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Maya 61fb2e102b #7950 Fixed last_contact 3 2021-09-22 16:39:34 +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 ea654fb323 Merge branch 'ent-7982-bug-en-edicion-de-correlacion-de-alertas' into 'develop' 
Ent 7982 bug en edicion de correlacion de alertas

See merge request artica/pandorafms!4398
 2021-09-22 12:32:23 +00:00
Jose Gonzalez 15ec0f4e4d Fix delete_files 2021-09-22 14:25:44 +02:00
Calvo 641c42df91 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-22 11:39:44 +02:00
Daniel Rodriguez 42700e9033 Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4284
 2021-09-22 09:10:09 +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 Maya f3923326bc resolved conflict 2021-09-22 11:08:37 +02: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 126030261b Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop' 
Ent 7969 etiquetas html en módulos de wizard consolas visuales

See merge request artica/pandorafms!4394
 2021-09-22 09:01:17 +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