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

716 Commits

Author SHA1 Message Date
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
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
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 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 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
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
Daniel Maya 46d40b72c2 Fixed snmp interfaces 2020-12-11 14:42:37 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop' 
discovery.cloud.gcp

See merge request artica/pandorafms!3479
 2020-12-09 13:54:25 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Jose Gonzalez 4760e0b20c Fix 2020-12-02 15:49:13 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
 2020-12-01 17:32:02 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop' 
fixed bad module id reference

See merge request artica/pandorafms!3505
 2020-12-01 11:55:56 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 79b3f2d762 Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 2020-11-26 11:28:39 +01:00
fbsanchez 1121440943 Clean only recovered servers 2020-11-26 11:28:31 +01:00
alejandro-campos 448cc253b4 changes in treeview 2020-11-25 17:00:37 +01:00
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' 
Fix

See merge request artica/pandorafms!3652
 2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00
Jose Gonzalez da3bb9b808 Fix 2020-11-25 14:29:11 +01:00
Jose Gonzalez 5f9db9a896 Fix 2020-11-25 14:27:42 +01:00
Daniel Rodriguez b1fd90ae58 Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop' 
Ent 6542 agents alerts view fallos visuales

Closes pandora_enterprise#6542

See merge request artica/pandorafms!3594
 2020-11-25 13:35:17 +01:00
fbsanchez d18fffb0cb Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2020-11-25 12:07:53 +01:00
Jose Gonzalez 60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez 912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
Jose Gonzalez 0cc1da21b0 Fix errors 2020-11-24 15:53:25 +01:00
Jose Gonzalez ed1b8f9713 Fix some bugs and added surround input feature 2020-11-24 15:51:02 +01:00
alejandro-campos f5648d734d fixed snapshot in meta 2020-11-23 17:09:58 +01:00
Daniel Rodriguez f2383aa4a3 Merge branch 'ent-6590-comprobacion-ha-ralentiza-la-consola' into 'develop' 
Avoid check ha nodes while navigating, scheduled

See merge request artica/pandorafms!3620
 2020-11-23 16:55:56 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales 
Merge with last updates
 2020-11-23 10:08:16 +01:00
Jose Gonzalez 8706ec060c Solve OIDs issues and malfunction of some modules 2020-11-19 13:31:32 +01:00
Jose Gonzalez ea259f0aa7 Fixed issue 2020-11-17 16:36:30 +01:00
fbsanchez f9ab987825 Avoid check ha nodes while navigating, scheduled 2020-11-17 11:44:52 +01:00
Jose Gonzalez 702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Jose Gonzalez 665deaa5c8 WIP: Backup upload 2020-11-10 12:23:50 +01:00
Jose Gonzalez 8a6a11fee6 WIP: Backup upload 2020-11-06 12:38:35 +01:00
Jose Gonzalez b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
Daniel Rodriguez 6a31a28679 Merge branch 'ent-6410-Wizard-SNMP-SNMP-Interfaces-y-WMI-no-autocompletan-Target-IP-con-IP-del-agente' into 'develop' 
Ent 6410 wizard snmp snmp interfaces y wmi no autocompletan target ip con ip del agente

See merge request artica/pandorafms!3588
 2020-11-03 10:26:24 +01:00
Luis 25de1b686a Fixed oid for getting x64 interfaces module. Fixed visual (module order) bug 2020-10-30 14:41:33 +01:00
Daniel Maya bde52df2e8 Added datalist for target ip 2020-10-30 13:25:33 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' 
groups_get_children and propagate update

See merge request artica/pandorafms!3545
 2020-10-29 12:36:49 +01:00
Daniel Rodriguez 5d4723ba15 Merge branch 'ent-6470-error-componentes-remotos' into 'develop' 
Ent 6470 error componentes remotos

Closes pandora_enterprise#6470

See merge request artica/pandorafms!3558
 2020-10-29 09:48:25 +01:00
Daniel Rodriguez 0a24fedb5a Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop' 
Use service description instead of name in tree view

See merge request artica/pandorafms!3570
 2020-10-28 11:19:49 +01:00
Jose Gonzalez 8ba92a683a Fix some errors 2020-10-27 07:51:30 +01:00
Jose Gonzalez a9075f0068 Fix 2020-10-27 07:49:33 +01:00
Kike 3287223b4d Use service description instead of name in tree view 2020-10-26 12:05:37 +01:00
Jose Gonzalez a8c54dadee Fixed some errors 2020-10-22 17:03:31 +02:00