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

15269 Commits

Author SHA1 Message Date
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
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
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
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
artica eb5b34b99e Auto-updated build strings. 2021-10-08 01:00:19 +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
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
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