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

13704 Commits

Author SHA1 Message Date
Daniel Rodriguez fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
Daniel Rodriguez 24b71e477b Merge branch 'ent-6405-Borrado-conf-md5-data_in-borrar-agente' into 'develop' 
Adding delete_agent control for meta

Closes pandora_enterprise#6405

See merge request artica/pandorafms!3583
 2021-01-14 14:45:10 +01:00
Daniel Rodriguez c546e532a3 Merge branch 'ent-6351-Informes-de-logs-en-meta' into 'develop' 
Ent 6351 informes de logs en meta

See merge request artica/pandorafms!3681
 2021-01-14 14:44:22 +01:00
Daniel Rodriguez ea86889673 Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop' 
Fixed acl on discovery tasklist

See merge request artica/pandorafms!3618
 2021-01-14 14:43:42 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Jose Gonzalez 0ec39bd135 Merge remote-tracking branch 'origin' into ent-6503-vista-tactica-numero-alertas 2021-01-14 13:39:45 +01:00
Jose Gonzalez 7de277f458 Added some changes 2021-01-14 12:40:57 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
Jose Gonzalez c7b66e07e8 Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-13 11:43:29 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
Jose Gonzalez e2dec1b0fa Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-12 16:58:15 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez 56d8f87e42 Merge branch 'ent-6886-item-permissions-report-aparece-en-templates' into 'develop' 
Removed item permissions report from report templates

See merge request artica/pandorafms!3744
 2021-01-11 18:11:58 +01:00
Daniel Rodriguez ed50126b1b Merge branch 'ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery' into 'develop' 
Ent 3661 poder elegir dataserver en vmware a traves de discovery

See merge request artica/pandorafms!3683
 2021-01-11 15:43:18 +01:00
fbsanchez 749b729c0c fix local auth 2021-01-11 15:08:07 +01:00
Daniel Rodriguez 14985c35ec Merge branch 'ent-6407-server-to-execute-snmp-browser' into 'develop' 
Fixed snmp server selection

See merge request artica/pandorafms!3658
 2021-01-11 14:57:12 +01:00
José González 55f1d3516f Cleaned trace 2021-01-11 14:26:15 +01:00
Daniel Rodriguez 8d7ac33cf1 Merge branch 'ent-6653-Error-enlace-publico-en-Consolas-Visuales-linkadas' into 'develop' 
fix public view link remove hash

See merge request artica/pandorafms!3639
 2021-01-11 13:23:05 +01:00
Daniel Rodriguez 38dd3b960e Merge branch 'ent-4953-local-admin-nunca-prueba-remotos-meta' into 'develop' 
Force try remote before falling back to local if admin user

See merge request artica/pandorafms!3715
 2021-01-11 09:22:14 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
fbsanchez f35ae98e78 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 2021-01-08 13:21:58 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +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 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 
Conflicts:
	pandora_console/include/styles/wizard.css
 2021-01-07 10:50:57 +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
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop' 
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
 2021-01-05 13:43:42 +01:00
Daniel Rodriguez 6faa827bfa Merge branch 'ent-6896-error-ACL-command-snapshot' into 'develop' 
Fixed module id on snapshot view

See merge request artica/pandorafms!3746
 2021-01-05 12:41:04 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
Daniel Maya c11c122032 Fixed custom graph 2021-01-04 12:53:42 +01:00
Daniel Rodriguez 05645afd44 Merge branch 'ent-6797-11099-graficas-informe-de-proyeccion-fallan-en-pdf-de-forma-aleatoria' into 'develop' 
Increased phantomjs timeout to 120 seconds per resource

See merge request artica/pandorafms!3730
 2021-01-04 11:17:37 +01:00
Daniel Rodriguez b3861ad2c5 Merge branch 'ent-6534-Migracion-consolas-visuales' into 'develop' 
css simple value css CV

See merge request artica/pandorafms!3684
 2021-01-04 11:13:35 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop' 
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
 2021-01-04 11:11:16 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
Luis Calvo 47088a87b7 Fixed module id on snapshot view 2020-12-28 11:59:02 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop' 
Fixed broken styles in meta

See merge request artica/pandorafms!3743
 2020-12-24 10:30:01 +01:00
Luis Calvo 97a1020ec2 Removed item permissions report from report templates 2020-12-24 09:06:38 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +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 bc74565662 Merge branch 'ent-4491-Mostrar-siempre-arriba-el-valor-de-la-barra-de-grafico-en-consola-visual' into 'develop' 
fix custom graph

See merge request artica/pandorafms!3655
 2020-12-23 11:48:03 +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
artica 71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
Daniel Rodriguez b2363fb003 Merge branch 'ent-6509-agent-details-error-en-conteo-total-de-modulos' into 'develop' 
included not init modules in total count

See merge request artica/pandorafms!3645
 2020-12-22 16:29:39 +01:00
Daniel Rodriguez 4b0fb7e762 Merge branch 'ent-6404-Bug-en-widget-Consolas-visuales-en-dashboard' into 'develop' 
fix dashboard VC

See merge request artica/pandorafms!3650
 2020-12-22 16:05:21 +01:00
Daniel Rodriguez ee84644163 Merge branch 'ent-6687-Instalador-en-metaconsola' into 'develop' 
fix check install meta

See merge request artica/pandorafms!3666
 2020-12-22 13:48:13 +01:00
Daniel Rodriguez ad1ede437c Merge branch 'ent-5983-Bugs-y-cambios-en-el-nuevo-tree-view' into 'develop' 
changes in treeview

See merge request artica/pandorafms!3654
 2020-12-22 13:02:17 +01:00
Daniel Rodriguez 58dd0b424c Merge branch 'ent-6675-Bug-items-de-consolas-visuales-en-metaconsola' into 'develop' 
fix bugs vc serialez module string donuts and bars charts

See merge request artica/pandorafms!3642
 2020-12-22 12:43:09 +01:00
artica 1d72913310 Auto-updated build strings. 2020-12-22 01:00:16 +01:00
Daniel Rodriguez efb4dabd18 Merge branch 'ent-6632-Bug-dashboard-favorito-cuando-no-lo-es' into 'develop' 
fixed query

See merge request artica/pandorafms!3602
 2020-12-21 12:02:47 +01:00
artica da07c5d7da Auto-updated build strings. 2020-12-21 01:00:14 +01:00
artica 42f7183c7b Auto-updated build strings. 2020-12-20 01:00:15 +01:00
artica 37fda15ad4 Auto-updated build strings. 2020-12-19 01:00:18 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
artica 87ce193c10 Auto-updated build strings. 2020-12-18 01:00:19 +01:00
Daniel Rodriguez 2591d8874a Merge branch 'ent-6804-buscador-pandora-permite-acceder-politicas-open' into 'develop' 
Ent 6804 buscador pandora permite acceder politicas open

Closes pandora_enterprise#6804

See merge request artica/pandorafms!3688
 2020-12-17 17:05:26 +01:00
daniel b230e17cc2 fix report groups status metaconsole 2020-12-17 17:04:52 +01:00
Daniel Rodriguez 7a67412398 Merge branch 'ent-6698-Demos-de-consolas-visuales-sin-el-token-Legacy-Visual-Console-aparecen-vacias' into 'develop' 
fix inserts demo VC

See merge request artica/pandorafms!3638
 2020-12-17 17:02:42 +01:00
Daniel Rodriguez b58e569063 Merge branch 'ent-6737-Bug-dashboard-con-widget-group-status-no-tiene-en-cuenta-grupos-secundarios' into 'develop' 
fix dashboard widget groups status add secondary groups

See merge request artica/pandorafms!3647
 2020-12-17 17:01:16 +01:00
daniel 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +01:00
Daniel Rodriguez 7ae5b65740 Merge branch 'ent-6282-module-templates-sin-datos' into 'develop' 
Fixed issue

Closes pandora_enterprise#6282

See merge request artica/pandorafms!3624
 2020-12-17 16:56:17 +01:00
Marcos Alconada f9b2417d89 error con modulos duplicados en module templates 2020-12-17 16:55:30 +01:00
Daniel Rodriguez aaaabc518f Merge branch 'ent-6340-Ventana-info-agente-tree-view-Metaconsola' into 'develop' 
fix dialog tree view meta

See merge request artica/pandorafms!3653
 2020-12-17 16:53:42 +01:00
Daniel Rodriguez b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop' 
active user password check

See merge request artica/pandorafms!3689
 2020-12-17 16:48:26 +01:00
Daniel Rodriguez ec472f6c6f Merge branch 'ent-6446-Bug-visual-en-el-full-screen-mode-de-consolas-visuales' into 'develop' 
fix visual view pure CV

See merge request artica/pandorafms!3643
 2020-12-17 16:45:05 +01:00
Daniel Rodriguez 615fd082e5 Merge branch 'ent-6637-triggered-alerts-tactical-view-meta-bug' into 'develop' 
Fixed alert count bug on tactical view

See merge request artica/pandorafms!3603
 2020-12-17 16:38:32 +01:00
artica 2692da94f5 Auto-updated build strings. 2020-12-17 01:00:17 +01:00
artica b5d52a5afe Auto-updated build strings. 2020-12-16 01:00:16 +01:00
fbsanchez 58338c5cb3 Increased phantomjs timeout to 120 seconds per resource 2020-12-15 14:33:40 +01:00
artica fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +01:00
Daniel Rodriguez 54712de36f Merge branch 'ent-6831-Ticket-Guardia-10822-SNMP-Wizard-Interface' into 'develop' 
Ent 6831 ticket guardia 10822 snmp wizard interface

See merge request artica/pandorafms!3719
 2020-12-14 17:53:28 +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
artica f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica 37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00
Daniel Maya 46d40b72c2 Fixed snmp interfaces 2020-12-11 14:42:37 +01:00
fbsanchez 4d2b890712 minor fixes 2020-12-11 11:31:18 +01:00
fbsanchez 79c8c852b3 Force try remote before falling back to local if admin user 2020-12-11 11:26:45 +01:00
artica c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
artica 463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica 17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +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
artica 3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica 12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00